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>
57 lines
2.1 KiB
TypeScript
57 lines
2.1 KiB
TypeScript
import { redirect, data } from "react-router";
|
|
import { getOrigin } from "~/lib/config.server";
|
|
import type { Route } from "./+types/api.sync.push.$provider.$routeId";
|
|
import { getSessionUser } from "~/lib/auth/session.server";
|
|
import { getManifest } from "~/lib/connected-services";
|
|
import { pushRouteToProvider } from "~/lib/connected-services/push-action.server";
|
|
import { encodeOAuthState } from "~/lib/connected-services/oauth-state.server";
|
|
|
|
export async function action({ params, request }: Route.ActionArgs) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) return redirect("/auth/login");
|
|
|
|
const manifest = getManifest(params.provider);
|
|
if (!manifest) return data({ error: "Unknown provider" }, { status: 404 });
|
|
|
|
const returnTo = `/routes/${params.routeId}`;
|
|
const outcome = await pushRouteToProvider({
|
|
userId: user.id,
|
|
providerId: manifest.id,
|
|
routeId: params.routeId,
|
|
});
|
|
|
|
switch (outcome.status) {
|
|
case "success":
|
|
return redirect(`${returnTo}?push=success`);
|
|
case "scope_missing": {
|
|
if (!manifest.buildAuthUrl) {
|
|
return redirect(`${returnTo}?push=needs_permission`);
|
|
}
|
|
const origin = getOrigin();
|
|
const redirectUri = `${origin}/api/sync/callback/${manifest.id}`;
|
|
const state = encodeOAuthState({
|
|
pushAfter: { routeId: params.routeId },
|
|
returnTo,
|
|
});
|
|
return redirect(manifest.buildAuthUrl(redirectUri, state));
|
|
}
|
|
case "needs_relink":
|
|
return redirect(`${returnTo}?push=needs_permission`);
|
|
case "no_connection":
|
|
return redirect(`${returnTo}?push=no_connection`);
|
|
case "no_geometry":
|
|
return redirect(`${returnTo}?push=no_geometry`);
|
|
case "not_owner":
|
|
return data({ error: "Forbidden" }, { status: 403 });
|
|
case "not_found":
|
|
return data({ error: "Not found" }, { status: 404 });
|
|
case "unsupported_provider":
|
|
return data({ error: "Provider does not support push" }, { status: 400 });
|
|
case "error":
|
|
return redirect(`${returnTo}?push=error&code=${outcome.code}`);
|
|
}
|
|
}
|
|
|
|
export function loader() {
|
|
return data({ error: "Method not allowed" }, { status: 405 });
|
|
}
|