allow Oauth to log in members or users

app/controllers/authentications_controller.rb

@@ -1,9 +1,10 @@
 class AuthenticationsController < Devise::OmniauthCallbacksController
   def google_oauth2
     # we override the devise mapping because routing sets it to user
-    request.env["devise.mapping"] = Devise.mappings[session[:authenticating].to_sym]
+    user_type = session[:authenticating].to_sym
+    request.env["devise.mapping"] = Devise.mappings[user_type]
 
-    @user = ConnectWithOauthProvider.connect(request.env["omniauth.auth"])
+    @user = ConnectWithOauthProvider.connect(request.env["omniauth.auth"], user_type)
 
     flash[:notice] = I18n.t "devise.omniauth_callbacks.success", kind: "Google"
     sign_in_and_redirect @user, event: :authentication

app/models/member.rb

@@ -1,7 +1,6 @@
 class Member < ActiveRecord::Base
   devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable,
-         :confirmable
+         :recoverable, :rememberable, :trackable, :validatable
 
   has_one :customer, class_name: "Payment::BraintreeCustomer"
   has_paper_trail on: [:update, :destroy]

app/services/connect_with_oauth_provider.rb

@@ -2,16 +2,17 @@
 class Champaign::NotWhitelisted < StandardError; end;
 
 class ConnectWithOauthProvider
-  def self.connect(data)
-    new(data).connect
+  def self.connect(data, type)
+    new(data, type).connect
   end
 
-  def initialize(resp)
+  def initialize(resp, type)
     @resp = resp
+    @type = type.to_sym
   end
 
   def connect
-    raise Champaign::NotWhitelisted unless whitelisted
+    raise Champaign::NotWhitelisted unless whitelisted || is_member?
 
     return connected_user if user_already_connected
 
@@ -28,11 +29,11 @@ def whitelisted
   end
 
   def connected_user
-    @connected_user ||= User.find_by(provider: @resp.provider, uid: @resp.uid)
+    @connected_user ||= user_class.find_by(provider: @resp.provider, uid: @resp.uid)
   end
 
   def disconnected_user
-    @disconnected_user ||= User.find_by(email: @resp.info.email)
+    @disconnected_user ||= user_class.find_by(email: @resp.info.email)
   end
 
   def updated_disconnected_user
@@ -41,7 +42,7 @@ def updated_disconnected_user
   end
 
   def create_user
-    @created_user ||= User.create!(
+    @created_user ||= user_class.create!(
       provider: @resp.provider,
       email: @resp.info.email,
       uid: @resp.uid,
@@ -57,6 +58,14 @@ def whitelist
     Settings.oauth_domain_whitelist
   end
 
+  def user_class
+    is_member? ? Member : User
+  end
+
+  def is_member?
+    @type == :member
+  end
+
   alias_method :user_exists_but_disconnected, :disconnected_user
   alias_method :user_already_connected, :connected_user
 end

db/migrate/20160328214521_add_uid_to_member.rb

@@ -0,0 +1,6 @@
+class AddUidToMember < ActiveRecord::Migration
+  def change
+    add_column :members, :provider, :string
+    add_column :members, :uid, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160316194728) do
+ActiveRecord::Schema.define(version: 20160328214521) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -184,6 +184,8 @@
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string   "unconfirmed_email"
+    t.string   "provider"
+    t.string   "uid"
   end
 
   add_index "members", ["actionkit_user_id"], name: "index_members_on_actionkit_user_id", using: :btree