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

FIX: pull twitter's avatar & profile when signing up

Browse Source
This commit is contained in:
Régis Hanol
2016-10-17 15:43:40 +02:00
parent 3949c24f80
commit 0862ad406d
2 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lib/auth/twitter_authenticator.rb
View File

@ -17,13 +17,16 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
result.extra_data = {
twitter_user_id: twitter_user_id,
twitter_screen_name: result.username
twitter_screen_name: result.username,
twitter_image: data["image"],
twitter_description: data["description"],
twitter_location: data["location"]
}
user_info = TwitterUserInfo.find_by(twitter_user_id: twitter_user_id)
result.user = user_info.try(:user)
if !result.user && result.email.present? && result.user = User.find_by_email(result.email)
if !result.user && result.email_valid && result.user = User.find_by_email(result.email)
TwitterUserInfo.create(
user_id: result.user.id,
screen_name: result.username,
@ -31,33 +34,23 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
)
end
user = result.user
if user && (!user.user_avatar || user.user_avatar.custom_upload_id.nil?)
if (avatar_url = data["image"]).present?
UserAvatar.import_url_for_user(avatar_url.sub("_normal", ""), user, override_gravatar: false)
end
end
bio = data["description"]
location = data["location"]
if user && (bio || location)
profile = user.user_profile
profile.bio_raw = bio unless profile.bio_raw.present?
profile.location = location unless profile.location.present?
profile.save
end
retrieve_avatar(result.user, result.extra_data)
retrieve_profile(result.user, result.extra_data)
result
end
def after_create_account(user, auth)
data = auth[:extra_data]
extra_data = auth[:extra_data]
TwitterUserInfo.create(
user_id: user.id,
screen_name: data[:twitter_screen_name],
twitter_user_id: data[:twitter_user_id]
screen_name: extra_data[:twitter_screen_name],
twitter_user_id: extra_data[:twitter_user_id]
)
retrieve_avatar(user, extra_data)
retrieve_profile(user, extra_data)
end
def register_middleware(omniauth)
@ -69,4 +62,27 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
}
end
def retrieve_avatar(user, data)
return unless user
return if user.user_avatar.try(:custom_upload_id).present?
if (avatar_url = data[:twitter_image]).present?
UserAvatar.import_url_for_user(avatar_url.sub("_normal", ""), user, override_gravatar: false)
end
end
def retrieve_profile(user, data)
return unless user
bio = data[:twitter_description]
location = data[:twitter_location]
if user && (bio || location)
profile = user.user_profile
profile.bio_raw = bio unless profile.bio_raw.present?
profile.location = location unless profile.location.present?
profile.save
end
end
end