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>
69 lines
2.7 KiB
TypeScript
69 lines
2.7 KiB
TypeScript
import { redirect, data } from "react-router";
|
|
import { getOrigin } from "~/lib/config.server";
|
|
import type { Route } from "./+types/api.sync.callback.$provider";
|
|
import { requireSessionUser } from "~/lib/auth/session.server";
|
|
import { getManifest, link } from "~/lib/connected-services";
|
|
import {
|
|
decodeOAuthState,
|
|
} from "~/lib/connected-services/oauth-state.server";
|
|
import { pushRouteToProvider } from "~/lib/connected-services/push-action.server";
|
|
|
|
export async function loader({ params, request }: Route.LoaderArgs) {
|
|
const user = await requireSessionUser(request);
|
|
|
|
const manifest = getManifest(params.provider);
|
|
if (!manifest || !manifest.exchangeCode) {
|
|
return data({ error: "Unknown provider" }, { status: 404 });
|
|
}
|
|
|
|
const url = new URL(request.url);
|
|
const state = decodeOAuthState(url.searchParams.get("state"));
|
|
const fallbackReturn = state.returnTo ?? "/settings";
|
|
|
|
// User denied the new scope at Wahoo. Send them back to the originating
|
|
// page with a notice instead of looping them through OAuth again.
|
|
if (url.searchParams.get("error") === "access_denied") {
|
|
return redirect(`${fallbackReturn}?push=needs_permission`);
|
|
}
|
|
|
|
const code = url.searchParams.get("code");
|
|
if (!code) return data({ error: "Missing authorization code" }, { status: 400 });
|
|
|
|
const origin = getOrigin();
|
|
const redirectUri = `${origin}/api/sync/callback/${params.provider}`;
|
|
|
|
try {
|
|
const exchange = await manifest.exchangeCode(code, redirectUri);
|
|
await link({
|
|
userId: user.id,
|
|
provider: manifest.id,
|
|
credentialKind: manifest.credentialKind,
|
|
credentials: exchange.credentials as Record<string, unknown>,
|
|
providerUserId: exchange.providerUserId,
|
|
grantedScopes: exchange.grantedScopes,
|
|
});
|
|
} catch (e) {
|
|
console.error(`OAuth callback failed for ${params.provider}:`, e);
|
|
const errCode =
|
|
typeof (e as { code?: string }).code === "string"
|
|
? (e as { code: string }).code
|
|
: "sync_failed";
|
|
return redirect(`${fallbackReturn}?error=${errCode}`);
|
|
}
|
|
|
|
if (state.pushAfter?.routeId) {
|
|
const outcome = await pushRouteToProvider({
|
|
userId: user.id,
|
|
providerId: manifest.id,
|
|
routeId: state.pushAfter.routeId,
|
|
});
|
|
const target = state.returnTo ?? `/routes/${state.pushAfter.routeId}`;
|
|
if (outcome.status === "success") return redirect(`${target}?push=success`);
|
|
if (outcome.status === "scope_missing") return redirect(`${target}?push=needs_permission`);
|
|
if (outcome.status === "needs_relink") return redirect(`${target}?push=needs_permission`);
|
|
if (outcome.status === "error") return redirect(`${target}?push=error&code=${outcome.code}`);
|
|
return redirect(`${target}?push=${outcome.status}`);
|
|
}
|
|
|
|
return redirect(state.returnTo ?? "/settings");
|
|
}
|