Update doorkeeper to be used with grape >= 0.10 #915
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
houndci-bot
reviewed
Jan 5, 2017
| extend ::Grape::API::Helpers | ||
| include Doorkeeper::Rails::Helpers | ||
|
|
||
| # endpoint specific scopes > parameter scopes > default scopes | ||
| def doorkeeper_authorize!(*scopes) | ||
| endpoint_scopes = env['api.endpoint'].options[:route_options][:scopes] | ||
| endpoint_scopes = env['api.endpoint'].route_setting(:scopes) |
There was a problem hiding this comment.
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.
Grape has since long discouraged the use of options[:route_options] for custom additions. Since version 0.10 it cannot be used anymore like setup in the helpers in doorkeeper (grape is currently at 0.19.1). This PR fixes the behaviour to properly work with grape, and describes a bit better in the example how you could actually use it and set it up (if you want I can elaborate more in the readme). I think with this example and the change, most people should have enough with doorkeeper as is, and not need wine_bouncer at all.
tim-vandecasteele
force-pushed
the
update-grape-and-example
branch
from
556765c
to
2c9eec5
Compare
|
Thank you! :) |
|
Thanks for merging :) |
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.
Grape has since long discouraged the use of options[:route_options] for custom additions. Since version 0.10 it cannot be used anymore like setup in the helpers in doorkeeper (grape is currently at 0.19.1).
This PR fixes the behaviour to properly work with grape, and describes a bit better in the example how you could actually use it and set it up (if you want I can elaborate more in the readme).
I think with this example and the change, most people should have enough with doorkeeper as is, and not need wine_bouncer at all.