codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-17 04:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: always import avatars during SSO if they are missing

Browse source
This commit is contained in:
Sam 2016-09-16 09:44:45 +10:00
parent b9801d2e26
commit 33578a2c17
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/discourse_single_sign_on.rb
View file

@ -145,10 +145,15 @@ class DiscourseSingleSignOn < SingleSignOn
user.name = name || User.suggest_name(username.blank? ? email : username) user.name = name || User.suggest_name(username.blank? ? email : username)
end end
if (SiteSetting.sso_overrides_avatar && avatar_url.present? && ( avatar_missing = user.uploaded_avatar_id.nil? || !Upload.exists?(user.uploaded_avatar_id)
sso_record.external_avatar_url != avatar_url)) || avatar_force_update
UserAvatar.import_url_for_user(avatar_url, user) if (avatar_missing || avatar_force_update || SiteSetting.sso_overrides_avatar) && avatar_url.present?
avatar_changed = sso_record.external_avatar_url != avatar_url
if avatar_force_update || avatar_changed || avatar_missing
UserAvatar.import_url_for_user(avatar_url, user)
end
end end
# change external attributes for sso record # change external attributes for sso record

10
spec/models/discourse_single_sign_on_spec.rb
View file

@ -294,6 +294,16 @@ describe DiscourseSingleSignOn do
# initial creation ... # initial creation ...
expect(avatar_id).to_not eq(nil) expect(avatar_id).to_not eq(nil)
# junk avatar id should be updated
old_id = user.uploaded_avatar_id
Upload.destroy(old_id)
user = sso.lookup_or_create_user(ip_address)
avatar_id = user.uploaded_avatar_id
expect(avatar_id).to_not eq(nil)
expect(old_id).to_not eq(avatar_id)
FileHelper.stubs(:download) { raise "should not be called" } FileHelper.stubs(:download) { raise "should not be called" }
sso.avatar_url = "https://some.new/avatar.png" sso.avatar_url = "https://some.new/avatar.png"
user = sso.lookup_or_create_user(ip_address) user = sso.lookup_or_create_user(ip_address)