zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Merge bf8d132557 into 1959365c2f

This commit is contained in:
Emelia Smith 2024-05-10 20:06:52 +00:00 committed by GitHub
parent 1959365c2f bf8d132557
commit ba8e4c2ff6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/initializers/doorkeeper.rb
View File

@ -170,7 +170,11 @@ Doorkeeper.configure do
# http://tools.ietf.org/html/rfc6819#section-4.4.3
#
grant_flows %w(authorization_code password client_credentials)
if Devise.ldap_authentication || Devise.pam_authentication
grant_flows %w(authorization_code client_credentials password)
else
grant_flows %w(authorization_code client_credentials)
end
# Under some circumstances you might want to have applications auto-approved,
# so that the user skips the authorization step.