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

FIX: download SSO avatars in a background job to prevent hangs when avatars are huge

Browse Source
This commit is contained in:
Régis Hanol
2016-10-24 19:55:30 +02:00
parent e79465a965
commit 750338954c
2 changed files with 76 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/models/discourse_single_sign_on.rb
View File

@ -119,13 +119,15 @@ class DiscourseSingleSignOn < SingleSignOn
sso_record.last_payload = unsigned_payload
sso_record.external_id = external_id
else
UserAvatar.import_url_for_user(avatar_url, user) if avatar_url.present?
user.create_single_sign_on_record(last_payload: unsigned_payload,
external_id: external_id,
external_username: username,
external_email: email,
external_name: name,
external_avatar_url: avatar_url)
Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id) if avatar_url.present?
user.create_single_sign_on_record(
last_payload: unsigned_payload,
external_id: external_id,
external_username: username,
external_email: email,
external_name: name,
external_avatar_url: avatar_url
)
end
end
@ -148,12 +150,11 @@ class DiscourseSingleSignOn < SingleSignOn
avatar_missing = user.uploaded_avatar_id.nil? || !Upload.exists?(user.uploaded_avatar_id)
if (avatar_missing || avatar_force_update || SiteSetting.sso_overrides_avatar) && avatar_url.present?
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
UserAvatar.import_url_for_user(avatar_url, user)
end
if avatar_force_update || avatar_changed || avatar_missing
Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id)
end
end
# change external attributes for sso record