Skip to content

Fix invalid admin user id in session #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sfnelson merged 1 commit into from
Jan 6, 2026
Merged

Fix invalid admin user id in session #667

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion app/controllers/concerns/koi/controller/has_admin_users.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,24 @@ module HasAdminUsers
included do
helper_method :admin_signed_in?
helper_method :current_admin_user

# @deprecated use current admin user instead
helper_method :current_admin
end

def admin_signed_in?
current_admin_user.present?
rescue ActiveRecord::RecordNotFound
false
end

def current_admin_user
@current_admin_user ||= Admin::User.find(session[:admin_user_id]) if session[:admin_user_id].present?
return @current_admin_user if instance_variable_defined?(:@current_admin_user)
return @current_admin_user = nil unless session.has_key?(:admin_user_id)

@current_admin_user = Admin::User.find(session[:admin_user_id])
ensure
session.delete(:admin_user_id) unless @current_admin_user
end

# @deprecated Use current_admin_user instead
Expand Down