fix(web): simplify session gate reentry

Author: pallyoung

packages/web/src/features/auth/session-gate.test.tsx

@@ -6,7 +6,6 @@ import { activationStatusAtom } from "../../atoms/activation";
 import { authEnabledAtom } from "../../atoms/connection";
 import { SessionGatePage } from "./session-gate";
 
-const originalFetch = globalThis.fetch;
 const originalLocation = window.location;
 
 describe("SessionGatePage", () => {
@@ -22,14 +21,13 @@ describe("SessionGatePage", () => {
   });
 
   afterEach(() => {
-    globalThis.fetch = originalFetch;
     Object.defineProperty(window, "location", {
       configurable: true,
       value: originalLocation,
     });
   });
 
-  it("shows a password form when auth is enabled", () => {
+  it("shows the session gate action even when auth is enabled", () => {
     const store = createStore();
     store.set(authEnabledAtom, true);
     store.set(activationStatusAtom, "gated");
@@ -42,76 +40,42 @@ describe("SessionGatePage", () => {
       </Provider>
     );
 
-    expect(screen.getByLabelText("密码")).toBeInTheDocument();
+    expect(screen.queryByLabelText("密码")).not.toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "重新进入" })).toBeInTheDocument();
   });
 
-  it("claims re-entry after successful login when auth is enabled", async () => {
-    const requestReentry = vi.fn().mockResolvedValue(true);
-    globalThis.fetch = vi.fn().mockResolvedValueOnce({
-      ok: true,
-      json: async () => ({ ok: true }),
-    }) as unknown as typeof fetch;
-
-    const store = createStore();
-    store.set(authEnabledAtom, true);
-    store.set(activationStatusAtom, "gated");
-
-    render(
-      <Provider store={store}>
-        <MemoryRouter initialEntries={["/session-gate"]}>
-          <SessionGatePage requestReentry={requestReentry} />
-        </MemoryRouter>
-      </Provider>
-    );
-
-    const input = await screen.findByLabelText("密码");
-    fireEvent.change(input, { target: { value: "sekrit" } });
-    fireEvent.click(screen.getByRole("button", { name: "确认" }));
-
-    await waitFor(() => {
-      expect(requestReentry).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  it("shows an explicit re-enter action when auth is disabled", async () => {
-    const requestReentry = vi.fn().mockResolvedValue(true);
+  it("shows an explicit re-enter action when auth is disabled", () => {
     const store = createStore();
     store.set(authEnabledAtom, false);
     store.set(activationStatusAtom, "gated");
 
     render(
       <Provider store={store}>
         <MemoryRouter>
-          <SessionGatePage requestReentry={requestReentry} />
+          <SessionGatePage />
         </MemoryRouter>
       </Provider>
     );
 
-    fireEvent.click(screen.getByRole("button", { name: "重新进入" }));
-
-    await waitFor(() => {
-      expect(requestReentry).toHaveBeenCalledTimes(1);
-    });
+    expect(screen.getByRole("button", { name: "重新进入" })).toBeInTheDocument();
   });
 
-  it("reloads the app after successful re-entry when auth is disabled", async () => {
-    const requestReentry = vi.fn().mockResolvedValue(true);
+  it("returns to the app bootstrap entry when re-enter is clicked", async () => {
     const store = createStore();
     store.set(authEnabledAtom, false);
     store.set(activationStatusAtom, "gated");
 
     render(
       <Provider store={store}>
         <MemoryRouter initialEntries={["/session-gate"]}>
-          <SessionGatePage requestReentry={requestReentry} />
+          <SessionGatePage />
         </MemoryRouter>
       </Provider>
     );
 
     fireEvent.click(screen.getByRole("button", { name: "重新进入" }));
 
     await waitFor(() => {
-      expect(requestReentry).toHaveBeenCalledTimes(1);
       expect(window.location.replace).toHaveBeenCalledWith("/");
     });
   });

packages/web/src/features/auth/session-gate.tsx

@@ -1,11 +1,6 @@
-import { useAtomValue } from "jotai";
-import { useState } from "react";
-import { authEnabledAtom } from "../../atoms/connection";
 import { Button, EmptyState } from "../../components/ui";
-import { useActivation } from "../../hooks/use-activation";
 import { useViewport } from "../../hooks/use-viewport";
 import { useTranslation } from "../../lib/i18n";
-import { LoginPage } from "./index";
 
 const gateEmptyStateStyle = {
   minHeight: "auto",
@@ -15,28 +10,9 @@ const gateEmptyStateStyle = {
   textAlign: "left" as const,
 };
 
-export function SessionGatePage({ requestReentry }: { requestReentry?: () => Promise<boolean> }) {
+export function SessionGatePage() {
   const t = useTranslation();
-  const authEnabled = useAtomValue(authEnabledAtom);
-  const { claim } = useActivation();
   const isMobile = useViewport() === "mobile";
-  const [submitting, setSubmitting] = useState(false);
-
-  const handleReentry = async () => {
-    setSubmitting(true);
-    try {
-      const ok = requestReentry ? await requestReentry() : await claim();
-      if (ok) {
-        window.location.replace("/");
-      }
-    } finally {
-      setSubmitting(false);
-    }
-  };
-
-  if (authEnabled === true) {
-    return <LoginPage onAuthenticated={handleReentry} />;
-  }
 
   return (
     <div
@@ -78,10 +54,9 @@ export function SessionGatePage({ requestReentry }: { requestReentry?: () => Pro
           variant="primary"
           size="lg"
           type="button"
-          disabled={submitting}
-          onClick={() => void handleReentry()}
+          onClick={() => window.location.replace("/")}
         >
-          {submitting ? t("auth.session_gate_reentering") : t("auth.session_gate_reenter")}
+          {t("auth.session_gate_reenter")}
         </Button>
       </div>
     </div>