From 6ac285cf275b44b97fba2d2f0004099b968497dc Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Mon, 8 Sep 2025 14:23:20 +0930 Subject: [PATCH] Fix redirect in auth local admin If a local admin user was not found, do not redirect back to dashboard. Otherwise there is an infinite loop from dashboard to new session if there are no local admin configured. --- app/controllers/admin/sessions_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/sessions_controller.rb b/app/controllers/admin/sessions_controller.rb index 23b232d0..a668e069 100644 --- a/app/controllers/admin/sessions_controller.rb +++ b/app/controllers/admin/sessions_controller.rb @@ -97,8 +97,11 @@ def redirect_authenticated def authenticate_local_admin return if admin_signed_in? || !Rails.env.development? - session[:admin_user_id] = - Admin::User.where(email: %W[#{ENV.fetch('USER', nil)}@katalyst.com.au admin@katalyst.com.au]).first&.id + @current_admin_user = Admin::User.find_by(email: "#{ENV.fetch('USER', nil)}@katalyst.com.au") + + return unless admin_signed_in? + + session[:admin_user_id] = current_admin_user.id flash.delete(:redirect) if (redirect = flash[:redirect])