vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #34331 from akhilnarang/fix-2fa-toggle

Browse source 
fix(system_settings): don't change 2fa settings for roles unless the value actually changed
This commit is contained in:
Akhil Narang 2025-10-15 11:07:34 +05:30 • committed by GitHub
commit 79a2457f84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
frappe/core/doctype/system_settings/system_settings.py
View file

@ -122,16 +122,19 @@ class SystemSettings(Document):
if len(parts) != 2 or not (cint(parts[0]) or cint(parts[1])):
frappe.throw(_("Session Expiry must be in format {0}").format("hh:mm"))
if self.enable_two_factor_auth:
if self.two_factor_method == "SMS":
if not frappe.db.get_single_value("SMS Settings", "sms_gateway_url"):
frappe.throw(
_("Please setup SMS before setting it as an authentication method, via SMS Settings")
)
toggle_two_factor_auth(True, roles=["All"])
else:
self.bypass_2fa_for_retricted_ip_users = 0
self.bypass_restrict_ip_check_if_2fa_enabled = 0
if self.has_value_changed("enable_two_factor_auth"):
if self.enable_two_factor_auth:
if self.two_factor_method == "SMS":
if not frappe.db.get_single_value("SMS Settings", "sms_gateway_url"):
frappe.throw(
_(
"Please setup SMS before setting it as an authentication method, via SMS Settings"
)
)
toggle_two_factor_auth(True, roles=["All"])
else:
self.bypass_2fa_for_retricted_ip_users = 0
self.bypass_restrict_ip_check_if_2fa_enabled = 0
frappe.flags.update_last_reset_password_date = False
if self.force_user_to_reset_password and not cint(