Fix login failure with a user who email address already exists, but d…

…ifferent uid
cookpad · Mar 10, 2017 · 01cf9a0 · 01cf9a0
1 parent 8832fe1
commit 01cf9a0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/models/kuroko2/user.rb b/app/models/kuroko2/user.rb
@@ -23,11 +23,13 @@ class Kuroko2::User < Kuroko2::ApplicationRecord
   before_create :set_gravatar_image
 
   def self.find_or_create_user(uid, attributes)
-    find_or_create_by(uid: uid) do |user|
+    (find_by(uid: uid) || find_by(email: attributes[:email]) || new(uid: uid)).tap do |user|
+      user.uid        = uid
       user.name       = attributes[:name]
       user.email      = attributes[:email]
       user.first_name = attributes[:first_name]
       user.last_name  = attributes[:last_name]
+      user.save!
     end
   end