diff options
Diffstat (limited to 'app/controllers/concerns/enforces_two_factor_authentication.rb')
| -rw-r--r-- | app/controllers/concerns/enforces_two_factor_authentication.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/concerns/enforces_two_factor_authentication.rb b/app/controllers/concerns/enforces_two_factor_authentication.rb index 825181568ad..d486d734db8 100644 --- a/app/controllers/concerns/enforces_two_factor_authentication.rb +++ b/app/controllers/concerns/enforces_two_factor_authentication.rb @@ -16,7 +16,7 @@ module EnforcesTwoFactorAuthentication end def check_two_factor_requirement - if two_factor_authentication_required? && current_user && !current_user.temp_oauth_email? && !current_user.two_factor_enabled? && !skip_two_factor? + if two_factor_authentication_required? && current_user_requires_two_factor? redirect_to profile_two_factor_auth_path end end @@ -27,6 +27,10 @@ module EnforcesTwoFactorAuthentication current_user.try(:ultraauth_user?) end + def current_user_requires_two_factor? + current_user && !current_user.temp_oauth_email? && !current_user.two_factor_enabled? && !skip_two_factor? + end + # rubocop: disable CodeReuse/ActiveRecord def two_factor_authentication_reason(global: -> {}, group: -> {}) if two_factor_authentication_required? @@ -61,3 +65,5 @@ module EnforcesTwoFactorAuthentication session[:skip_two_factor] && session[:skip_two_factor] > Time.current end end + +EnforcesTwoFactorAuthentication.prepend_if_ee('EE::EnforcesTwoFactorAuthentication') |