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>
47 lines
1.3 KiB
TypeScript
47 lines
1.3 KiB
TypeScript
// POST /api/sync/komoot/connect
|
|
// Validates Komoot email/password credentials and stores them encrypted.
|
|
|
|
import { data } from "react-router";
|
|
import type { Route } from "./+types/api.sync.komoot.connect";
|
|
import { requireSessionUser } from "~/lib/auth/session.server";
|
|
import { loginKomoot } from "~/lib/komoot.server";
|
|
import { encrypt } from "~/lib/crypto.server";
|
|
import { link } from "~/lib/connected-services/manager";
|
|
|
|
export async function action({ request }: Route.ActionArgs) {
|
|
const user = await requireSessionUser(request);
|
|
|
|
const body = (await request.json()) as { email?: string; password?: string };
|
|
const email = body.email?.trim() ?? "";
|
|
const password = body.password ?? "";
|
|
|
|
if (!email || !password) {
|
|
return data({ error: "missing_fields" }, { status: 400 });
|
|
}
|
|
|
|
let username: string;
|
|
try {
|
|
const result = await loginKomoot(email, password);
|
|
username = result.username;
|
|
} catch {
|
|
return data({ error: "invalid_credentials" }, { status: 401 });
|
|
}
|
|
|
|
const encryptedPassword = encrypt(password);
|
|
|
|
await link({
|
|
userId: user.id,
|
|
provider: "komoot",
|
|
credentialKind: "web-login",
|
|
credentials: {
|
|
mode: "authenticated",
|
|
email,
|
|
encryptedPassword,
|
|
komootUserId: username,
|
|
},
|
|
providerUserId: username,
|
|
grantedScopes: [],
|
|
});
|
|
|
|
return data({ success: true });
|
|
}
|