Properly fall back to default_scopes when no scope is specified. #632
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
The parameter `scopes` is always an array which evaluates as truthy, so the intended fallback has never worked. This bug caused Doorkeeper to allow clients to access to protected resources under the default scopes regardless of the scopes their token has.
| @@ -4,7 +4,7 @@ module Helpers | |||
| extend ActiveSupport::Concern | |||
|
|
|||
| def doorkeeper_authorize!(*scopes) | |||
| @_doorkeeper_scopes = scopes || Doorkeeper.configuration.default_scopes | |||
| @_doorkeeper_scopes = scopes.presence || Doorkeeper.configuration.default_scopes | |||
|
I found a problem in the RSpec configuration where Doorkeeper's configuration is cleared before running each example, making what's in |
|
Looks like |
|
This is great, thank you very much. This was discussed (and not addressed) in #567 (comment). I'm very happy to see it fixed. |
tute
added a commit
that referenced
this pull request
Apr 18, 2015
Properly fall back to default_scopes when no scope is specified.
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.
The parameter
scopesis always an array which evaluates as truthy, so the intended fallback has never worked.This bug caused Doorkeeper to allow clients to access to protected resources under the default scopes regardless of the scopes their token has.