Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SSO avatar downloading issues. 

* Follow redirects when downloading SSO avatars.
* Add proper image ext. to downloaded SSO avatars.
This commit is contained in:
Wilhansen Li 2014-08-26 23:52:07 +08:00
parent 009dc7ded3
commit bba3f7c0ac
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 ||
sso_record.external_avatar_url != avatar_url)
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
if !user.user_avatar.contains_upload?(upload.id)