mirror of
https://github.com/discourse/discourse.git
synced 2025-06-01 05:53:52 +08:00
Add a SiteSetting to not trust sso emails by default
This commit is contained in:
@ -57,7 +57,7 @@ class DiscourseSingleSignOn < SingleSignOn
|
||||
change_external_attributes_and_override(sso_record, user)
|
||||
end
|
||||
|
||||
if sso_record && (user = sso_record.user) && !user.active
|
||||
if sso_record && (user = sso_record.user) && !user.active && SiteSetting.sso_trusts_email
|
||||
user.active = true
|
||||
user.save!
|
||||
user.enqueue_welcome_message('welcome_user') unless suppress_welcome_message
|
||||
|
Reference in New Issue
Block a user