Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 18:58:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: my sso_overrides_username assumed username was passed

Browse Source
This commit is contained in:
Michael Brown 2018-03-13 18:29:11 -04:00
parent 6b13fbccc2
commit 1b5549df58
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/discourse_single_sign_on.rb
View File

@ -181,10 +181,10 @@ class DiscourseSingleSignOn < SingleSignOn
user.active = false if require_activation
end
if SiteSetting.sso_overrides_username?
if SiteSetting.sso_overrides_username? && username.present?
if user.username.downcase == username.downcase
user.username = username # there may be a change of case
elsif user.username != username && username.present?
elsif user.username != username
user.username = UserNameSuggester.suggest(username || name || email, user.username)
end
end