github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-19 21:58:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: simplify logic (#8249)

Browse Source 
Anonymous users are only possible if allow_anonymous_posting is true,
which means that 'user.is_anonymous' check implies that
allow_anonymous_posting is true.
This commit is contained in:
Bianca Nenciu 2019-10-29 12:10:27 +02:00 committed by GitHub
parent 0c47529713
commit ff9345fbb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
View File

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

2
app/controllers/application_controller.rb
View File

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