Do fallback redirect at router level

Author: hughns

frontend/src/routes/_account.index.tsx

@@ -27,7 +27,12 @@ import AddEmailForm from "../components/UserProfile/AddEmailForm";
 import UserEmailList, {
   query as userEmailListQuery,
 } from "../components/UserProfile/UserEmailList";
-import { graphql } from "../gql";
+import {
+  CONFIG_FRAGMENT as PLAN_MANAGEMENT_CONFIG_FRAGMENT,
+  query as planManagementQuery,
+} from "./_account.plan.index";
+
+import { graphql, useFragment } from "../gql";
 import { graphqlRequest } from "../graphql";
 
 const QUERY = graphql(/* GraphQL */ `
@@ -96,7 +101,7 @@ const actionSchema = v.variant("action", [
 export const Route = createFileRoute("/_account/")({
   validateSearch: actionSchema,
 
-  beforeLoad({ search }) {
+  async beforeLoad({ search, context }) {
     switch (search.action) {
       case "profile":
       case "org.matrix.profile":
@@ -129,10 +134,17 @@ export const Route = createFileRoute("/_account/")({
           to: "/reset-cross-signing",
           search: { deepLink: true },
         });
-      case "org.matrix.plan_management":
+      case "org.matrix.plan_management": {
+        const { siteConfig } =
+          await context.queryClient.ensureQueryData(planManagementQuery);
+        const { planManagementIframeUri } = useFragment(
+          PLAN_MANAGEMENT_CONFIG_FRAGMENT,
+          siteConfig,
+        );
         throw redirect({
-          to: "/plan",
+          to: planManagementIframeUri ? "/plan" : "/",
         });
+      }
     }
   },
 

frontend/src/routes/_account.plan.index.tsx

@@ -4,7 +4,7 @@
 // Please see LICENSE in the repository root for full details.
 
 import { queryOptions, useSuspenseQuery } from "@tanstack/react-query";
-import { createFileRoute, Navigate } from "@tanstack/react-router";
+import { Navigate, createFileRoute } from "@tanstack/react-router";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { graphql, useFragment } from "../gql";
 import { graphqlRequest } from "../graphql";
@@ -23,7 +23,7 @@ const QUERY = graphql(/* GraphQL */ `
   }
 `);
 
-const query = queryOptions({
+export const query = queryOptions({
   queryKey: ["siteConfig"],
   queryFn: ({ signal }) => graphqlRequest({ query: QUERY, signal }),
 });