diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-15 16:56:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 16:56:33 +0200 |
| commit | 37c092e9fdedd36c167e4b84610e7346c446e1d3 (patch) | |
| tree | 88992f2d65c83ece4e93f0b4b5c34ffed0989138 /app/controllers/auth/sessions_controller.rb | |
| parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
| parent | 470458da13586db0e6ca074987fecfc80293d955 (diff) | |
Merge pull request #1382 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/auth/sessions_controller.rb')
| -rw-r--r-- | app/controllers/auth/sessions_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index c54f6643a..441833e85 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -48,6 +48,7 @@ class Auth::SessionsController < Devise::SessionsController user = User.authenticate_with_ldap(user_params) if Devise.ldap_authentication user ||= User.authenticate_with_pam(user_params) if Devise.pam_authentication user ||= User.find_for_authentication(email: user_params[:email]) + user end end |