d64c47614d
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>
67 lines
2.9 KiB
TypeScript
67 lines
2.9 KiB
TypeScript
import { data } from "react-router";
|
|
import type { Route } from "./+types/api.auth.register";
|
|
import { startRegistration, finishRegistration, addPasskeyStart, addPasskeyFinish, registerWithMagicLink } from "~/lib/auth.server";
|
|
import { completeAuth } from "~/lib/auth/completion";
|
|
import { sendWelcome, sendMagicLink } from "~/lib/email.server";
|
|
import { logger } from "~/lib/logger.server";
|
|
|
|
export async function action({ request }: Route.ActionArgs) {
|
|
const body = await request.json();
|
|
const { step, email, username, response, challenge, userId, termsAccepted, termsVersion, returnTo } = body;
|
|
const origin = process.env.ORIGIN ?? `http://localhost:3000`;
|
|
|
|
// Registration steps require terms acceptance + the version the client
|
|
// agreed to (stored for audit so we can tell which text the user saw).
|
|
const requiresTerms = step === "start" || step === "finish" || step === "register-magic-link";
|
|
if (requiresTerms && !termsAccepted) {
|
|
return data({ error: "Terms of Service must be accepted" }, { status: 400 });
|
|
}
|
|
if (requiresTerms && (typeof termsVersion !== "string" || termsVersion.length === 0)) {
|
|
return data({ error: "Terms of Service version missing" }, { status: 400 });
|
|
}
|
|
|
|
try {
|
|
if (step === "start") {
|
|
const result = await startRegistration(email, username);
|
|
return data({ step: "challenge", options: result.options, userId: result.userId });
|
|
}
|
|
|
|
if (step === "finish") {
|
|
const newUserId = await finishRegistration(userId, email, username, response, challenge, termsVersion);
|
|
sendWelcome(email, username).catch((err) =>
|
|
logger.error({ err }, "Failed to send welcome email"),
|
|
);
|
|
return completeAuth({ userId: newUserId, request, returnTo, mode: "json" });
|
|
}
|
|
|
|
if (step === "register-magic-link") {
|
|
const { token, code } = await registerWithMagicLink(email, username, termsVersion);
|
|
const link = `${origin}/auth/verify?token=${token}`;
|
|
if (process.env.NODE_ENV !== "production") {
|
|
// Mirror the login endpoint so devs can grab either the link or
|
|
// the 6-digit code straight from the terminal.
|
|
console.log(`[Register Magic Link] ${email}: ${link} (code: ${code})`);
|
|
return data({ step: "magic-link-sent", devLink: link, code });
|
|
}
|
|
await sendMagicLink(email, link, code);
|
|
sendWelcome(email, username).catch((err) =>
|
|
logger.error({ err }, "Failed to send welcome email"),
|
|
);
|
|
return data({ step: "magic-link-sent" });
|
|
}
|
|
|
|
if (step === "add-passkey") {
|
|
const options = await addPasskeyStart(userId);
|
|
return data({ step: "challenge", options });
|
|
}
|
|
|
|
if (step === "finish-add-passkey") {
|
|
await addPasskeyFinish(userId, response, challenge);
|
|
return data({ step: "done" });
|
|
}
|
|
|
|
return data({ error: "Invalid step" }, { status: 400 });
|
|
} catch (e) {
|
|
return data({ error: (e as Error).message }, { status: 400 });
|
|
}
|
|
}
|