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

Merge pull request #2708 from Wilhansen/sso_override_avatar

Browse Source 
Fix SSO avatar downloading issues.
This commit is contained in:
Sam 2014-08-29 09:53:48 +10:00
commit 5b696ca25a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/discourse_single_sign_on.rb
View File

@ -126,10 +126,12 @@ class DiscourseSingleSignOn < SingleSignOn
avatar_force_update.to_i != 0 || avatar_force_update.to_i != 0 ||
sso_record.external_avatar_url != avatar_url) sso_record.external_avatar_url != avatar_url)
begin begin
tempfile = FileHelper.download(avatar_url, 1.megabyte, "sso-avatar") tempfile = FileHelper.download(avatar_url, 1.megabyte, "sso-avatar", true)
upload = Upload.create_for(user.id, tempfile, "external-avatar", File.size(tempfile.path), { origin: avatar_url }) ext = FastImage.type(tempfile).to_s
tempfile.rewind
upload = Upload.create_for(user.id, tempfile, "external-avatar." + ext, File.size(tempfile.path), { origin: avatar_url })
user.uploaded_avatar_id = upload.id user.uploaded_avatar_id = upload.id
if !user.user_avatar.contains_upload?(upload.id) if !user.user_avatar.contains_upload?(upload.id)