verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #95 from strongloop/fix/owner-delete-user 

Fix/owner delete user
This commit is contained in:
Ritchie Martori 2013-12-11 19:51:29 -08:00
parent 0f4e9e1d1c b62b8fa47d
commit 00190227f8
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/models/access-token.js
View File

@ -174,13 +174,14 @@ function tokenIdForRequest(req, options) {
} }
} }
for(i = 0, length = headers.length; i < length; i++) { if(req.signedCookies) {
id = req.signedCookies[cookies[i]]; for(i = 0, length = headers.length; i < length; i++) {
id = req.signedCookies[cookies[i]];
if(typeof id === 'string') { if(typeof id === 'string') {
return id; return id;
}
} }
} }
return null; return null;
} }

4
lib/models/acl.js
View File

@ -34,7 +34,7 @@
var loopback = require('../loopback'); var loopback = require('../loopback');
var async = require('async'); var async = require('async');
var assert = require('assert'); var assert = require('assert');
var debug = require('debug')('acl'); var debug = require('debug')('loopback:security:acl');
var ctx = require('./access-context'); var ctx = require('./access-context');
var AccessContext = ctx.AccessContext; var AccessContext = ctx.AccessContext;
@ -242,7 +242,7 @@ ACL.getStaticACLs = function getStaticACLs(model, property) {
})); }));
}); });
} }
debug('getStaticACLs() returns: %s', staticACLs); debug('getStaticACLs() returns: %j', staticACLs);
return staticACLs; return staticACLs;
}; };

4
lib/models/role.js
View File

@ -1,5 +1,5 @@
var loopback = require('../loopback'); var loopback = require('../loopback');
var debug = require('debug')('role'); var debug = require('debug')('loopback:security:role');
var assert = require('assert'); var assert = require('assert');
var async = require('async'); var async = require('async');
@ -200,7 +200,7 @@ Role.isOwner = function isOwner(modelClass, modelId, userId, callback) {
// Is the modelClass User or a subclass of User? // Is the modelClass User or a subclass of User?
if(isUserClass(modelClass)) { if(isUserClass(modelClass)) {
process.nextTick(function() { process.nextTick(function() {
callback(null, modelId === userId); callback(null, modelId == userId);
}); });
return; return;
} }