IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

add some explicit scoping to help avoid erratic failure in test

Browse Source
This commit is contained in:
Sam 2017-03-07 16:00:51 -05:00
parent 99f4d5082b
commit 8d80a5d97e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/auth/google_oauth2_authenticator.rb
View File

@ -8,20 +8,20 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
session_info = parse_hash(auth_hash) session_info = parse_hash(auth_hash)
google_hash = session_info[:google] google_hash = session_info[:google]
result = Auth::Result.new result = ::Auth::Result.new
result.email = session_info[:email] result.email = session_info[:email]
result.email_valid = session_info[:email_valid] result.email_valid = session_info[:email_valid]
result.name = session_info[:name] result.name = session_info[:name]
result.extra_data = google_hash result.extra_data = google_hash
user_info = GoogleUserInfo.find_by(google_user_id: google_hash[:google_user_id]) user_info = ::GoogleUserInfo.find_by(google_user_id: google_hash[:google_user_id])
result.user = user_info.try(:user) result.user = user_info.try(:user)
if !result.user && !result.email.blank? && result.email_valid if !result.user && !result.email.blank? && result.email_valid
result.user = User.find_by_email(result.email) result.user = User.find_by_email(result.email)
if result.user if result.user
GoogleUserInfo.create({user_id: result.user.id}.merge(google_hash)) ::GoogleUserInfo.create({user_id: result.user.id}.merge(google_hash))
end end
end end