Merge pull request #38 from toptier/bug/unique-uid

Set uid as email if the provider is email

Gemfile

@@ -57,7 +57,7 @@ end
 
 group :test do
   gem 'database_cleaner', '~> 1.4.1'
-  gem 'faker', '~> 1.4.3'
+  gem 'faker', '~> 1.7.3'
   gem 'shoulda-matchers', '~> 3.1.1'
   gem 'simplecov', '~> 0.13.0', require: false
   gem 'webmock', '~> 2.3.2'

Gemfile.lock

@@ -149,7 +149,7 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    faker (1.4.3)
+    faker (1.7.3)
       i18n (~> 0.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -402,7 +402,7 @@ DEPENDENCIES
   devise_token_auth (~> 0.1.39)
   draper (~> 3.0.0.pre)
   factory_girl_rails (~> 4.5.0)
-  faker (~> 1.4.3)
+  faker (~> 1.7.3)
   fog-aws (~> 0.12.0)
   haml (~> 4.0.6)
   inherited_resources!

app/models/user.rb

@@ -38,6 +38,8 @@ class User < ApplicationRecord
 
   validates :email, uniqueness: true
 
+  before_validation :init_uid
+
   def full_name
     return username unless first_name.present?
     "#{first_name} #{last_name}"
@@ -49,4 +51,10 @@ def self.from_social_provider(provider, user_params)
       user.assign_attributes user_params.except('id')
     end
   end
+
+  private
+
+  def init_uid
+    self.uid = email if uid.blank? && provider == 'email'
+  end
 end

spec/factories/user.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :user do
-    email     { Faker::Internet.email }
-    password  { Faker::Internet.password(8) }
-    sequence(:username) { |n| "#{n}#{Faker::Internet.user_name}" }
+    email    { Faker::Internet.unique.email }
+    password { Faker::Internet.password(8) }
+    username { Faker::Internet.unique.user_name }
   end
 end