IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: require re-activation if SSO changes email and updates it

Browse Source
This commit is contained in:
Sam
2017-05-16 16:18:18 -04:00
parent 4424fd81b8
commit 763f156d91
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/discourse_single_sign_on.rb
View File

@@ -166,6 +166,7 @@ class DiscourseSingleSignOn < SingleSignOn
def change_external_attributes_and_override(sso_record, user)
if SiteSetting.sso_overrides_email && user.email != email
user.email = email
user.active = false if require_activation
end
if SiteSetting.sso_overrides_username && user.username != username && username.present?