diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2018-03-03 13:40:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-03 13:40:00 -0500 |
| commit | 43a9a781a443a6b9296431fbcc4285b3ca6a1a57 (patch) | |
| tree | d4bf067aeedcebbdc3d160eca6aa1a7c7d1bfa00 /app/controllers/auth | |
| parent | ee00da01d2e4cc455b92f1f4a7c9142c73048433 (diff) | |
| parent | 65e2a4645e086110072efed5b3d4d1434c933e04 (diff) | |
Merge pull request #377 from glitch-soc/merge-upstream
hhhhhhhhhnnnnnnnnnnnghh!!!!!
Diffstat (limited to 'app/controllers/auth')
| -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 475cd540a..c9e507343 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -38,7 +38,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]) |