and add that back in too

Author: sethherr

app/models/user.rb

@@ -1,6 +1,19 @@
-class User < ApplicationRecord
-  # Include default devise modules. Others available are:
-  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :validatable
+class User < ActiveRecord::Base
+  devise :database_authenticatable, :registerable, :omniauthable,
+         :recoverable, :rememberable, :trackable, omniauth_providers: [:bike_index]
+
+  def self.from_omniauth(uid, auth)
+    where(email: auth.info.email).first_or_create do |user|
+      user.email = auth.info.email
+      user.password = Devise.friendly_token[0, 20]
+    end
+  end
+
+  def self.new_with_session(params, session)
+    super.tap do |user|
+      if data = session['devise.bike_index_email'] && session['devise.bike_index_data']['extra']['raw_info']
+        user.email = data['email'] if user.email.blank?
+      end
+    end
+  end
 end

db/migrate/20180902201811_devise_create_users.rb

@@ -32,6 +32,9 @@ def change
       # t.string   :unlock_token # Only if unlock strategy is :email or :both
       # t.datetime :locked_at
 
+      # Omniauthable
+      t.string   "provider"
+
 
       t.timestamps null: false
     end