github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 19:15:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: sso_overrides_avatar should override previously set avatar

Browse Source
This commit is contained in:
Arpit Jalan 2017-01-19 10:52:24 +05:30
parent 07660ecedb
commit 0791c2c966
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/discourse_single_sign_on.rb
View File

@ -146,7 +146,7 @@ class DiscourseSingleSignOn < SingleSignOn
sso_record.last_payload = unsigned_payload sso_record.last_payload = unsigned_payload
sso_record.external_id = external_id sso_record.external_id = external_id
else else
Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id) if avatar_url.present? Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id, override_gravatar: SiteSetting.sso_overrides_avatar) if avatar_url.present?
user.create_single_sign_on_record( user.create_single_sign_on_record(
last_payload: unsigned_payload, last_payload: unsigned_payload,
external_id: external_id, external_id: external_id,
@ -180,7 +180,7 @@ class DiscourseSingleSignOn < SingleSignOn
avatar_changed = sso_record.external_avatar_url != avatar_url avatar_changed = sso_record.external_avatar_url != avatar_url
if avatar_force_update || avatar_changed || avatar_missing if avatar_force_update || avatar_changed || avatar_missing
Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id) Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id, override_gravatar: SiteSetting.sso_overrides_avatar)
end end
end end