b9aac2859a
Two cleanups in one pass: 1. Update import paths app-wide from `~/lib/auth.server` to `~/lib/auth/session.server` for the four session helpers (sessionStorage, createSession, getSessionUser, destroySession). ~40 files: 33 simple path swaps where the file imported only session symbols, 5 splits where it also imported per-method auth functions (auth.verify.tsx, api.settings.email.ts, activities.\$id.tsx, routes.\$id.tsx, auth.accept-terms.tsx) — those keep one import from auth.server (for verifyMagicToken, canView, recordTermsAcceptance, etc.) and gain a second import from auth/session.server. Two more files used relative paths and were missed by the first grep pass (lib/oauth.server.ts and routes/oauth.authorize.tsx) — migrated too. The @deprecated re-exports block in auth.server.ts is gone. 2. Rename the new auth files to follow the project's `.server.ts` convention so Vite/React Router treat them as server-only (they read process.env.SESSION_SECRET, hit the DB, etc. — must NOT enter the client bundle): - auth/session.ts → auth/session.server.ts - auth/completion.ts → auth/completion.server.ts - auth/completion.test.ts → auth/completion.server.test.ts Done with `git mv` so blame is preserved. Verified: typecheck + lint green; 126 unit tests pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
58 lines
2.1 KiB
TypeScript
58 lines
2.1 KiB
TypeScript
import { data } from "react-router";
|
|
import type { Route } from "./+types/api.routes.$id.edit-in-planner";
|
|
import { getSessionUser } from "~/lib/auth/session.server";
|
|
import { getRouteWithVersions } from "~/lib/routes.server";
|
|
import { createRouteToken } from "~/lib/jwt.server";
|
|
|
|
export async function action({ params, request }: Route.ActionArgs) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) return data({ error: "Not authenticated" }, { status: 401 });
|
|
|
|
const route = await getRouteWithVersions(params.id);
|
|
if (!route) return data({ error: "Route not found" }, { status: 404 });
|
|
if (route.ownerId !== user.id) return data({ error: "Not authorized" }, { status: 403 });
|
|
|
|
const token = await createRouteToken(params.id);
|
|
const origin = process.env.ORIGIN ?? "http://localhost:3000";
|
|
const callbackUrl = `${origin}/api/routes/${params.id}/callback`;
|
|
const plannerUrl = process.env.PLANNER_URL ?? "http://localhost:3001";
|
|
const returnUrl = `${origin}/routes/${params.id}`;
|
|
|
|
// Create Planner session via API (POST body, not URL params)
|
|
const sessionResp = await fetch(`${plannerUrl}/api/sessions`, {
|
|
method: "POST",
|
|
headers: { "Content-Type": "application/json" },
|
|
body: JSON.stringify({
|
|
callbackUrl,
|
|
callbackToken: token,
|
|
gpx: route.gpx ?? undefined,
|
|
}),
|
|
});
|
|
|
|
if (!sessionResp.ok) {
|
|
return data({ error: "Failed to create Planner session" }, { status: 502 });
|
|
}
|
|
|
|
const session = (await sessionResp.json()) as {
|
|
url: string;
|
|
initialWaypoints?: Array<{ lat: number; lon: number; name?: string }>;
|
|
initialNoGoAreas?: Array<{ points: Array<{ lat: number; lon: number }> }>;
|
|
initialNotes?: string;
|
|
};
|
|
|
|
// Encode planning data in URL params
|
|
const urlParams = new URLSearchParams({ returnUrl });
|
|
if (session.initialWaypoints?.length) {
|
|
urlParams.set("waypoints", JSON.stringify(session.initialWaypoints));
|
|
}
|
|
if (session.initialNoGoAreas?.length) {
|
|
urlParams.set("noGoAreas", JSON.stringify(session.initialNoGoAreas));
|
|
}
|
|
if (session.initialNotes) {
|
|
urlParams.set("notes", session.initialNotes);
|
|
}
|
|
|
|
return data({
|
|
url: `${plannerUrl}${session.url}?${urlParams}`,
|
|
});
|
|
}
|