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>
70 lines
2.8 KiB
TypeScript
70 lines
2.8 KiB
TypeScript
import { redirect, data } from "react-router";
|
|
import { getOrigin } from "~/lib/config.server";
|
|
import type { Route } from "./+types/api.sync.callback.$provider";
|
|
import { getSessionUser } 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 getSessionUser(request);
|
|
if (!user) return redirect("/auth/login");
|
|
|
|
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");
|
|
}
|