Implements all of unify-auth-completion (12/14 tasks done; manual
smoke + archive-time spec sync remain).
Design refinement during implementation: completeAuth supports two
response shapes via a `mode` parameter:
- mode: 'redirect' (loaders / direct browser navigation; auth.verify.tsx)
- mode: 'json' (action handlers called by imperative fetch from
client forms; api.auth.login, api.auth.register)
Both modes share createSession + safeReturnTo + Set-Cookie. JSON mode
carries `{ ok: true, step: "done", redirectTo }` (the `step` field
preserves the existing client-form check).
Why two modes: passkey ceremonies are inherently imperative
(start → browser WebAuthn API → finish), so action handlers can't
move to <Form>/useFetcher. Picking option (B) from the design grill —
the chokepoint owns destination selection while clients navigate —
required this dual shape. The 3 hardcoded client-side targets
(returnTo ?? "/", "/", "/?add-passkey=1") collapse into 1 server-side
sanitization pass (safeReturnTo) inside completeAuth.
New module:
- apps/journal/app/lib/auth/session.ts: cookie session storage
(sessionStorage, createSession, getSessionUser, destroySession)
moved from auth.server.ts. Legacy import path kept via re-exports
with @deprecated JSDoc.
- apps/journal/app/lib/auth/completion.ts: completeAuth + safeReturnTo.
- apps/journal/app/lib/auth/completion.test.ts: 10 contract tests
covering both modes, returnTo sanitization (path-relative, protocol-
relative, absolute-URL, malformed), Set-Cookie attachment, redirect
status, JSON shape.
Caller migration:
- api.auth.register.ts passkey-finish → completeAuth(json)
- api.auth.login.ts finish-passkey → completeAuth(json)
- api.auth.login.ts verify-code → completeAuth(json)
- auth.verify.tsx magic-link consumer → completeAuth(redirect)
Client form updates:
- auth.login.tsx: pass returnTo in fetch body, read result.redirectTo
on done.
- auth.register.tsx: pass returnTo: "/?add-passkey=1" for the magic-
link verify-code path (preserves the post-register passkey prompt
via the chokepoint's safeReturnTo, instead of hardcoding it
client-side).
Verified:
- pnpm typecheck && pnpm lint: green across all 15 workspaces.
- pnpm --filter @trails-cool/journal test: 126 passed.
- pnpm test:e2e auth: 4/4 passed without modification — confirms the
refactor is behaviour-preserving for the user-facing flows that
matter most (passkey register + login).
Spec delta in openspec/changes/unify-auth-completion/specs/ applies at
/opsx:archive time.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
46 lines
1.6 KiB
TypeScript
46 lines
1.6 KiB
TypeScript
// Cookie session storage. Lives here (separate from auth.server.ts) so
|
|
// the post-verify chokepoint (./completion.ts) can compose it without
|
|
// dragging the entire auth surface in.
|
|
//
|
|
// The legacy import path `~/lib/auth.server` continues to re-export
|
|
// these symbols for backwards compat — see auth.server.ts.
|
|
|
|
import { createCookieSessionStorage } from "react-router";
|
|
import { eq } from "drizzle-orm";
|
|
import { users } from "@trails-cool/db/schema/journal";
|
|
import { getDb } from "../db.ts";
|
|
|
|
const sessionSecret = process.env.SESSION_SECRET ?? "dev-secret-change-in-production";
|
|
|
|
export const sessionStorage = createCookieSessionStorage({
|
|
cookie: {
|
|
name: "__session",
|
|
httpOnly: true,
|
|
secure: process.env.NODE_ENV === "production",
|
|
sameSite: "lax",
|
|
path: "/",
|
|
maxAge: 60 * 60 * 24 * 30, // 30 days
|
|
secrets: [sessionSecret],
|
|
},
|
|
});
|
|
|
|
export async function createSession(userId: string, request: Request) {
|
|
const session = await sessionStorage.getSession(request.headers.get("Cookie"));
|
|
session.set("userId", userId);
|
|
return sessionStorage.commitSession(session);
|
|
}
|
|
|
|
export async function getSessionUser(request: Request) {
|
|
const db = getDb();
|
|
const session = await sessionStorage.getSession(request.headers.get("Cookie"));
|
|
const userId = session.get("userId");
|
|
if (!userId) return null;
|
|
|
|
const [user] = await db.select().from(users).where(eq(users.id, userId));
|
|
return user ?? null;
|
|
}
|
|
|
|
export async function destroySession(request: Request) {
|
|
const session = await sessionStorage.getSession(request.headers.get("Cookie"));
|
|
return sessionStorage.destroySession(session);
|
|
}
|