Fix login failure

With a user who email address already exists, But defferrent `uid`
cookpad · Mar 31, 2017 · 149ea35 · 149ea35
1 parent 8832fe1
commit 149ea35
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/models/kuroko2/user.rb b/app/models/kuroko2/user.rb
@@ -17,8 +17,10 @@ class Kuroko2::User < Kuroko2::ApplicationRecord
   has_many :admin_assignments, dependent: :restrict_with_error
   has_many :assigned_job_definitions, through: :admin_assignments, source: :job_definition
 
-  validates :name, uniqueness: { case_sensitive: false} , presence: true
-  validates :email, uniqueness: { case_sensitive: false}, presence: true
+  validates_presence_of :name
+  validates_presence_of :email
+  validates_uniqueness_of :name,  case_sensitive: false, unless: :google_account?
+  validates_uniqueness_of :email, case_sensitive: false, unless: :google_account?
 
   before_create :set_gravatar_image
 

diff --git a/db/migrate/027_drop_uniq_constraint_user_email.rb b/db/migrate/027_drop_uniq_constraint_user_email.rb
@@ -0,0 +1,6 @@
+class DropUniqConstraintUserEmail < ActiveRecord::Migration
+  def up
+    remove_index :users, name: "email"
+    add_index :users, :email, name: "email", using: :btree
+  end
+end