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

Rename find_for_oauth param and refactor user expression

Browse Source
This commit is contained in:
kikito
2016-01-13 11:32:29 +01:00
parent 271146f688
commit 5ea8d76903
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/user.rb
View File

@@ -52,17 +52,14 @@ class User < ActiveRecord::Base
before_validation :clean_document_number
def self.find_for_oauth(auth, signed_in_resource = nil)
# Get the identity and user if they exist
identity = Identity.find_for_oauth(auth)
def self.find_for_oauth(auth, current_user)
identity = Identity.first_or_create_from_oauth(auth)
# If a signed_in_resource is provided it always overrides the existing user
# If a current is provided it always overrides the existing user
# to prevent the identity being locked with accidentally created accounts.
# Note that this may leave zombie accounts (with no associated identity) which
# can be cleaned up at a later date.
user = signed_in_resource ? signed_in_resource : identity.user
user ||= first_or_create_for_oauth(auth)
user = current_user || identity.user || first_or_create_for_oauth(auth)
identity.update(user: user)
user