From 42b6aeac23a633387bc07f57f1f05cce9a77f554 Mon Sep 17 00:00:00 2001 From: Fosco Marotto Date: Mon, 28 Dec 2020 01:15:59 -0500 Subject: [PATCH] [sessions] stick to master, take 2 --- app/controllers/auth/sessions_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 233f47f0..68471ce7 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -10,6 +10,7 @@ class Auth::SessionsController < Devise::SessionsController prepend_before_action :authenticate_with_two_factor, if: :two_factor_enabled?, only: [:create] before_action :set_instance_presenter, only: [:new] before_action :set_body_classes + before_action :use_master def new Devise.omniauth_configs.each do |provider, config| @@ -35,8 +36,11 @@ class Auth::SessionsController < Devise::SessionsController protected - def find_user + def use_master User.connection.stick_to_master! + end + + def find_user if session[:otp_user_id] User.find(session[:otp_user_id]) elsif user_params[:email]