diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/controllers/sessions_controller.rb | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/controllers/sessions_controller.rb')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 61120c5b7d1..b8842b2efdb 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -300,13 +300,13 @@ class SessionsController < Devise::SessionsController def authentication_method if user_params[:otp_attempt] - "two-factor" + AuthenticationEvent::TWO_FACTOR elsif user_params[:device_response] && Feature.enabled?(:webauthn) - "two-factor-via-webauthn-device" + AuthenticationEvent::TWO_FACTOR_WEBAUTHN elsif user_params[:device_response] && !Feature.enabled?(:webauthn) - "two-factor-via-u2f-device" + AuthenticationEvent::TWO_FACTOR_U2F else - "standard" + AuthenticationEvent::STANDARD end end |