fix: simplify thread local variable management

Author: Bulletdev

app/controllers/concerns/authenticatable.rb

@@ -10,7 +10,6 @@ module Authenticatable
     before_action :authenticate_request!
     before_action :set_current_user
     before_action :set_current_organization
-    around_action :set_organization_context
   end
 
   private
@@ -30,6 +29,12 @@ def authenticate_request!
       @current_user = User.unscoped.find(@jwt_payload[:user_id])
       @current_organization = @current_user.organization
 
+      # Set thread-local variables for OrganizationScoped models
+      # This is needed early for update_last_login! and will be maintained by set_organization_context
+      Thread.current[:current_organization_id] = @current_organization.id
+      Thread.current[:current_user_id] = @current_user.id
+      Thread.current[:current_user_role] = @current_user.role
+
       # Update last login time (uses update_column which skips callbacks/audit logs)
       @current_user.update_last_login! if should_update_last_login?
     rescue Authentication::Services::JwtService::AuthenticationError => e
@@ -133,20 +138,4 @@ def render_forbidden(message = 'Forbidden')
       }
     }, status: :forbidden
   end
-
-  def set_organization_context
-    # Set thread-local variables for OrganizationScoped concern
-    if current_organization && current_user
-      Thread.current[:current_organization_id] = current_organization.id
-      Thread.current[:current_user_id] = current_user.id
-      Thread.current[:current_user_role] = current_user.role
-    end
-
-    yield
-  ensure
-    # Always reset thread-local variables
-    Thread.current[:current_organization_id] = nil
-    Thread.current[:current_user_id] = nil
-    Thread.current[:current_user_role] = nil
-  end
 end