github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 04:14:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

BUGFIX: allow facebook auth for people refusing email

Browse Source
This commit is contained in:
Sam
2014-02-17 14:45:17 +11:00
parent abb2de22ab
commit 70c50d321a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/auth/facebook_authenticator.rb
View File

@ -13,14 +13,14 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
result.email = email = session_info[:email] result.email = email = session_info[:email]
result.email_valid = true result.email_valid = true
result.name = name = facebook_hash[:name] result.name = facebook_hash[:name]
result.extra_data = facebook_hash result.extra_data = facebook_hash
user_info = FacebookUserInfo.where(facebook_user_id: facebook_hash[:facebook_user_id]).first user_info = FacebookUserInfo.where(facebook_user_id: facebook_hash[:facebook_user_id]).first
result.user = user_info.try(:user) result.user = user_info.try(:user)
if !result.user && result.user = User.where(email: Email.downcase(email)).first if !result.user && !email.blank? && result.user = User.where(email: Email.downcase(email)).first
FacebookUserInfo.create({user_id: result.user.id}.merge(facebook_hash)) FacebookUserInfo.create({user_id: result.user.id}.merge(facebook_hash))
end end