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 #242 from strongloop/feature/fix-issue-239 

Rename the method so that it won't conflict with Model.checkAccess
This commit is contained in:
Raymond Feng 2014-04-24 10:27:18 -07:00
parent 1676ac6e58 921e35954d
commit b57c998ce2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/models/acl.js
View File

@ -356,7 +356,7 @@ ACL.prototype.debug = function() {
* @property {String} accessType The access type * @property {String} accessType The access type
* @param {Function} callback * @param {Function} callback
*/ */
ACL.checkAccess = function (context, callback) { ACL.checkAccessForContext = function (context, callback) {
if(!(context instanceof AccessContext)) { if(!(context instanceof AccessContext)) {
context = new AccessContext(context); context = new AccessContext(context);
} }
@ -422,7 +422,7 @@ ACL.checkAccess = function (context, callback) {
if(resolved && resolved.permission === ACL.DEFAULT) { if(resolved && resolved.permission === ACL.DEFAULT) {
resolved.permission = (model && model.settings.defaultPermission) || ACL.ALLOW; resolved.permission = (model && model.settings.defaultPermission) || ACL.ALLOW;
} }
debug('checkAccess() returns: %j', resolved); debug('checkAccessForContext() returns: %j', resolved);
callback && callback(null, resolved); callback && callback(null, resolved);
}); });
}); });
@ -455,7 +455,7 @@ ACL.checkAccessForToken = function (token, model, modelId, method, callback) {
context.debug(); context.debug();
this.checkAccess(context, function (err, access) { this.checkAccessForContext(context, function (err, access) {
if (err) { if (err) {
callback && callback(err); callback && callback(err);
return; return;

4
test/acl.test.js
View File

@ -268,7 +268,7 @@ describe('security ACLs', function () {
log('ACL 2: ', acl.toObject()); log('ACL 2: ', acl.toObject());
ACL.checkAccess({ ACL.checkAccessForContext({
principals: [ principals: [
{type: ACL.USER, id: userId} {type: ACL.USER, id: userId}
], ],
@ -279,7 +279,7 @@ describe('security ACLs', function () {
assert(!err && access.permission === ACL.ALLOW); assert(!err && access.permission === ACL.ALLOW);
}); });
ACL.checkAccess({ ACL.checkAccessForContext({
principals: [ principals: [
{type: ACL.ROLE, id: Role.EVERYONE} {type: ACL.ROLE, id: Role.EVERYONE}
], ],