From ba7bca438c72ce57d717767721c206af19f99291 Mon Sep 17 00:00:00 2001 From: May Jawdat Date: Fri, 19 Jan 2018 13:57:56 -0800 Subject: [PATCH 1/2] Update user model to accept LinkedIn profiles with missing information --- app/models/user.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 46a44e2..d31a19c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -17,16 +17,16 @@ def serializable_hash(options = nil) def self.find_or_create_from_auth_hash(auth_hash) self.find_or_create_by(uid: auth_hash[:uid]) do |user| - user.name = auth_hash[:info][:first_name] + ' ' + auth_hash[:info][:last_name] - user.email = auth_hash[:info][:email] + user.name = auth_hash[:info][:first_name] + ' ' + auth_hash[:info][:last_name] rescue user.name = nil + user.email = auth_hash[:info][:email] rescue user.email = nil # user.description = auth_hash[:info][:description] - user.location = auth_hash[:info][:location][:name] - user.photo_url = auth_hash.extra.raw_info.pictureUrls.values[1][0] - user.linkedin_url = auth_hash[:info][:urls][:public_profile] + user.location = auth_hash[:info][:location][:name] rescue user.location = nil + user.photo_url = auth_hash.extra.raw_info.pictureUrls.values[1][0] rescue user.photo_url = nil + user.linkedin_url = auth_hash[:info][:urls][:public_profile] rescue user.linkedin_url = nil # user.linkedin_token = auth_hash[:credentials][:token] # user.linkedin_token_expiration = auth_hash[:credentials][:expires_at] - user.current_company = auth_hash[:extra][:raw_info][:positions][:values][0][:company][:name] - user.current_position = auth_hash[:extra][:raw_info][:positions][:values][0][:title] + user.current_company = auth_hash[:extra][:raw_info][:positions][:values][0][:company][:name] rescue user.current_company = nil + user.current_position = auth_hash[:extra][:raw_info][:positions][:values][0][:title] rescue user.current_position = nil end end end From 00ab535eb285ce150e23b8a51beb4c24e48f8374 Mon Sep 17 00:00:00 2001 From: May Jawdat Date: Fri, 19 Jan 2018 15:47:51 -0800 Subject: [PATCH 2/2] Resolve merge conflict --- app/models/user.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index be35eb3..d31a19c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -20,15 +20,9 @@ def self.find_or_create_from_auth_hash(auth_hash) user.name = auth_hash[:info][:first_name] + ' ' + auth_hash[:info][:last_name] rescue user.name = nil user.email = auth_hash[:info][:email] rescue user.email = nil # user.description = auth_hash[:info][:description] -<<<<<<< HEAD user.location = auth_hash[:info][:location][:name] rescue user.location = nil user.photo_url = auth_hash.extra.raw_info.pictureUrls.values[1][0] rescue user.photo_url = nil user.linkedin_url = auth_hash[:info][:urls][:public_profile] rescue user.linkedin_url = nil -======= - user.location = auth_hash[:info][:location][:name] - user.photo_url = auth_hash.extra.raw_info.pictureUrls.values[1][0] unless auth_hash.extra.raw_info.pictureUrls.values.empty? - user.linkedin_url = auth_hash[:info][:urls][:public_profile] ->>>>>>> 5d613097692af7f075267094884e5cbefb329528 # user.linkedin_token = auth_hash[:credentials][:token] # user.linkedin_token_expiration = auth_hash[:credentials][:expires_at] user.current_company = auth_hash[:extra][:raw_info][:positions][:values][0][:company][:name] rescue user.current_company = nil