github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: always respect avatar_force_update

Browse Source
This commit is contained in:
Sam
2016-09-02 12:04:22 +10:00
parent 211c374df6
commit 0a39ba43ed
2 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/discourse_single_sign_on.rb
View File

@ -49,7 +49,7 @@ class DiscourseSingleSignOn < SingleSignOn
def lookup_or_create_user(ip_address=nil)
sso_record = SingleSignOnRecord.find_by(external_id: external_id)
if sso_record && user = sso_record.user
if sso_record && (user = sso_record.user)
sso_record.last_payload = unsigned_payload
else
user = match_email_or_create_user(ip_address)
@ -145,9 +145,8 @@ class DiscourseSingleSignOn < SingleSignOn
user.name = name || User.suggest_name(username.blank? ? email : username)
end
if SiteSetting.sso_overrides_avatar && avatar_url.present? && (
avatar_force_update ||
sso_record.external_avatar_url != avatar_url)
if (SiteSetting.sso_overrides_avatar && avatar_url.present? && (
sso_record.external_avatar_url != avatar_url)) || avatar_force_update
UserAvatar.import_url_for_user(avatar_url, user)
end