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

FEATURE: store twitter supplied email for auditing

Browse Source
This commit is contained in:
Sam
2017-12-14 15:35:27 +11:00
parent a9cac72fb9
commit 67aecff59c
3 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/auth/twitter_authenticator.rb
View File

@ -16,6 +16,7 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
twitter_user_id = auth_token["uid"]
result.extra_data = {
twitter_email: result.email,
twitter_user_id: twitter_user_id,
twitter_screen_name: result.username,
twitter_image: data["image"],
@ -26,11 +27,12 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
user_info = TwitterUserInfo.find_by(twitter_user_id: twitter_user_id)
result.user = user_info.try(:user)
if !result.user && result.email_valid && 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,
twitter_user_id: twitter_user_id
twitter_user_id: twitter_user_id,
email: result.email
)
end
@ -46,7 +48,8 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
TwitterUserInfo.create(
user_id: user.id,
screen_name: extra_data[:twitter_screen_name],
twitter_user_id: extra_data[:twitter_user_id]
twitter_user_id: extra_data[:twitter_user_id],
email: extra_data[:email]
)
retrieve_avatar(user, extra_data)