github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 07:01:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: stop stripping dots from SSO names

Browse Source 
This could upset Louis C.K.
This commit is contained in:
Sam
2015-03-27 10:25:32 +11:00
parent adc9e68e66
commit 05737effef
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/discourse_single_sign_on.rb
View File

@ -88,7 +88,7 @@ class DiscourseSingleSignOn < SingleSignOn
user_params = { user_params = {
email: email, email: email,
name: User.suggest_name(try_name || try_username || email), name: try_name || User.suggest_name(try_username || email),
username: UserNameSuggester.suggest(try_username || try_name || email), username: UserNameSuggester.suggest(try_username || try_name || email),
ip_address: ip_address ip_address: ip_address
} }
@ -120,7 +120,7 @@ class DiscourseSingleSignOn < SingleSignOn
end end
if SiteSetting.sso_overrides_name && user.name != name if SiteSetting.sso_overrides_name && user.name != name
user.name = User.suggest_name(name || username || email) user.name = name || User.suggest_name(username || email)
end end
if SiteSetting.sso_overrides_avatar && avatar_url.present? && ( if SiteSetting.sso_overrides_avatar && avatar_url.present? && (

3
spec/models/discourse_single_sign_on_spec.rb
View File

@ -85,12 +85,15 @@ describe DiscourseSingleSignOn do
sso.email = "TEST@bob.com" sso.email = "TEST@bob.com"
sso.name = "Louis C.K."
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" expect(admin.username).to eq "bob_the_admin"
expect(admin.name).to eq "Louis C.K."
end end
it "can fill in data on way back" do it "can fill in data on way back" do