From 2bf837257c0dbf9a342d68c5cc84bde98c7c074a Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <oliverw@matrix.org>
Date: Tue, 21 Oct 2025 09:43:46 +0100
Subject: [PATCH] find_active_by_session: take &PersonalSession

---
 crates/handlers/src/admin/v1/personal_sessions/get.rs       | 2 +-
 .../handlers/src/admin/v1/personal_sessions/regenerate.rs   | 2 +-
 crates/storage-pg/src/personal/access_token.rs              | 4 ++--
 crates/storage/src/personal/access_token.rs                 | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/handlers/src/admin/v1/personal_sessions/get.rs b/crates/handlers/src/admin/v1/personal_sessions/get.rs
index 2972a0315..c0c0378f8 100644
--- a/crates/handlers/src/admin/v1/personal_sessions/get.rs
+++ b/crates/handlers/src/admin/v1/personal_sessions/get.rs
@@ -81,7 +81,7 @@ pub async fn handler(
         None
     } else {
         repo.personal_access_token()
-            .find_active_for_session(session.id)
+            .find_active_for_session(&session)
             .await?
     };
 
diff --git a/crates/handlers/src/admin/v1/personal_sessions/regenerate.rs b/crates/handlers/src/admin/v1/personal_sessions/regenerate.rs
index ea43e4492..4bff08892 100644
--- a/crates/handlers/src/admin/v1/personal_sessions/regenerate.rs
+++ b/crates/handlers/src/admin/v1/personal_sessions/regenerate.rs
@@ -124,7 +124,7 @@ pub async fn handler(
     // Revoke the existing active token for the session.
     let old_token_opt = repo
         .personal_access_token()
-        .find_active_for_session(session_id)
+        .find_active_for_session(&session)
         .await?;
     let Some(old_token) = old_token_opt else {
         // This shouldn't happen
diff --git a/crates/storage-pg/src/personal/access_token.rs b/crates/storage-pg/src/personal/access_token.rs
index 1af9024aa..db8164fe9 100644
--- a/crates/storage-pg/src/personal/access_token.rs
+++ b/crates/storage-pg/src/personal/access_token.rs
@@ -138,7 +138,7 @@ impl PersonalAccessTokenRepository for PgPersonalAccessTokenRepository<'_> {
     )]
     async fn find_active_for_session(
         &mut self,
-        session_id: Ulid,
+        session: &PersonalSession,
     ) -> Result<Option<PersonalAccessToken>, Self::Error> {
         let res: Option<PersonalAccessTokenLookup> = sqlx::query_as!(
             PersonalAccessTokenLookup,
@@ -154,7 +154,7 @@ impl PersonalAccessTokenRepository for PgPersonalAccessTokenRepository<'_> {
                 WHERE personal_session_id = $1
                 AND revoked_at IS NULL
             "#,
-            Uuid::from(session_id),
+            Uuid::from(session.id),
         )
         .traced()
         .fetch_optional(&mut *self.conn)
diff --git a/crates/storage/src/personal/access_token.rs b/crates/storage/src/personal/access_token.rs
index d5607cf2f..363a3199f 100644
--- a/crates/storage/src/personal/access_token.rs
+++ b/crates/storage/src/personal/access_token.rs
@@ -56,14 +56,14 @@ pub trait PersonalAccessTokenRepository: Send + Sync {
     ///
     /// # Parameters
     ///
-    /// * `session_id`: The ID of the session to lookup
+    /// * `session`: The session to lookup
     ///
     /// # Errors
     ///
     /// Returns [`Self::Error`] if the underlying repository fails
     async fn find_active_for_session(
         &mut self,
-        session_id: Ulid,
+        session: &PersonalSession,
     ) -> Result<Option<PersonalAccessToken>, Self::Error>;
 
     /// Add a new access token to the database
@@ -120,7 +120,7 @@ repository_impl!(PersonalAccessTokenRepository:
 
     async fn find_active_for_session(
         &mut self,
-        session_id: Ulid,
+        session: &PersonalSession,
     ) -> Result<Option<PersonalAccessToken>, Self::Error>;
 
     async fn add(