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>
46 lines
1.7 KiB
TypeScript
46 lines
1.7 KiB
TypeScript
import { redirect, data } from "react-router";
|
|
import type { Route } from "./+types/auth.verify";
|
|
import { verifyMagicToken, verifyEmailChange } from "~/lib/auth.server";
|
|
import { getSessionUser } from "~/lib/auth/session.server";
|
|
import { completeAuth } from "~/lib/auth/completion.server";
|
|
|
|
export async function loader({ request }: Route.LoaderArgs) {
|
|
const url = new URL(request.url);
|
|
const token = url.searchParams.get("token");
|
|
const isEmailChange = url.searchParams.get("email-change") === "1";
|
|
|
|
if (!token) {
|
|
return data({ error: "Missing token" }, { status: 400 });
|
|
}
|
|
|
|
try {
|
|
if (isEmailChange) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) return redirect("/auth/login");
|
|
await verifyEmailChange(token, user.id);
|
|
return redirect("/settings/account");
|
|
}
|
|
|
|
const userId = await verifyMagicToken(token);
|
|
// Default destination after magic-link sign-in is "/?add-passkey=1"
|
|
// (prompt to set up a passkey now that they're in). If the link
|
|
// carried a returnTo, completeAuth's safeReturnTo will honor any
|
|
// same-origin path and otherwise fall back to "/" — handle the
|
|
// add-passkey default before delegating.
|
|
const returnTo = url.searchParams.get("returnTo") ?? "/?add-passkey=1";
|
|
return completeAuth({ userId, request, returnTo, mode: "redirect" });
|
|
} catch (e) {
|
|
return data({ error: (e as Error).message }, { status: 400 });
|
|
}
|
|
}
|
|
|
|
export default function VerifyPage() {
|
|
return (
|
|
<div className="mx-auto max-w-md px-4 py-16 text-center">
|
|
<p className="text-red-600">Invalid or expired magic link.</p>
|
|
<a href="/auth/login" className="mt-4 inline-block text-blue-600 hover:underline">
|
|
Request a new one
|
|
</a>
|
|
</div>
|
|
);
|
|
}
|