From 0181d0da940a09b96307acb62617e0f2f7e124ab Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathan@hotseat.io>
Date: Sun, 7 May 2023 22:26:46 -0700
Subject: [PATCH] A couple of Devise bug fixes (#84)

* Fix sign_in, sign_out routes

* Remember users on login
---
 app/controllers/omniauth_callbacks_controller.rb | 3 +++
 config/routes.rb                                 | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 708172a6..fb9376f3 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -3,6 +3,7 @@
 
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   extend T::Sig
+  include Devise::Controllers::Rememberable
 
   # skip_before_action :authenticate_user!, raise: false
   skip_before_action :verify_authenticity_token, only: :google_oauth2
@@ -12,6 +13,8 @@ def google_oauth2
     auth = request.env["omniauth.auth"]
     user = User.from_omniauth(auth, referral_code: cookies[:referral_code])
 
+    remember_me(user)
+
     if user.persisted?
       flash[:success] = "Successfully logged in! Welcome to Hotseat!"
       sign_in_and_redirect(user)
diff --git a/config/routes.rb b/config/routes.rb
index 2e5bc06c..df65dc04 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -14,8 +14,8 @@
   }
 
   devise_scope :user do
-    get "sign_in", to: "sessions#new", as: :new_user_session
-    delete "sign_out", to: "sessions#destroy", as: :destroy_user_session
+    get "sign_in", to: "devise/sessions#new", as: :new_user_session
+    delete "sign_out", to: "devise/sessions#destroy", as: :destroy_user_session
   end
 
   mount Ahoy::Engine => "/hotcount"