Add a SiteSetting to not trust sso emails by default

This commit is contained in:
Paul Kaplan
2015-05-15 12:00:34 -05:00
parent 94ca9ed11f
commit 4c26c4d9bc
4 changed files with 26 additions and 1 deletions

View File

@ -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