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

FIX: protect against future regressions of google omniauth

Browse Source
This commit is contained in:
Sam
2016-11-07 12:48:00 +11:00
parent 6a720b6011
commit 2ddabc3928
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/auth/google_oauth2_authenticator.rb
View File

@ -18,8 +18,11 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
user_info = GoogleUserInfo.find_by(google_user_id: google_hash[:google_user_id])
result.user = user_info.try(:user)
if !result.user && !result.email.blank? && result.user = User.find_by_email(result.email)
GoogleUserInfo.create({user_id: result.user.id}.merge(google_hash))
if !result.user && !result.email.blank? && result.email_valid
result.user = User.find_by_email(result.email)
if result.user
GoogleUserInfo.create({user_id: result.user.id}.merge(google_hash))
end
end
result