consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrects the logic dealing with confirmations of users via oauth

Browse Source
This commit is contained in:
kikito
2016-01-25 12:13:25 +01:00
parent 248bff712c
commit 98f99954e7
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/user.rb
View File

@@ -51,15 +51,17 @@ class User < ActiveRecord::Base
# Get the existing user by email if the provider gives us a verified email.
def self.first_or_initialize_for_oauth(auth)
auth_email = auth.info.email if auth.info.verified || auth.info.verified_email
auth_email_user = User.find_by(email: auth_email) if auth_email.present?
oauth_email = auth.info.email
confirmed_oauth_email = oauth_email if auth.info.verified || auth.info.verified_email
oauth_user = User.find_by(email: confirmed_oauth_email) if confirmed_oauth_email.present?
auth_email_user || User.new(
oauth_user || User.new(
username: auth.info.name || auth.uid,
email: auth_email,
email: oauth_email,
confirmed_oauth_email: confirmed_oauth_email,
password: Devise.friendly_token[0,20],
terms_of_service: '1',
confirmed_at: auth_email.present? ? DateTime.now : nil
confirmed_at: confirmed_oauth_email.present? ? DateTime.now : nil
)
end