Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow client_credentials flow and optional scopes #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

allow client_credentials flow and optional scopes #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/devise/strategies/doorkeeper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ def clean_up_csrf?

def resource_from_token
token = ::Doorkeeper.authenticate(request)
scopes = ::Doorkeeper.configuration.default_scopes
scopes = ::Doorkeeper.configuration.default_scopes + ::Doorkeeper.configuration.optional_scopes
invalid_token unless token && token.acceptable?(scopes)
mapping.to.find(token.resource_owner_id)
mapping.to.find(token.resource_owner_id || token.application.owner_id)
end

def invalid_token
Expand Down