diff options
| author | Starfall <us@starfall.systems> | 2020-07-17 14:00:08 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-07-17 14:00:08 -0500 |
| commit | c5b7bf491e9aaf0a92f7899d60d12705d98436dc (patch) | |
| tree | 7506b93ec2c20bf068f2b57c31d0a05e0485aed5 /app/controllers/auth/sessions_controller.rb | |
| parent | 2f20bc2a8275875033c97249825a2a3305980c3b (diff) | |
| parent | 801e546ecc1efb4103232d8265229eb455a8dd5b (diff) | |
glitch 3.2.0 update / Merge branch 'glitch' into main
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 |