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

ensure usernames do not keep cycling

Browse Source
This commit is contained in:
Sam
2015-03-27 10:04:16 +11:00
parent 94fceaf517
commit 0c287d7d6b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/discourse_single_sign_on.rb
View File

@@ -114,7 +114,9 @@ class DiscourseSingleSignOn < SingleSignOn
user.email = email user.email = email
end end
if SiteSetting.sso_overrides_username && user.username != username if SiteSetting.sso_overrides_username &&
user.username != username &&
user.username != UserNameSuggester.fix_username(username || name || email)
user.username = UserNameSuggester.suggest(username || name || email) user.username = UserNameSuggester.suggest(username || name || email)
end end

2
spec/models/discourse_single_sign_on_spec.rb
View File

@@ -88,7 +88,9 @@ describe DiscourseSingleSignOn do
sso.lookup_or_create_user(ip_address) sso.lookup_or_create_user(ip_address)
admin.reload admin.reload
expect(admin.email).to eq("test@bob.com") expect(admin.email).to eq("test@bob.com")
expect(admin.username).to eq "bob_the_admin"
end end
it "can fill in data on way back" do it "can fill in data on way back" do