Replace Jotai with @tanstack/router

crates/graphql/src/query/mod.rs

@@ -16,7 +16,10 @@
 use mas_storage::user::UserRepository;
 
 use crate::{
-    model::{Anonymous, BrowserSession, Node, NodeType, OAuth2Client, User, UserEmail},
+    model::{
+        Anonymous, BrowserSession, CompatSession, Node, NodeType, OAuth2Client, OAuth2Session,
+        User, UserEmail,
+    },
     state::ContextExt,
     UserId,
 };
@@ -149,6 +152,56 @@
         Ok(Some(BrowserSession(browser_session)))
     }
 
+    /// Fetch a compatible session by its ID.
+    async fn compat_session(
+        &self,
+        ctx: &Context<'_>,
+        id: ID,
+    ) -> Result<Option<CompatSession>, async_graphql::Error> {
+        let state = ctx.state();
+        let id = NodeType::CompatSession.extract_ulid(&id)?;
+        let requester = ctx.requester();
+
+        let mut repo = state.repository().await?;
+        let compat_session = repo.compat_session().lookup(id).await?;
+        repo.cancel().await?;
+
+        let Some(compat_session) = compat_session else {
+            return Ok(None);
+        };
+
+        if !requester.is_owner_or_admin(&compat_session) {
+            return Ok(None);
+        }
+
+        Ok(Some(CompatSession::new(compat_session)))
+    }
+
+    /// Fetch an OAuth 2.0 session by its ID.
+    async fn oauth2_session(
+        &self,
+        ctx: &Context<'_>,
+        id: ID,
+    ) -> Result<Option<OAuth2Session>, async_graphql::Error> {
+        let state = ctx.state();
+        let id = NodeType::OAuth2Session.extract_ulid(&id)?;
+        let requester = ctx.requester();
+
+        let mut repo = state.repository().await?;
+        let oauth2_session = repo.oauth2_session().lookup(id).await?;
+        repo.cancel().await?;
+
+        let Some(oauth2_session) = oauth2_session else {
+            return Ok(None);
+        };
+
+        if !requester.is_owner_or_admin(&oauth2_session) {
+            return Ok(None);
+        }
+
+        Ok(Some(OAuth2Session(oauth2_session)))
+    }
+
     /// Fetch a user email by its ID.
     async fn user_email(
         &self,
@@ -185,10 +238,7 @@
 
         let ret = match node_type {
             // TODO
-            NodeType::Authentication
-            | NodeType::CompatSession
-            | NodeType::CompatSsoLogin
-            | NodeType::OAuth2Session => None,
+            NodeType::Authentication | NodeType::CompatSsoLogin => None,
 
             NodeType::UpstreamOAuth2Provider => UpstreamOAuthQuery
                 .upstream_oauth2_provider(ctx, id)
@@ -210,6 +260,16 @@
                 .await?
                 .map(|e| Node::UserEmail(Box::new(e))),
 
+            NodeType::CompatSession => self
+                .compat_session(ctx, id)
+                .await?
+                .map(|s| Node::CompatSession(Box::new(s))),
+
+            NodeType::OAuth2Session => self
+                .oauth2_session(ctx, id)
+                .await?
+                .map(|s| Node::OAuth2Session(Box::new(s))),
+
             NodeType::BrowserSession => self
                 .browser_session(ctx, id)
                 .await?

crates/handlers/src/oauth2/discovery.rs

@@ -177,7 +177,7 @@ pub(crate) async fn get(
         graphql_endpoint: url_builder.graphql_endpoint(),
         account_management_uri: url_builder.account_management_uri(),
         // This needs to be kept in sync with what is supported in the frontend,
-        // see frontend/src/routing/actions.ts
+        // see frontend/src/routes/__root.tsx
         account_management_actions_supported: vec![
             "org.matrix.profile".to_owned(),
             "org.matrix.sessions_list".to_owned(),

frontend/locales/en.json

@@ -66,7 +66,12 @@
       "confirmation_modal_title": "Are you sure you want to end this session?",
       "text": "End session"
     },
-    "error_boundary_title": "Something went wrong",
+    "error": {
+      "hideDetails": "Hide details",
+      "showDetails": "Show details",
+      "subtitle": "An unexpected error occurred. Please try again.",
+      "title": "Something went wrong"
+    },
     "last_active": {
       "active_date": "Active {{relativeDate}}",
       "active_now": "Active now",
@@ -132,7 +137,6 @@
         "title": "Cannot find session: {{deviceId}}"
       }
     },
-    "unknown_route": "Unknown route {{route}}",
     "unverified_email_alert": {
       "button": "Review and verify",
       "text:one": "You have {{count}} unverified email address.",
@@ -154,9 +158,6 @@
       "heading": "Emails",
       "no_primary_email_alert": "No primary email address"
     },
-    "user_greeting": {
-      "error": "Failed to load user"
-    },
     "user_name": {
       "display_name_field_label": "Display Name"
     },
@@ -177,8 +178,7 @@
         "description": "Check the code sent to your email and update the fields below to continue.",
         "title": "You entered the wrong code"
       },
-      "resend_code": "Resend code",
-      "unknown_email": "Unknown email"
+      "resend_code": "Resend code"
     }
   }
 }