8eba5b2d9e
Follow-up to PR #406 — addresses the two items deferred from the audit: #7 — Centralize auth helpers - New `requireSessionUser(request)` in lib/auth/session.server.ts that returns the user or throws a redirect to /auth/login. - New `requireSessionUserJson(request)` companion that throws a 401 JSON response (for fetcher/JSON endpoints). - Replace the repeated const user = await getSessionUser(request); if (!user) return redirect("/auth/login"); pattern across 18 route loaders/actions. Removes the duplicated guard preamble and gives a single chokepoint to evolve later (e.g., for terms-version gating). #8 — Extract heavy loaders into .server.ts siblings - routes/home.tsx → home.server.ts (DB count query + listActivities + listRecentPublicActivities) - routes/users.$username.tsx → users.$username.server.ts (user lookup + follow state + counts + listPublicRoutes/Activities + persona check) - routes/settings.connections.tsx → settings.connections.server.ts (connected_services join + manifest merge) Each route file shrinks to a thin delegator: `loader` calls `loadXxx(request)`. The component module no longer transitively pulls `getDb` and Drizzle schema into its import graph — Vite's tree-shake already strips server-only code from the client bundle, but the explicit `.server.ts` suffix makes that contract local and auditable. Other 17 routes that mix loader/action with components are left as-is for now: they're each small enough that the split adds churn without buying much clarity. The pattern is documented by the three examples; the rest can convert opportunistically when they grow. Tests: - lib/auth/session.server.test.ts (4 cases — redirect for missing cookie, redirect for ghost userId, success path, JSON 401 variant) Full repo: pnpm typecheck, pnpm lint, pnpm test all green (181 passed | 31 integration-gated skipped). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
45 lines
1.7 KiB
TypeScript
45 lines
1.7 KiB
TypeScript
import { redirect, data } from "react-router";
|
|
import type { Route } from "./+types/auth.verify";
|
|
import { verifyMagicToken, verifyEmailChange } from "~/lib/auth.server";
|
|
import { requireSessionUser } from "~/lib/auth/session.server";
|
|
import { completeAuth } from "~/lib/auth/completion.server";
|
|
|
|
export async function loader({ request }: Route.LoaderArgs) {
|
|
const url = new URL(request.url);
|
|
const token = url.searchParams.get("token");
|
|
const isEmailChange = url.searchParams.get("email-change") === "1";
|
|
|
|
if (!token) {
|
|
return data({ error: "Missing token" }, { status: 400 });
|
|
}
|
|
|
|
try {
|
|
if (isEmailChange) {
|
|
const user = await requireSessionUser(request);
|
|
await verifyEmailChange(token, user.id);
|
|
return redirect("/settings/account");
|
|
}
|
|
|
|
const userId = await verifyMagicToken(token);
|
|
// Default destination after magic-link sign-in is "/?add-passkey=1"
|
|
// (prompt to set up a passkey now that they're in). If the link
|
|
// carried a returnTo, completeAuth's safeReturnTo will honor any
|
|
// same-origin path and otherwise fall back to "/" — handle the
|
|
// add-passkey default before delegating.
|
|
const returnTo = url.searchParams.get("returnTo") ?? "/?add-passkey=1";
|
|
return completeAuth({ userId, request, returnTo, mode: "redirect" });
|
|
} catch (e) {
|
|
return data({ error: (e as Error).message }, { status: 400 });
|
|
}
|
|
}
|
|
|
|
export default function VerifyPage() {
|
|
return (
|
|
<div className="mx-auto max-w-md px-4 py-16 text-center">
|
|
<p className="text-red-600">Invalid or expired magic link.</p>
|
|
<a href="/auth/login" className="mt-4 inline-block text-blue-600 hover:underline">
|
|
Request a new one
|
|
</a>
|
|
</div>
|
|
);
|
|
}
|