Redirect an anonymous hit on /settings to sign-in with the page as return_to

README.md

@@ -1506,7 +1506,7 @@ no Node/browsers on the host. Five suites, each on its own stack:
 | `visual.spec.ts` + `language.spec.ts` | `e2e-tests/compose.visual.yml` | Ory-free: the rendered design system (app shell, theme switch, mobile off-canvas, icon sprite, CSRF-guarded sign-out, landing, 404), plugin permission-gating, and [language switching](#languages-i18n) |
 | `auth-refresh.spec.ts` | `e2e-tests/compose.auth.yml` | The real Ory stack with the session→JWT TTL cut to 8s: a lapsed JWT is silently re-minted from the live Kratos session, and once revoked the stale cookie is cleared |
 | `oauth-login.spec.ts` | `e2e-tests/compose.oauth.yml` | Another app logging in through us — register a client, start an authorization flow, `/oauth2/login` accept, `/oauth2/consent` Allow → authorization code |
-| `full-flow.spec.ts` | `e2e-tests/compose.full.yml` | The browser UI: password + mocked-SSO login, menu filtering by permission, admin users/groups/permissions CRUD, OAuth2-clients register → one-time secret → delete, a gated plugin page, logout |
+| `full-flow.spec.ts` | `e2e-tests/compose.full.yml` | The browser UI: password + mocked-SSO login, menu filtering by permission, admin users/groups/permissions CRUD, OAuth2-clients register → one-time secret → delete, a gated plugin page, an anonymous `/settings` visit signing in first, logout |
 | `devstack-login.spec.ts` | `compose.override.yml` + `e2e-tests/compose.devstack.yml` | The plain `docker compose up` topology on the **host network**: sign-in works both from the banner's `localhost:3000` and from `127.0.0.1:3000` via the [canonical-host redirect](#canonical-host-one-public-url) |
 
 ```bash

docs/reading-cost.md

@@ -105,3 +105,20 @@ Read most (opens and searches):
 - `src/ui/chrome.ts` 1
 - `views/index.ejs` 1
 - `views/partials/shell.ejs` 1
+
+## Reading cost, chunk e4d3bb0ac092, finished 2026-10-31T08:02:27Z
+
+154733 new input tokens before the first commit.
+
+Read most (opens and searches):
+
+- `todo.md` 10
+- `README.md` 6
+- `package.json` 3
+- `.gitignore` 1
+- `.npmrc` 1
+- `AGENTS.md` 1
+- `ci.sh` 1
+- `public/css/styles.css` 1
+- `renovate.json` 1
+- `src/e2e-console-guard.test.ts` 1

e2e-tests/full-flow.spec.ts

@@ -240,6 +240,19 @@ test("return_to: a deep link while logged out returns to that page after login",
   await expect(page.locator("h1")).toHaveText("Users");
 });
 
+test("settings: an anonymous visit signs in first, then lands on the settings page", async ({ page }) => {
+  test.setTimeout(90_000);
+  // /settings is public (recovery lands there with a Kratos session but no app JWT), so Kratos' 401
+  // for an anonymous settings flow must send the visitor to sign in, not to the 500 page.
+  await page.goto("/settings");
+  await expect(page).toHaveURL(/\/login(\?|$)/);
+  await page.fill('input[name="identifier"]', ADMIN_EMAIL);
+  await page.fill('input[name="password"]', ADMIN_PASSWORD);
+  await page.locator('.auth-form button[type="submit"]').click();
+  await expect(page).toHaveURL(/\/settings(\?|$)/);
+  await expect(page.locator("h1")).toHaveText("Account settings");
+});
+
 test("mocked SSO login: the provider button signs a user in via OIDC", async ({ page }) => {
   test.setTimeout(90_000);
   await page.goto("/login");

src/auth/routes.ts

@@ -38,52 +38,37 @@ const FORBIDDEN: RouteResult = { status: 403, view: "403" };
 const selfOrigin = (ctx: RequestContext, secure: boolean): string =>
   `${secure ? "https" : "http"}://${ctx.req.headers.host ?? "127.0.0.1:3000"}`;
 
-// Themed Kratos self-service page (one route per AUTH_FLOWS entry: login/registration/recovery/
-// verification/settings).
-function flowPage(kratos: KratosPublic, flowType: FlowType, secureCookies: boolean): BuiltinRoute["handler"] {
-  return async (ctx: RequestContext, csrf: RequestCsrf): Promise<RouteResult> => {
-    const pathname = ctx.url.pathname;
-    // Already signed in? Re-authenticating / re-registering is pointless — send them to the app
-    // dashboard. (/settings, /recovery, /verification stay reachable — a signed-in user can use those.)
-    if (ctx.user && (flowType === "login" || flowType === "registration")) return { redirect: "/dashboard" };
-    const cookie = ctx.req.headers.cookie;
-    const flowId = ctx.url.searchParams.get("flow");
-    // Only the Kratos calls are in the try, so a render/buildFlowView bug below falls through to
-    // the catch-all 500 (with a stack), not the "Ory unreachable" 503.
-    let flow: Flow;
-    try {
-      if (!flowId) {
-        // No flow yet: init one server-side, relay Kratos' CSRF cookie, bounce to ?flow=<id>.
-        // A `return_to` is baked into the flow so Kratos lands there after login instead of the
-        // default completion route. A first-party deep link (host-relative, from the gate's
-        // return_to) is wrapped through /auth/complete so the session JWT is minted before the
-        // user reaches the page; an absolute target (the OAuth2 login challenge) is passed
-        // as-is — Kratos allow-lists it. localPath rejects an off-origin "//evil.com".
+// Where Kratos lands the browser after a freshly initialised flow, or undefined for its default
+// completion route. A first-party deep link (host-relative, from the gate's return_to) is wrapped
+// through /auth/complete so the session JWT is minted before the user reaches the page; an absolute
+// target (the OAuth2 login challenge) is passed as-is — Kratos allow-lists it. localPath rejects an
+// off-origin "//evil.com". The target is the host's, not Kratos', so the language the visitor picked
+// on the sign-in page survives the round-trip and lands on the page after it; without this the
+// most-travelled path in the product (pick Swedish → sign in) drops back to Accept-Language.
+function flowReturnTo(ctx: RequestContext, secureCookies: boolean): string | undefined {
   const raw = ctx.url.searchParams.get("return_to");
   const local = localPath(raw);
   const chosen = chosenLocale(ctx);
-        let returnTo: string | undefined;
-        if (local || chosen) {
-          // The flow's return target is the host's, not Kratos' — so the language the visitor picked
-          // on the sign-in page survives the round-trip through Kratos and lands on the page after
-          // it. Without this the most-travelled path in the product (pick Swedish → sign in) drops
-          // straight back to Accept-Language.
+  if (!local && !chosen) return raw ?? undefined;
   const complete = new URL(`${selfOrigin(ctx, secureCookies)}/auth/complete`);
   if (local) complete.searchParams.set("return_to", ctx.localeHref(local));
   if (chosen) complete.searchParams.set("locale", chosen);
-          returnTo = complete.toString();
-        } else if (raw) returnTo = raw;
-        const { flow: initiated, setCookie } = await kratos.initBrowserFlow(flowType, { ...(cookie ? { cookie } : {}), ...(returnTo ? { returnTo } : {}) });
-        if (setCookie.length) ctx.res.appendHeader("set-cookie", setCookie);
-        return { redirect: `${pathname}?flow=${initiated.id}` };
+  return complete.toString();
 }
-      flow = await kratos.getFlow(flowType, flowId, cookie ? { cookie } : {});
-    } catch (err) {
+
+// What a failed Kratos call renders instead of the flow; rethrows what is genuinely unexpected.
+function flowFailure(err: unknown, ctx: RequestContext, flowType: FlowType): RouteResult {
+  const pathname = ctx.url.pathname;
   // Expired/unknown flow → restart by re-initialising (drop the stale ?flow=).
   if (err instanceof KratosError && [403, 404, 410].includes(err.status)) return { redirect: pathname };
+  // No Kratos session on a page that needs one (/settings is public, so the gate never sent them
+  // to sign in): sign in, then come back. Not for /login itself, which would redirect to itself.
+  if (err instanceof KratosError && err.status === 401 && flowType !== "login") {
+    return { redirect: `/login?return_to=${encodeURIComponent(pathname)}` };
+  }
   // Already authenticated at Kratos but no app JWT yet (e.g. straight after registration, whose
   // `session` hook signs the user in but routes to verification, not /auth/complete — so ctx.user
-      // is null and the "already signed in" short-circuit above can't fire). Initialising a login/
+  // is null and the "already signed in" short-circuit can't fire). Initialising a login/
   // registration flow then returns Kratos 400 `session_already_available`. Recover by completing
   // login (mint the JWT from the live session), honouring return_to — never a 500.
   if (err instanceof KratosError && err.status === 400 && err.body.includes("session_already_available")) {
@@ -98,6 +83,31 @@ function flowPage(kratos: KratosPublic, flowType: FlowType, secureCookies: boole
   }
   throw err; // any other Kratos 4xx → the catch-all (genuinely unexpected)
 }
+
+// Themed Kratos self-service page (one route per AUTH_FLOWS entry: login/registration/recovery/
+// verification/settings).
+function flowPage(kratos: KratosPublic, flowType: FlowType, secureCookies: boolean): BuiltinRoute["handler"] {
+  return async (ctx: RequestContext, csrf: RequestCsrf): Promise<RouteResult> => {
+    // Already signed in? Re-authenticating / re-registering is pointless — send them to the app
+    // dashboard. (/settings, /recovery, /verification stay reachable — a signed-in user can use those.)
+    if (ctx.user && (flowType === "login" || flowType === "registration")) return { redirect: "/dashboard" };
+    const cookie = ctx.req.headers.cookie;
+    const flowId = ctx.url.searchParams.get("flow");
+    // Only the Kratos calls are in the try, so a render/buildFlowView bug below falls through to
+    // the catch-all 500 (with a stack), not the "Ory unreachable" 503.
+    let flow: Flow;
+    try {
+      if (!flowId) {
+        // No flow yet: init one server-side, relay Kratos' CSRF cookie, bounce to ?flow=<id>.
+        const returnTo = flowReturnTo(ctx, secureCookies);
+        const { flow: initiated, setCookie } = await kratos.initBrowserFlow(flowType, { ...(cookie ? { cookie } : {}), ...(returnTo ? { returnTo } : {}) });
+        if (setCookie.length) ctx.res.appendHeader("set-cookie", setCookie);
+        return { redirect: `${ctx.url.pathname}?flow=${initiated.id}` };
+      }
+      flow = await kratos.getFlow(flowType, flowId, cookie ? { cookie } : {});
+    } catch (err) {
+      return flowFailure(err, ctx, flowType);
+    }
     // Rendered inside the unified app shell, so set a fresh CSRF cookie when minted — the
     // shell's Sign-out form (shown on /settings, where the user is signed in) needs the token.
     csrf.setCookie();

src/function-limits.test.ts

@@ -15,8 +15,6 @@ const LIMITS = { lines: 50, complexity: 20 };
 const grandfathered: Record<string, { lines?: number; complexity?: number }> = {
   "src/http/app.ts createApp": { lines: 318, complexity: 28 },
   "src/http/app.ts createApp > handleRequest": { lines: 168, complexity: 43 },
-  "src/auth/routes.ts flowPage": { lines: 64 },
-  "src/auth/routes.ts flowPage > anonymous": { lines: 62, complexity: 23 },
   "src/auth/flow-view.ts buildFlowView": { complexity: 24 },
   "src/auth/hydra-admin.ts createHydraAdmin": { lines: 87 },
   "src/auth/kratos-admin.ts createKratosAdmin": { lines: 68 },

src/http/app.test.ts

@@ -792,6 +792,24 @@ test("themed auth GET: an existing Kratos session (no app JWT yet) recovers via
   assert.equal((await fetch(url2 + "/login", { redirect: "manual" })).status, 500);
 });
 
+test("themed auth GET: an anonymous hit on /settings (Kratos 401) bounces to sign-in with the page as return_to, never 500", async (t) => {
+  // /settings stays public (recovery lands there with a Kratos session but no app JWT), so Kratos' 401
+  // for a settings flow with no session is the signal to sign in. /login itself must not redirect to
+  // itself, so a 401 there stays the catch-all 500.
+  const unauthorized = new KratosError("Kratos init settings flow failed (401)", 401, "");
+  const app = createApp({ jwks: staticJwks([ecJwk]), kratos: { ...mockKratos(async () => { throw unauthorized; }), initBrowserFlow: async () => { throw unauthorized; } } });
+  await new Promise<void>((r) => app.listen(0, r));
+  t.after(() => app.close());
+  const url = `http://localhost:${(app.address() as AddressInfo).port}`;
+
+  const init = await fetch(url + "/settings", { redirect: "manual" });
+  assert.equal(init.status, 303);
+  assert.equal(init.headers.get("location"), "/login?return_to=%2Fsettings");
+  const existing = await fetch(url + "/settings?flow=f1", { redirect: "manual" });
+  assert.equal(existing.headers.get("location"), "/login?return_to=%2Fsettings");
+  assert.equal((await fetch(url + "/login", { redirect: "manual" })).status, 500);
+});
+
 // return_to: a deep-link login lands back on the requested page. The gate redirects to
 // /login?return_to=<host-relative path>; /login bakes that into the Kratos flow so completion
 // returns there — but a first-party path must route via /auth/complete first (to mint the JWT).