github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:21:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: sso_overrides_(email|username|name) for all auth methods

Browse Source 
These settings previously applied only to discourse-sso. Now they work for all external authentication methods.
This commit is contained in:
David Taylor
2020-06-18 11:01:02 +01:00
parent ec448a1516
commit 977766e7a8
14 changed files with 143 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/validators/sso_overrides_email_validator.rb
View File

@ -7,15 +7,12 @@ class SsoOverridesEmailValidator
def valid_value?(val)
return true if val == 'f'
return false if !SiteSetting.enable_sso?
return false if SiteSetting.email_editable?
true
end
def error_message
if !SiteSetting.enable_sso?
I18n.t('site_settings.errors.enable_sso_disabled')
elsif SiteSetting.email_editable?
if SiteSetting.email_editable?
I18n.t('site_settings.errors.email_editable_enabled')
end
end