Allow querying with role arrays #12
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
include tests for oop interface
update mocha and add editorconfig
zpchavez
suggested changes
Mar 7, 2017
README.markdown
Outdated
| Role and Resource Discovery | ||
| --------------------------- | ||
|
|
||
| If you are more of an object-oriented programmer and prefer to use objects | ||
| to represent your roles and resources, then you're in luck! Virgen-ACL can | ||
| discover roles and resources from your objects so long as your role objects | ||
| contain the property `role_id` OR a function `getRoleId()` and your resource | ||
| contain the property `role_id` OR a function `getRoleId()` and your resource |
There was a problem hiding this comment.
There is an extra space. Can't have that.
README.markdown
Outdated
| objects contain the property `resource_id` OR a function `getResourceId()`. | ||
| Valid value types for role_ids are strings, `null` or arrays of strings. Valid |
There was a problem hiding this comment.
Is the use of plurals correct here? strings and arrays makes it sound like multiple arguments are allowed, but that wouldn't make sense in this case.
lib/acl.js
Outdated
| for (var i in roles) | ||
| for (var j in resources) | ||
| for (var k = this.permissions.length - 1; k >= 0; k--) | ||
| for (var k = this.permissions.length -1; k >= 0; k--) |
There was a problem hiding this comment.
Missing space between the minus and the one.
test/index.js
Outdated
| }); | ||
|
|
||
| for (var i in roles) (function(role) { | ||
| for (var j in resources) (function(resource) { | ||
| for (var k in actions) (function(action) { | ||
| if (role == 'user' && resource == 'page' && action == 'view') { | ||
| var allowableRole = false; | ||
| if( role === 'member' || (Array.isArray(role) && role.indexOf('member') !== -1)) { |
There was a problem hiding this comment.
Space in the wrong place. Sorry about all the space related comments!
test/index.js
Outdated
| @@ -374,7 +394,12 @@ require('should'); | |||
| for (var i in roles) (function(role) { | |||
| for (var j in resources) (function(resource) { | |||
| for (var k in actions) (function(action) { | |||
| if (role == 'admin') { | |||
| var allowableRole = false; | |||
| if( role === 'admin' || (Array.isArray(role) && role.indexOf('admin') !== -1)) { | |||
test/index.js
Outdated
| if (role == 'guest') { | ||
| it('should deny all resources to globally denined role', function() { | ||
| var deniableRole = false; | ||
| if( role === 'guest' || (Array.isArray(role) && role.indexOf('guest') !== -1)) { |
There was a problem hiding this comment.
Seems like you're doing it on purpose at this point.
zpchavez
approved these changes
Mar 7, 2017
djvirgen
approved these changes
Mar 13, 2017
test/index.js
Outdated
| this.acl.query(role, resource, action, function(err, allowed) { | ||
| allowed.should.equal(false); | ||
| }); | ||
| }); | ||
| } else { | ||
| it('should allow resources to all other roles', function() { | ||
| it(`should allow ${action} of ${resource} to ${role}`, function() { |
test/index.js
Outdated
| @@ -479,13 +537,13 @@ require('should'); | |||
| for (var j in resources) (function(resource) { | |||
| for (var k in actions) (function(action) { | |||
| if (resource == 'blog') { | |||
| it('should deny all roles to globally denined resource', function() { | |||
| it(`should deny ${role} to blog`, function() { | |||
test/index.js
Outdated
| this.acl.query(role, resource, action, function(err, allowed) { | ||
| allowed.should.equal(false); | ||
| }); | ||
| }); | ||
| } else { | ||
| it('should allow roles to all other resources', function() { | ||
| it(`should allow ${role} to ${resource}`, function() { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #10