From b1b6e19c90420774c0d66e483c77aaa046cae881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E9=AA=95?= Date: Fri, 17 Jul 2020 17:28:29 +0800 Subject: [PATCH] allow client_credentials flow and optional scopes --- lib/devise/strategies/doorkeeper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/devise/strategies/doorkeeper.rb b/lib/devise/strategies/doorkeeper.rb index 235e115..3e7eca4 100644 --- a/lib/devise/strategies/doorkeeper.rb +++ b/lib/devise/strategies/doorkeeper.rb @@ -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