Don't check for second factor when switching to anonymous account (#7803)

This commit is contained in:
Ralph Rooding
2019-06-28 00:01:27 +02:00
committed by Jeff Wong
parent 7f14e185cc
commit 4ba35472e6
4 changed files with 39 additions and 0 deletions

View File

@@ -43,6 +43,7 @@ export default RestrictedUserRoute.extend({
if (
transition.targetName === "preferences.second-factor" ||
!user ||
(settings.allow_anonymous_posting && user.is_anonymous) ||
user.second_factor_enabled ||
(settings.enforce_second_factor === "staff" && !user.staff) ||
settings.enforce_second_factor === "no"

View File

@@ -745,6 +745,7 @@ class ApplicationController < ActionController::Base
check_totp = current_user &&
!request.format.json? &&
!is_api? &&
!(SiteSetting.allow_anonymous_posting && current_user.anonymous?) &&
((SiteSetting.enforce_second_factor == 'staff' && current_user.staff?) ||
SiteSetting.enforce_second_factor == 'all') &&
!current_user.totp_enabled?