diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-02-28 19:04:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 19:04:53 +0100 |
| commit | 47bdb9b33b021c92bdfc6698914776eda13f6f77 (patch) | |
| tree | 3827da1ebcf051b42f3b78df000955a93cd3498e /app/controllers/auth/sessions_controller.rb | |
| parent | e85287284611f7de431d9c51353125c265ebfe3f (diff) | |
Fix #942: Seamless LDAP login (#6556)
Diffstat (limited to 'app/controllers/auth/sessions_controller.rb')
| -rw-r--r-- | app/controllers/auth/sessions_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 42a3cb62c..02447dde0 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -37,7 +37,7 @@ class Auth::SessionsController < Devise::SessionsController if session[:otp_user_id] User.find(session[:otp_user_id]) elsif user_params[:email] - if use_pam? && Devise.check_at_sign && user_params[:email].index('@').nil? + if use_seamless_external_login? && Devise.check_at_sign && user_params[:email].index('@').nil? User.joins(:account).find_by(accounts: { username: user_params[:email] }) else User.find_for_authentication(email: user_params[:email]) |