4de6c86d41
Addresses 8 issues from the Journal architecture audit: 1. DB indexes on routes.ownerId + activities.ownerId. Listing queries on these tables were full table scans; adds composite indexes matching the order-by columns (updatedAt/startedAt/createdAt). 2. Zod validation on /api/auth/register body. Previously the action destructured request.json() with zero schema validation. 3. N+1 GeoJSON batch fetch collapsed to a single ANY($1::text[]) query in both routes.server and activities.server. 4. Webhook envelope validation in /api/sync/webhook/:provider. 5. AbortSignal.timeout(30s) on all external fetches (Komoot, Wahoo) via a new fetchWithTimeout helper in lib/http.server.ts. 6. .limit(100) on listPublicRoutesForOwner / listPublicActivitiesForOwner. 9. Welcome email moved off fire-and-forget onto a pg-boss job with retryLimit: 3 (send-welcome-email). 10. process.env.ORIGIN ?? "http://localhost:3000" centralized into lib/config.server.ts::getOrigin() across 14 call sites. Issues 7 (centralized apiError/auth guards across 60+ route files) and 8 (split .server.ts boundaries across 20+ route files) intentionally deferred — both are pure refactors that would balloon this PR past reviewability and warrant their own focused PRs. Tests added: - lib/config.server.test.ts (2 cases) - lib/http.server.test.ts (3 cases — timeout abort, success passthrough, caller-signal composition) - routes/api.sync.webhook.$provider.test.ts (6 cases) - routes/api.auth.register.test.ts (7 cases — schema rejection paths + the new welcome-email enqueue assertion) Full repo: pnpm typecheck, pnpm lint, pnpm test all green. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
49 lines
1.8 KiB
TypeScript
49 lines
1.8 KiB
TypeScript
import { data } from "react-router";
|
|
import { getOrigin } from "~/lib/config.server";
|
|
import type { Route } from "./+types/api.auth.login";
|
|
import { startAuthentication, finishAuthentication, createMagicToken, verifyLoginCode } from "~/lib/auth.server";
|
|
import { completeAuth } from "~/lib/auth/completion.server";
|
|
import { sendMagicLink } from "~/lib/email.server";
|
|
|
|
export async function action({ request }: Route.ActionArgs) {
|
|
const body = await request.json();
|
|
const { step, response, challenge, email, code, returnTo } = body;
|
|
|
|
try {
|
|
if (step === "start-passkey") {
|
|
const options = await startAuthentication();
|
|
return data({ step: "challenge", options });
|
|
}
|
|
|
|
if (step === "finish-passkey") {
|
|
const userId = await finishAuthentication(response, challenge);
|
|
return completeAuth({ userId, request, returnTo, mode: "json" });
|
|
}
|
|
|
|
if (step === "magic-link") {
|
|
const { token, code: loginCode } = await createMagicToken(email);
|
|
const origin = getOrigin();
|
|
const link = `${origin}/auth/verify?token=${token}`;
|
|
// In dev, return the link and code directly
|
|
if (process.env.NODE_ENV !== "production") {
|
|
console.log(`[Magic Link] ${email}: ${link} (code: ${loginCode})`);
|
|
return data({ step: "magic-link-sent", devLink: link, code: loginCode });
|
|
}
|
|
|
|
await sendMagicLink(email, link, loginCode);
|
|
return data({ step: "magic-link-sent" });
|
|
}
|
|
|
|
if (step === "verify-code") {
|
|
if (!email || !code) {
|
|
return data({ error: "Email and code are required" }, { status: 400 });
|
|
}
|
|
const userId = await verifyLoginCode(email, code);
|
|
return completeAuth({ userId, request, returnTo, mode: "json" });
|
|
}
|
|
|
|
return data({ error: "Invalid step" }, { status: 400 });
|
|
} catch (e) {
|
|
return data({ error: (e as Error).message }, { status: 400 });
|
|
}
|
|
}
|