Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: only override sso name / username if it is supplied

This commit is contained in:
Sam 2015-08-24 10:24:09 +10:00
parent 73624e63c5
commit 6451495ec6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/discourse_single_sign_on.rb
View File

@ -114,12 +114,11 @@ class DiscourseSingleSignOn < SingleSignOn
user.email = email
end
if SiteSetting.sso_overrides_username &&
user.username != username
if SiteSetting.sso_overrides_username && user.username != username && username.present?
user.username = UserNameSuggester.suggest(username || name || email, user.username)
end
if SiteSetting.sso_overrides_name && user.name != name
if SiteSetting.sso_overrides_name && user.name != name && name.present?
user.name = name || User.suggest_name(username.blank? ? email : username)
end