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

Refactors self.first_or_initialize_for_oauth

Browse Source
This commit is contained in:
kikito
2016-01-19 19:47:28 +01:00
parent 7615dc066b
commit 8dcb5d2cac
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/user.rb
View File

@@ -51,20 +51,16 @@ class User < ActiveRecord::Base
before_validation :clean_document_number
# Get the existing user by email if the provider gives us a verified email.
def self.first_or_initialize_for_oauth(auth)
email, user = nil, nil
if auth.info.verified || auth.info.verified_email
email = auth.info.email
user = User.where(email: email).first
end
user || User.new(
registering_with_oauth: true,
username: auth.info.nickname || auth.extra.raw_info.name.parameterize('-') || auth.uid,
email: email,
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?
auth_email_user || User.new(
username: auth.info.nickname || auth.extra.raw_info.name.parameterize('-') || auth.uid,
email: auth_email,
password: Devise.friendly_token[0,20],
terms_of_service: '1',
confirmed_at: DateTime.now
confirmed_at: auth_email.present? ? DateTime.now : nil
)
end