katalyst-koi 5.5.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a64f8ea56e122d169ec52b8c304c79a1b81289bba216d89d2b97c9f0aaf9e24
-  data.tar.gz: e07ac3a269c0cf2958f33fb9e3da25dec86a84d27f25f3d0314ecc4d4fed5f4f
+  metadata.gz: beb8b89b9542bb29583d8908cbc41746eaa2eaac7540ebd0c1ba0f7818e2a524
+  data.tar.gz: 0f80f33a3561c9913540115cff337c5df17ca50789435973ad1b1df11438cbf8
 SHA512:
-  metadata.gz: c337a6f84e5ce47739dc9242207b9eafd2a0fbf6c9bf3f5b89338910175b3598dc575037849fb1a844e1a1608b54cb9e08e891286047b1548bbe127484ae446a
-  data.tar.gz: 84b32b36bd70147f24f0b975df0b722ba37f860185c1df483c1947c55ec17c74d1332e16b29d30b95f1f0f59021dced986db12ae005f7962349f3cd30df74246
+  metadata.gz: dbcc40de9887a60357c6e03280c51e1172bebdbd72f34ef549a57b9ea31566cf7b79353e802a4678bf7d7580dc7a10e9a3095aabc6c44b08983b88027e1d59f4
+  data.tar.gz: 35debfa95facb9a6419d462352a42e08d8dfe6810ff0432b6b41d653ce1decf5373e27e25fc4c0ff17457c9949258228abe022c4b5e89e2ac5c642a8012ba4f5

data/app/controllers/admin/admin_users_controller.rb

@@ -94,6 +94,7 @@ module Admin
       attribute :name, :string
       attribute :email, :string
       attribute :last_sign_in_at, :date
+      attribute :last_sign_out_at, :date
       attribute :sign_in_count, :integer
       attribute :password_login, :enum, scope: :has_password_login, multiple: false
       attribute :passkey, :boolean, scope: :has_passkey

data/app/controllers/admin/sessions_controller.rb

@@ -41,9 +41,7 @@ module Admin
     end
 
     def destroy
-      record_sign_out!(Koi::Current.admin_user)
-
-      session[:admin_user_id] = nil
+      destroy_admin_session!
 
       redirect_to new_admin_session_path
     end
@@ -103,11 +101,14 @@ module Admin
     def authenticate_local_admin
       return if admin_signed_in? || !Rails.env.development?
 
-      Koi::Current.admin_user = Admin::User.find_by(email: "#{ENV.fetch('USER', nil)}@katalyst.com.au")
+      Koi::Current.admin_user = Admin::User.find_by(email: [
+        ENV.fetch("EMAIL", nil),
+        "#{ENV.fetch('USER', nil)}@katalyst.com.au",
+      ].compact)
 
       return unless admin_signed_in?
 
-      session[:admin_user_id] = Koi::Current.admin_user.id
+      create_admin_session!
 
       flash.delete(:redirect) if (redirect = flash[:redirect])
 
@@ -115,9 +116,9 @@ module Admin
     end
 
     def admin_sign_in(admin_user)
-      record_sign_in!(admin_user)
+      Koi::Current.admin_user = admin_user
 
-      session[:admin_user_id] = admin_user.id
+      create_admin_session!
 
       redirect_to(url_from(params[:redirect].presence) || admin_dashboard_path, status: :see_other)
     end

data/app/controllers/admin/tokens_controller.rb

@@ -22,9 +22,7 @@ module Admin
 
     def update
       if (@admin_user = Admin::User.find_by_token_for(:password_reset, params[:token]))
-        record_sign_in!(admin_user)
-
-        session[:admin_user_id] = admin_user.id
+        create_admin_session!(admin_user)
 
         if admin_user.credentials.any?
           redirect_to(admin_root_path, status: :see_other)

data/app/controllers/concerns/koi/controller/records_authentication.rb

@@ -3,33 +3,46 @@
 module Koi
   module Controller
     module RecordsAuthentication
-      def update_last_sign_in(admin_user)
-        return if admin_user.current_sign_in_at.blank?
+      def create_admin_session!(admin_user = Koi::Current.admin_user)
+        sign_in_at = Time.current
 
-        admin_user.last_sign_in_at = admin_user.current_sign_in_at
-        admin_user.last_sign_in_ip = admin_user.current_sign_in_ip
-      end
-
-      def record_sign_in!(admin_user)
         update_last_sign_in(admin_user)
 
-        admin_user.current_sign_in_at = Time.current
+        admin_user.current_sign_in_at = sign_in_at
         admin_user.current_sign_in_ip = request.remote_ip
         admin_user.sign_in_count += 1
 
         admin_user.save!
+
+        session[:admin_user_id] = admin_user.id
+        session[:admin_user_signed_in_at] = sign_in_at.iso8601
       end
 
-      def record_sign_out!(admin_user)
+      def destroy_admin_session!(admin_user = Koi::Current.admin_user)
+        session[:admin_user_id] = nil
+        session[:admin_user_signed_in_at] = nil
+
         return unless admin_user
 
+        sign_out_at = Time.current
+
         update_last_sign_in(admin_user)
 
+        admin_user.last_sign_out_at = sign_out_at
         admin_user.current_sign_in_at = nil
         admin_user.current_sign_in_ip = nil
 
         admin_user.save!
       end
+
+      private
+
+      def update_last_sign_in(admin_user)
+        return if admin_user.current_sign_in_at.blank?
+
+        admin_user.last_sign_in_at = admin_user.current_sign_in_at
+        admin_user.last_sign_in_ip = admin_user.current_sign_in_ip
+      end
     end
   end
 end

data/db/migrate/20260501000000_add_last_sign_out_at_to_admin_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddLastSignOutAtToAdminUsers < ActiveRecord::Migration[8.0]
+  def change
+    add_column :admins, :last_sign_out_at, :datetime
+  end
+end

data/lib/koi/middleware/admin_authentication.rb

@@ -27,7 +27,10 @@ module Koi
                                   end
 
         # Remove from session if not found
-        session.delete(:admin_user_id) if session.has_key?(:admin_user_id) && !authenticated?
+        if session.has_key?(:admin_user_id) && !authenticated?
+          session.delete(:admin_user_id)
+          session.delete(:admin_user_signed_in_at)
+        end
 
         if requires_authentication?(request) && !authenticated?
           unauthorized_response(request)
@@ -58,7 +61,20 @@ module Koi
       end
 
       def session_admin_user(session)
-        Admin::User.find_by(id: session[:admin_user_id])
+        admin_user = Admin::User.find_by(id: session[:admin_user_id])
+        return unless admin_user
+
+        signed_in_at = session_signed_in_at(session)
+        return if signed_in_at.blank?
+        return if admin_user.last_sign_out_at.present? && signed_in_at < admin_user.last_sign_out_at
+
+        admin_user
+      end
+
+      def session_signed_in_at(session)
+        Time.zone.parse(session[:admin_user_signed_in_at].to_s)
+      rescue ArgumentError
+        nil
       end
 
       def bearer_token(request)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-koi
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.6.0
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -470,6 +470,7 @@ files:
 - db/migrate/20241214060913_add_otp_secret_to_admin_users.rb
 - db/migrate/20250204060748_create_well_knowns.rb
 - db/migrate/20260413014834_create_admin_device_authorizations.rb
+- db/migrate/20260501000000_add_last_sign_out_at_to_admin_users.rb
 - db/seeds.rb
 - lib/generators/koi/admin/USAGE
 - lib/generators/koi/admin/admin_generator.rb