diff --git a/apps/web/src/AppRoot.tsx b/apps/web/src/AppRoot.tsx
index df610d8e1ab8f..a89764939c51c 100644
--- a/apps/web/src/AppRoot.tsx
+++ b/apps/web/src/AppRoot.tsx
@@ -3,7 +3,6 @@ import { RouterProvider } from "@tanstack/react-router";
import { BrowserProfileReporter } from "./browser/BrowserProfileReporter";
import { ElectronBrowserHost } from "./browser/ElectronBrowserHost";
import { QuitHoldOverlay } from "./components/QuitHoldOverlay";
-import { AppAtomRegistryProvider } from "./rpc/atomRegistry";
import type { AppRouter } from "./router";
/**
@@ -13,11 +12,11 @@ import type { AppRouter } from "./router";
*/
export function AppRoot({ router }: { readonly router: AppRouter }) {
return (
-
+ <>
-
+ >
);
}
diff --git a/apps/web/src/cloud/managedAuth.test.ts b/apps/web/src/cloud/managedAuth.test.ts
index 63001bdb184da..b77ef69746d65 100644
--- a/apps/web/src/cloud/managedAuth.test.ts
+++ b/apps/web/src/cloud/managedAuth.test.ts
@@ -1,31 +1,105 @@
+// @vitest-environment jsdom
+
+import { useAtomValue } from "@effect/atom-react";
import { managedRelaySessionAtom, setManagedRelaySession } from "@t3tools/client-runtime/relay";
import * as Effect from "effect/Effect";
+import { act, createElement, type PropsWithChildren, useState } from "react";
+import ReactDOM, { type Root } from "react-dom/client";
import { afterEach, describe, expect, it, vi } from "vite-plus/test";
+import { environmentCatalog } from "../connection/catalog";
import { appAtomRegistry } from "../rpc/atomRegistry";
import {
activateManagedRelayAuthentication,
deactivateManagedRelayAuthentication,
} from "./managedAuth";
-vi.mock("@clerk/react", () => ({
- useAuth: vi.fn(),
-}));
+const fixture = vi.hoisted(() => {
+ let completeCleanup = () => {};
+ const cleanupFinished = new Promise((resolve) => {
+ completeCleanup = resolve;
+ });
+ return { signOut: () => {}, cleanupFinished, completeCleanup };
+});
+
+vi.mock("@clerk/react", async () => {
+ const { createContext, useContext } = await import("react");
+ const AuthContext = createContext({ isSignedIn: false });
+ const getToken = async () => null;
+ return {
+ ClerkProvider: ({ children }: PropsWithChildren) => {
+ const [isSignedIn, setSignedIn] = useState(true);
+ fixture.signOut = () => setSignedIn(false);
+ return createElement(AuthContext.Provider, { value: { isSignedIn } }, children);
+ },
+ useAuth: () => {
+ const { isSignedIn } = useContext(AuthContext);
+ return { isLoaded: true, isSignedIn, userId: isSignedIn ? "demo-account" : null, getToken };
+ },
+ };
+});
+
+vi.mock("../connection/catalog", async () => {
+ const { Atom, AsyncResult } = await import("effect/reactivity");
+ const catalogValueAtom = Atom.make({
+ entries: new Map([
+ ["relay-demo", true],
+ ["independent-direct", false],
+ ]),
+ });
+ return {
+ environmentCatalog: {
+ catalogValueAtom,
+ // Each real registry owns its catalog state; registry.test covers route-removal policy.
+ removeRelayEnvironments: {
+ label: "test:remove-relay-environments",
+ run: async (registry: import("effect/reactivity/AtomRegistry").AtomRegistry) => {
+ registry.set(catalogValueAtom, {
+ entries: new Map(
+ [...registry.get(catalogValueAtom).entries].filter(([, relay]) => !relay),
+ ),
+ });
+ fixture.completeCleanup();
+ return AsyncResult.success(undefined);
+ },
+ },
+ },
+ };
+});
+
+function CatalogView() {
+ const { entries } = useAtomValue(environmentCatalog.catalogValueAtom);
+ return createElement("div", null, [...entries.keys()].join(", "));
+}
+vi.mock("@tanstack/react-router", async (importOriginal) => ({
+ ...(await importOriginal()),
+ RouterProvider: () => createElement(CatalogView),
+}));
+vi.mock("../router", () => ({ getRouter: () => ({ load: async () => {} }) }));
+vi.mock("../env", () => ({ isElectron: false }));
+vi.mock("../providerAuthDelivery", () => ({ prepareProviderAuthDelivery: () => {} }));
+vi.mock("./publicConfig", () => ({
+ hasCloudPublicConfig: () => true,
+ resolveRelayClerkTokenOptions: () => ({}),
+}));
vi.mock("../lib/runtime", () => ({
- runtime: {
- runPromiseExit: vi.fn(),
- },
+ runtime: { runPromiseExit: async () => ({ _tag: "Success", value: undefined }) },
}));
+vi.mock("../browser/BrowserProfileReporter", () => ({ BrowserProfileReporter: () => null }));
+vi.mock("../browser/ElectronBrowserHost", () => ({ ElectronBrowserHost: () => null }));
+vi.mock("../components/QuitHoldOverlay", () => ({ QuitHoldOverlay: () => null }));
-vi.mock("../connection/catalog", () => ({
- environmentCatalog: {
- removeRelayEnvironments: {},
- },
-}));
+let root: Root | undefined;
-afterEach(() => {
+afterEach(async () => {
+ await act(() => root?.unmount());
+ root = undefined;
deactivateManagedRelayAuthentication();
+ vi.restoreAllMocks();
+ vi.unstubAllEnvs();
+ vi.unstubAllGlobals();
+ document.body.replaceChildren();
});
describe("managed relay authentication", () => {
@@ -55,4 +129,28 @@ describe("managed relay authentication", () => {
expect(appAtomRegistry.get(managedRelaySessionAtom)?.accountId).toBe("account-2");
});
+
+ it("sign-out removes Relay environments from the catalog rendered by the app", async () => {
+ vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+ vi.stubEnv("VITE_CLERK_PUBLISHABLE_KEY", "pk_test_synthetic");
+ const container = document.createElement("div");
+ container.id = "root";
+ document.body.append(container);
+
+ const createRoot = ReactDOM.createRoot;
+ vi.spyOn(ReactDOM, "createRoot").mockImplementation((...args) => (root = createRoot(...args)));
+ // Boot the production provider tree so auth and routed UI must select the same registry.
+ await act(async () => {
+ const { startup } = await import("../main");
+ await startup;
+ });
+ expect(container.textContent).toBe("relay-demo, independent-direct");
+
+ await act(() => fixture.signOut());
+ await act(async () => {
+ await fixture.cleanupFinished;
+ });
+
+ expect(container.textContent).toBe("independent-direct");
+ });
});
diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx
index e2dfab60d81a0..2d2184a0873dc 100644
--- a/apps/web/src/main.tsx
+++ b/apps/web/src/main.tsx
@@ -13,6 +13,7 @@ import {
syncDocumentWindowControlsOverlayClass,
} from "./lib/windowControlsOverlay";
import { AppRoot } from "./AppRoot";
+import { AppAtomRegistryProvider } from "./rpc/atomRegistry";
import { clearChunkReloadGuard, reloadOnceForChunkLoadError } from "./lib/chunkReloadGuard";
prepareProviderAuthDelivery();
@@ -64,11 +65,13 @@ export const startup = Promise.all([
if (!chunkLoadFailed) clearChunkReloadGuard();
ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
- {ManagedAuthShell && clerkPublishableKey ? (
- {app}
- ) : (
- app
- )}
+
+ {ManagedAuthShell && clerkPublishableKey ? (
+ {app}
+ ) : (
+ app
+ )}
+
,
);
})