Commit 34bf48dd authored by Eugen Rochko's avatar Eugen Rochko Committed by Nathan Ladd
Browse files

Fix resource_owner_from_credentials in Doorkeeper initializer (#12743)

- Nil error when e-mail not found
- LDAP authentication used in place of PAM authentication
parent 6f6ad69b
......@@ -8,20 +8,15 @@ Doorkeeper.configure do
resource_owner_from_credentials do |_routes|
if Devise.ldap_authentication
user = User.authenticate_with_ldap({ :email => request.params[:username], :password => request.params[:password] })
if Devise.pam_authentication
user ||= User.authenticate_with_ldap({ :email => request.params[:username], :password => request.params[:password] })
user = User.authenticate_with_ldap(email: request.params[:username], password: request.params[:password]) if Devise.ldap_authentication
user ||= User.authenticate_with_pam(email: request.params[:username], password: request.params[:password]) if Devise.pam_authentication
if user.nil?
user = User.find_by(email: request.params[:username])
user = nil unless user.valid_password?(request.params[:password])
user = nil unless user&.valid_password?(request.params[:password])
user if !user&.otp_required_for_login?
user unless user&.otp_required_for_login?
# If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment