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>
74 lines
2.4 KiB
TypeScript
74 lines
2.4 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, redirect } 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;
|
|
}
|
|
|
|
/**
|
|
* Loader/action helper: return the session user or throw a redirect to
|
|
* /auth/login. Centralizes the repeated
|
|
* const user = await getSessionUser(request);
|
|
* if (!user) return redirect("/auth/login");
|
|
* pattern across page loaders and form actions.
|
|
*/
|
|
export async function requireSessionUser(request: Request) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) {
|
|
throw redirect("/auth/login");
|
|
}
|
|
return user;
|
|
}
|
|
|
|
/**
|
|
* Same as requireSessionUser but throws a 401 JSON response instead of a
|
|
* redirect. For fetcher/JSON endpoints (`/api/*` non-v1) where redirecting
|
|
* would confuse the client-side caller.
|
|
*/
|
|
export async function requireSessionUserJson(request: Request) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) {
|
|
throw Response.json({ error: "Unauthorized" }, { status: 401 });
|
|
}
|
|
return user;
|
|
}
|
|
|
|
export async function destroySession(request: Request) {
|
|
const session = await sessionStorage.getSession(request.headers.get("Cookie"));
|
|
return sessionStorage.destroySession(session);
|
|
}
|