Support passing options to a rule condition #30
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
|
This is a great addition. @vadimdemedes I think you should review this for sure. |
Vincent-Pang
added a commit
to Vincent-Pang/cancan
that referenced
this pull request
Oct 17, 2017
vadimdemedes
requested changes
Oct 21, 2017
test.js
Outdated
| const cancan = new CanCan(); | ||
| const {can, allow} = cancan; | ||
|
|
||
| allow(User, 'update', User, (user, target, payload) => { |
There was a problem hiding this comment.
Could you clean this up? It's hard to follow.
test.js
Outdated
| @@ -192,3 +192,24 @@ test('override instanceOf', t => { | |||
| t.false(cannot(user, 'read', product)); | |||
| t.false(can(user, 'create', product)); | |||
| }); | |||
|
|
|||
| test('allow can depend of an optional payload', t => { | |||
There was a problem hiding this comment.
=> "pass options to the rule"
readme.md
Outdated
| @@ -126,11 +132,24 @@ const post = new Post(); | |||
| can(user, 'view', post); | |||
| ``` | |||
|
|
|||
| ### cannot(instance, action, target) | |||
| ```js | |||
| /* | |||
There was a problem hiding this comment.
Examples in readme should only contain code. If there are comments, they should be in text before that example.
readme.md
Outdated
| const admin = new User({roles: ['administrator']}); | ||
| const moderator = new User({roles: ['moderator']}); | ||
|
|
||
| can(admin, 'update', moderator, {fields: ["roles"]}); // true |
There was a problem hiding this comment.
And follow this format:
can(...);
//=> return value
readme.md
Outdated
|
|
||
| Inverse of `.can()`. | ||
|
|
||
| ### authorize(instance, action, target) | ||
| ### authorize(instance, action, target[, payload]) |
index.js
Outdated
| @@ -44,7 +44,7 @@ class CanCan { | |||
| }); | |||
| } | |||
|
|
|||
| can(performer, action, target) { | |||
| can(performer, action, target, payload) { | |||
- rename 'payload' parameter to 'options' - reformat comments from example code in readme.md - use single quotes - rewrite allow rule in "pass options to the rule" test
|
Hi @vadimdemedes ! |
vadimdemedes
approved these changes
Dec 2, 2017
vadimdemedes
changed the title
|
Thanks for working on this! |
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.
Appends an optional payload parameter on .can() method and condition callback passed to .allow() method.
It makes it possible to check additional informations when it's time to decide if an action can be performed or not. For instance, on an update action, permissions can now be granted according to updated fields, as shown on the updated readme.