diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-06-30 14:54:07 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-04 11:00:34 -0500 |
| commit | 5467260528018774c8baec65f3cbf692bb3d93b7 (patch) | |
| tree | 031189c2b675941eb500e7ffa70394c21980dad2 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | 54c514f24ee00d885ec633a137a78a4cc71c6781 (diff) | |
| download | gitlab-ce-5467260528018774c8baec65f3cbf692bb3d93b7.tar.gz | |
Added tests for 2FA check on OAuth request
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 619a76ebfd9..f54c79c2e37 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -107,8 +107,11 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController # Only allow properly saved users to login. if @user.persisted? && @user.valid? log_audit_event(@user, with: oauth['provider']) - prompt_for_two_factor(@user) and return if @user.two_factor_enabled? - sign_in_and_redirect(@user) + if @user.two_factor_enabled? + prompt_for_two_factor(@user) + else + sign_in_and_redirect(@user) + end else error_message = @user.errors.full_messages.to_sentence |