From 3b04fd5621efc10b101fd3bde09972d1d53b0652 Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <oliverw@matrix.org>
Date: Tue, 25 Nov 2025 18:20:14 +0000
Subject: [PATCH] Make `finish_sessions_to_replace_device` return whether any
 were finished

---
 crates/storage-pg/src/app_session.rs | 17 +++++++++++------
 crates/storage/src/app_session.rs    |  6 ++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/crates/storage-pg/src/app_session.rs b/crates/storage-pg/src/app_session.rs
index 4e12810cc..2867534c3 100644
--- a/crates/storage-pg/src/app_session.rs
+++ b/crates/storage-pg/src/app_session.rs
@@ -487,14 +487,15 @@ impl AppSessionRepository for PgAppSessionRepository<'_> {
         clock: &dyn Clock,
         user: &User,
         device: &Device,
-    ) -> Result<(), Self::Error> {
+    ) -> Result<bool, Self::Error> {
+        let mut affected = false;
         // TODO need to invoke this from all the oauth2 login sites
         let span = tracing::info_span!(
             "db.app_session.finish_sessions_to_replace_device.compat_sessions",
             { DB_QUERY_TEXT } = tracing::field::Empty,
         );
         let finished_at = clock.now();
-        sqlx::query!(
+        let compat_affected = sqlx::query!(
             "
                 UPDATE compat_sessions SET finished_at = $3 WHERE user_id = $1 AND device_id = $2 AND finished_at IS NULL
             ",
@@ -505,7 +506,9 @@ impl AppSessionRepository for PgAppSessionRepository<'_> {
         .record(&span)
         .execute(&mut *self.conn)
         .instrument(span)
-        .await?;
+        .await?
+        .rows_affected();
+        affected |= compat_affected > 0;
 
         if let Ok([stable_device_as_scope_token, unstable_device_as_scope_token]) =
             device.to_scope_token()
@@ -514,7 +517,7 @@ impl AppSessionRepository for PgAppSessionRepository<'_> {
                 "db.app_session.finish_sessions_to_replace_device.oauth2_sessions",
                 { DB_QUERY_TEXT } = tracing::field::Empty,
             );
-            sqlx::query!(
+            let oauth2_affected = sqlx::query!(
                 "
                     UPDATE oauth2_sessions
                     SET finished_at = $4
@@ -530,10 +533,12 @@ impl AppSessionRepository for PgAppSessionRepository<'_> {
             .record(&span)
             .execute(&mut *self.conn)
             .instrument(span)
-            .await?;
+            .await?
+            .rows_affected();
+            affected |= oauth2_affected > 0;
         }
 
-        Ok(())
+        Ok(affected)
     }
 }
 
diff --git a/crates/storage/src/app_session.rs b/crates/storage/src/app_session.rs
index d649ff35e..4c0b7703a 100644
--- a/crates/storage/src/app_session.rs
+++ b/crates/storage/src/app_session.rs
@@ -196,12 +196,14 @@ pub trait AppSessionRepository: Send + Sync {
     /// replacing a device).
     ///
     /// Should be called *before* creating a new session for the device.
+    ///
+    /// Returns true if a session was finished.
     async fn finish_sessions_to_replace_device(
         &mut self,
         clock: &dyn Clock,
         user: &User,
         device: &Device,
-    ) -> Result<(), Self::Error>;
+    ) -> Result<bool, Self::Error>;
 }
 
 repository_impl!(AppSessionRepository:
@@ -218,5 +220,5 @@ repository_impl!(AppSessionRepository:
         clock: &dyn Clock,
         user: &User,
         device: &Device,
-    ) -> Result<(), Self::Error>;
+    ) -> Result<bool, Self::Error>;
 );