Skip to content

Commit 7d62947

Browse files
committed
Review user_allowed logic.
1 parent ffdf405 commit 7d62947

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

config/initializers/doorkeeper.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@
1111

1212
if current_user
1313
authenticate_application = DoorkeeperApplication.find_by!(uid: client_id)
14-
allowed_application = current_user
15-
.user_allowed_applications.find_by(enable: true, oauth_application_id: authenticate_application.id)
14+
user_allowed = current_user.user_allowed_applications.exists?(enable: true, oauth_application_id: authenticate_application.id)
1615

17-
if allowed_application || authenticate_application.allow_login_by_default?
16+
if user_allowed || authenticate_application.allow_login_by_default?
1817
current_user
1918
else
2019
raise Doorkeeper::Errors::DoorkeeperError.new(I18n.t('ui.can_not_grant_applications'))
2120
end
2221
else
23-
warden.authenticate!(:scope => :user)
22+
warden.authenticate!(scope: :user)
2423
end
2524
end
2625

0 commit comments

Comments
 (0)