send userId and the subscriptionId for permission checking functions

Author: arunoda

laika/tests/read_permissions.js

@@ -7,7 +7,7 @@ suite('Read Permissions', function() {
  client.evalSync(createClientStream, 'hello');
 
  server.evalSync(function() {
- helloStream.permissions.read(function(userId, eventName) {
+ helloStream.permissions.read(function(eventName) {
  return true;
  });
  emit('return');
@@ -39,7 +39,7 @@ suite('Read Permissions', function() {
  var received = 0;
 
  server.evalSync(function() {
- helloStream.permissions.read(function(userId, eventName) {
+ helloStream.permissions.read(function(eventName) {
  return false;
  });
  emit('return');
@@ -124,8 +124,8 @@ suite('Read Permissions', function() {
  client.evalSync(createClientStream, 'hello');
 
  server.evalSync(function() {
- helloStream.permissions.read(function(userId, eventName) {
- return !!userId;
+ helloStream.permissions.read(function(eventName) {
+ return !!this.userId;
  });
  emit('return');
  });

laika/tests/write_permissions.js

@@ -7,7 +7,7 @@ suite('Write Permissions', function() {
  client.evalSync(createClientStream, 'hello');
 
  server.evalSync(function() {
- helloStream.permissions.write(function(userId, evt) {
+ helloStream.permissions.write(function(evt) {
  return true;
  });
  helloStream.on('evt', function(data) {
@@ -37,8 +37,8 @@ suite('Write Permissions', function() {
  c1.evalSync(laika.actions.createUser, {username: 'arunoda', password: 'maxapower'});
 
  server.evalSync(function() {
- helloStream.permissions.write(function(userId, evt) {
- return !!userId;
+ helloStream.permissions.write(function(evt) {
+ return !!this.userId;
  });
  helloStream.on('evt', function(data) {
  emit('evt', this.userId, this.allowed, data);
@@ -77,7 +77,7 @@ suite('Write Permissions', function() {
  client.evalSync(createClientStream, 'hello');
 
  server.evalSync(function() {
- helloStream.permissions.write(function(userId, evt) {
+ helloStream.permissions.write(function(evt) {
  return false;
  });
  helloStream.on('evt', function(data) {
@@ -153,7 +153,7 @@ suite('Write Permissions', function() {
  c2.evalSync(createClientStream, 'hello');
 
  server.evalSync(function() {
- helloStream.permissions.write(function(userId, evt) {
+ helloStream.permissions.write(function(evt) {
  return true;
  });
  emit('return');
@@ -186,7 +186,7 @@ suite('Write Permissions', function() {
  var received = 0;
 
  server.evalSync(function() {
- helloStream.permissions.write(function(userId, evt) {
+ helloStream.permissions.write(function(evt) {
  return false;
  });
  emit('return');

lib/server.js

@@ -46,7 +46,7 @@ Meteor.Stream = function Stream(name) {
  function onItem(item) {
  Fibers(function() {
  var id = Random.id();
- if(self.permissions.checkPermission('read', publication.userId, item.args[0])) {
+ if(self.permissions.checkPermission('read', subscriptionId, publication.userId, item.args[0])) {
  //do not send again this to the sender
  if(subscriptionId != item.subscriptionId) {
  publication.added(streamName, id, item);
@@ -76,7 +76,7 @@ Meteor.Stream = function Stream(name) {
  methodContext.subscriptionId = subscriptionId;
 
  //in order to send this to the serve callback
- methodContext.allowed = self.permissions.checkPermission('write', methodContext.userId, args[0]);
+ methodContext.allowed = self.permissions.checkPermission('write', subscriptionId, methodContext.userId, args[0]);
  if(methodContext.allowed) {
  //apply filters
  args = applyFilters(args, methodContext);

lib/stream_permission.js

@@ -18,14 +18,15 @@ Meteor.Stream.Permission = function (acceptAll, cacheAll) {
  options['write']['doCache'] = (cache === undefined)? cacheAll: cache; 
  };
 
- this.checkPermission = function(type, userId, eventName) {
- var namespace = userId + '-' + eventName;
+ this.checkPermission = function(type, subscriptionId, userId, eventName) {
+ var namespace = subscriptionId + '-' + eventName;
  var result = options[type].results[namespace];
 
  if(result === undefined) {
  var func = options[type].func;
  if(func) {
- result = func(userId, eventName);
+ var context = {subscriptionId: subscriptionId, userId: userId};
+ result = func.call(context, eventName);
  if(options[type].doCache) {
  options[type].results[namespace] = result;
  return result;