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

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
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)
end
if (SiteSetting.sso_overrides_avatar && avatar_url.present? && (
sso_record.external_avatar_url != avatar_url)) || avatar_force_update
avatar_missing = user.uploaded_avatar_id.nil? || !Upload.exists?(user.uploaded_avatar_id)
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
# change external attributes for sso record