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>
112 lines
3.5 KiB
TypeScript
112 lines
3.5 KiB
TypeScript
// Contract tests for the completeAuth chokepoint. See ADR-0004 +
|
|
// docs/adr/0005-no-authmethod-polymorphism.md for why this exists.
|
|
|
|
import { describe, it, expect } from "vitest";
|
|
import { completeAuth } from "./completion.server.ts";
|
|
|
|
function reqWith(headers: Record<string, string> = {}) {
|
|
return new Request("https://localhost/whatever", { headers });
|
|
}
|
|
|
|
describe("completeAuth (mode=redirect)", () => {
|
|
it("redirects to returnTo when it's a same-origin path", async () => {
|
|
const res = await completeAuth({
|
|
userId: "u1",
|
|
request: reqWith(),
|
|
returnTo: "/profile",
|
|
});
|
|
expect(res.status).toBe(302);
|
|
expect(res.headers.get("Location")).toBe("/profile");
|
|
});
|
|
|
|
it("redirects to / when returnTo is missing", async () => {
|
|
const res = await completeAuth({ userId: "u1", request: reqWith() });
|
|
expect(res.headers.get("Location")).toBe("/");
|
|
});
|
|
|
|
it("redirects to / when returnTo is null", async () => {
|
|
const res = await completeAuth({
|
|
userId: "u1",
|
|
request: reqWith(),
|
|
returnTo: null,
|
|
});
|
|
expect(res.headers.get("Location")).toBe("/");
|
|
});
|
|
|
|
it("rejects protocol-relative returnTo (//evil.com/x) → /", async () => {
|
|
const res = await completeAuth({
|
|
userId: "u1",
|
|
request: reqWith(),
|
|
returnTo: "//evil.com/x",
|
|
});
|
|
expect(res.headers.get("Location")).toBe("/");
|
|
});
|
|
|
|
it("rejects absolute-URL returnTo (https://evil.com) → /", async () => {
|
|
const res = await completeAuth({
|
|
userId: "u1",
|
|
request: reqWith(),
|
|
returnTo: "https://evil.com",
|
|
});
|
|
expect(res.headers.get("Location")).toBe("/");
|
|
});
|
|
|
|
it("rejects returnTo that doesn't start with / → /", async () => {
|
|
const res = await completeAuth({
|
|
userId: "u1",
|
|
request: reqWith(),
|
|
returnTo: "javascript:alert(1)",
|
|
});
|
|
expect(res.headers.get("Location")).toBe("/");
|
|
});
|
|
|
|
it("attaches a __session Set-Cookie carrying the userId", async () => {
|
|
const res = await completeAuth({
|
|
userId: "u1",
|
|
request: reqWith(),
|
|
returnTo: "/",
|
|
});
|
|
const setCookie = res.headers.get("Set-Cookie");
|
|
expect(setCookie).not.toBeNull();
|
|
expect(setCookie!).toMatch(/^__session=/);
|
|
// HttpOnly is required for a session cookie.
|
|
expect(setCookie!.toLowerCase()).toContain("httponly");
|
|
});
|
|
});
|
|
|
|
describe("completeAuth (mode=json)", () => {
|
|
it("returns 200 JSON with sanitized redirectTo and Set-Cookie", async () => {
|
|
const res = await completeAuth({
|
|
userId: "u1",
|
|
request: reqWith(),
|
|
returnTo: "/profile",
|
|
mode: "json",
|
|
});
|
|
expect(res.status).toBe(200);
|
|
expect(res.headers.get("Content-Type")).toContain("application/json");
|
|
expect(res.headers.get("Set-Cookie")).toMatch(/^__session=/);
|
|
const body = (await res.json()) as { ok: boolean; step: string; redirectTo: string };
|
|
expect(body).toEqual({ ok: true, step: "done", redirectTo: "/profile" });
|
|
});
|
|
|
|
it("falls back to / when returnTo is unsafe (json mode)", async () => {
|
|
const res = await completeAuth({
|
|
userId: "u1",
|
|
request: reqWith(),
|
|
returnTo: "https://evil.com",
|
|
mode: "json",
|
|
});
|
|
const body = (await res.json()) as { ok: boolean; redirectTo: string };
|
|
expect(body.redirectTo).toBe("/");
|
|
});
|
|
|
|
it("redirectTo defaults to / when no returnTo (json mode)", async () => {
|
|
const res = await completeAuth({
|
|
userId: "u1",
|
|
request: reqWith(),
|
|
mode: "json",
|
|
});
|
|
const body = (await res.json()) as { ok: boolean; redirectTo: string };
|
|
expect(body.redirectTo).toBe("/");
|
|
});
|
|
});
|