diff options
| author | Roger Rüttimann <roger.ruettimann@gmail.com> | 2018-06-25 18:32:03 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-25 18:32:03 +0300 |
| commit | 2efe27ba181daa18db9e227b13be428ebdfc23f1 (patch) | |
| tree | eea8a62ad5159b63cec5e367f4be49bfd09aec97 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | 77fe416681a553005f9ec769113555830c8fb07c (diff) | |
Honor saml assurance level to allow 2FA bypassing
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index ba62d2d5142..1547d4b5972 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -119,7 +119,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController set_remember_me(user) - if user.two_factor_enabled? + if user.two_factor_enabled? && !auth_user.bypass_two_factor? prompt_for_two_factor(user) else sign_in_and_redirect(user) |