mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-17 15:42:24 +00:00
Merge work/contract-touchups
This commit is contained in:
commit
f6edff9b82
14 files changed
+583
-111
No files matched your search
@@ -0,0 +1,136 @@
|
||||
/**
|
||||
* The bytes a client actually receives from an idempotency 409.
|
||||
*
|
||||
* `POST /api/anamnesis/facts` is the route the drift was reported against
|
||||
* (iOS #75), but nothing here is specific to it — the 409 comes from
|
||||
* `withIdempotency`, so every route under that wrapper serves the same
|
||||
* envelope. Until v1.35.1 both in-flight arms sent `error` as
|
||||
* `{ message: … }`, the only object-shaped error the app emitted and not the
|
||||
* `{ data, error: <string> }` envelope the published contract promises.
|
||||
*
|
||||
* This runs the REAL chain — the real route module, the real `apiHandler`,
|
||||
* the real `withIdempotency` — with only the data layer and the session
|
||||
* mocked, and asserts on the parsed response body. A schema test would not
|
||||
* have caught this: the schema was already right.
|
||||
*
|
||||
* Both 409 arms are covered:
|
||||
* - a `PENDING_STATUS` row already in the table (the in-flight lookup);
|
||||
* - a lost claim race (the row appears between the lookup and the insert).
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
vi.stubEnv("ENCRYPTION_KEYS", "");
|
||||
vi.stubEnv("ENCRYPTION_ACTIVE_KEY_ID", "");
|
||||
vi.stubEnv("ENCRYPTION_KEY", "0".repeat(64));
|
||||
|
||||
const mocks = vi.hoisted(() => ({
|
||||
findUnique: vi.fn(),
|
||||
create: vi.fn(),
|
||||
deleteMany: vi.fn(),
|
||||
updateMany: vi.fn(),
|
||||
getSession: vi.fn(),
|
||||
createFact: vi.fn(),
|
||||
factFindFirst: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock("@/lib/db", () => ({
|
||||
prisma: {
|
||||
idempotencyKey: {
|
||||
findUnique: mocks.findUnique,
|
||||
create: mocks.create,
|
||||
deleteMany: mocks.deleteMany,
|
||||
updateMany: mocks.updateMany,
|
||||
delete: vi.fn(),
|
||||
update: vi.fn(),
|
||||
},
|
||||
apiToken: { findUnique: vi.fn() },
|
||||
healthProfileFactRevision: { findFirst: mocks.factFindFirst },
|
||||
},
|
||||
}));
|
||||
vi.mock("@/lib/auth/session", () => ({ getSession: mocks.getSession }));
|
||||
vi.mock("@/lib/auth/audit", () => ({ auditLog: vi.fn() }));
|
||||
vi.mock("@/lib/profile/health-facts", () => ({
|
||||
readHealthProfileFacts: vi.fn(),
|
||||
createHealthProfileFact: mocks.createFact,
|
||||
correctHealthProfileFact: vi.fn(),
|
||||
removeHealthProfileFact: vi.fn(),
|
||||
}));
|
||||
|
||||
import { NextRequest } from "next/server";
|
||||
import { POST } from "../route";
|
||||
|
||||
/** The pending sentinel `findCached` recognises as "another call is running". */
|
||||
const PENDING_STATUS = 0;
|
||||
|
||||
function request(): NextRequest {
|
||||
return new NextRequest("http://localhost/api/anamnesis/facts", {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"content-type": "application/json",
|
||||
"idempotency-key": "key-in-flight",
|
||||
},
|
||||
body: JSON.stringify({ kind: "SMOKING_STATUS", value: "FORMER" }),
|
||||
});
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
mocks.getSession.mockResolvedValue({
|
||||
user: { id: "user-1", role: "USER" },
|
||||
});
|
||||
mocks.findUnique.mockResolvedValue(null);
|
||||
mocks.create.mockResolvedValue({});
|
||||
mocks.deleteMany.mockResolvedValue({ count: 0 });
|
||||
mocks.updateMany.mockResolvedValue({ count: 1 });
|
||||
mocks.factFindFirst.mockResolvedValue(null);
|
||||
mocks.createFact.mockResolvedValue({ id: "fact-1" });
|
||||
});
|
||||
|
||||
describe("idempotency 409 envelope, over the real route", () => {
|
||||
it("serves `error` as a string when a request is already in flight", async () => {
|
||||
mocks.findUnique.mockResolvedValue({
|
||||
id: "idem-1",
|
||||
responseStatus: PENDING_STATUS,
|
||||
responseBody: "",
|
||||
expiresAt: new Date(Date.now() + 60_000),
|
||||
});
|
||||
|
||||
const response = await POST(request());
|
||||
const body = await response.json();
|
||||
|
||||
expect(response.status).toBe(409);
|
||||
expect(body.data).toBeNull();
|
||||
expect(typeof body.error).toBe("string");
|
||||
expect(body.error).toBe(
|
||||
"A request with this Idempotency-Key is already in progress",
|
||||
);
|
||||
// The shape the drift produced, named explicitly so a revert cannot
|
||||
// pass by satisfying only the `typeof` check above.
|
||||
expect(body.error).not.toHaveProperty("message");
|
||||
expect(response.headers.get("X-Idempotent-Replay")).toBe("false");
|
||||
// The side effect must not have run on a refused call.
|
||||
expect(mocks.createFact).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("serves `error` as a string when the claim race is lost", async () => {
|
||||
// No row on lookup, but the claiming insert collides with the racing
|
||||
// request that got there first.
|
||||
mocks.findUnique.mockResolvedValue(null);
|
||||
mocks.create.mockRejectedValue(
|
||||
Object.assign(new Error("Unique constraint failed"), { code: "P2002" }),
|
||||
);
|
||||
|
||||
const response = await POST(request());
|
||||
const body = await response.json();
|
||||
|
||||
expect(response.status).toBe(409);
|
||||
expect(body.data).toBeNull();
|
||||
expect(typeof body.error).toBe("string");
|
||||
expect(body.error).toBe(
|
||||
"A request with this Idempotency-Key is already in progress",
|
||||
);
|
||||
expect(body.error).not.toHaveProperty("message");
|
||||
expect(response.headers.get("X-Idempotent-Replay")).toBe("false");
|
||||
expect(mocks.createFact).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -10,6 +10,14 @@
|
||||
*
|
||||
* The write half (the stamp on a verified assertion) is pinned in
|
||||
* `src/lib/auth/__tests__/passkey.test.ts`.
|
||||
*
|
||||
* v1.35.1 adds the published half. The route was absent from
|
||||
* `docs/api/openapi.yaml` entirely — no path entry, no schema — while iOS
|
||||
* had been told to generate against one (iOS #60). The last case below
|
||||
* compares the projection the route actually asks Prisma for against the
|
||||
* property set the contract publishes, so the two cannot drift: a column
|
||||
* added to the select without a schema entry fails, and so does a schema
|
||||
* property the route never serves.
|
||||
*/
|
||||
import { readFileSync } from "node:fs";
|
||||
import { resolve } from "node:path";
|
||||
@@ -29,6 +37,7 @@ vi.mock("@/lib/logging/context", () => ({ annotate: vi.fn() }));
|
||||
import { GET } from "../route";
|
||||
import { requireAuth } from "@/lib/api-handler";
|
||||
import { prisma } from "@/lib/db";
|
||||
import { buildOpenApiDocument } from "@/lib/openapi/registry";
|
||||
|
||||
const USER = { id: "user-1", username: "u", email: "u@example.com" };
|
||||
|
||||
@@ -81,6 +90,29 @@ describe("GET /api/auth/passkeys", () => {
|
||||
expect(Object.keys(body.data[0])).toContain("lastUsedAt");
|
||||
expect(body.data[0].lastUsedAt).toBeNull();
|
||||
});
|
||||
|
||||
it("publishes exactly the columns it selects", async () => {
|
||||
await (GET as unknown as () => Promise<Response>)();
|
||||
const args = vi.mocked(prisma.passkey.findMany).mock.calls[0][0];
|
||||
const selected = Object.keys(args?.select ?? {}).sort();
|
||||
|
||||
const doc = buildOpenApiDocument() as {
|
||||
paths?: Record<string, { get?: { responses?: Record<string, unknown> } }>;
|
||||
components?: {
|
||||
schemas?: Record<string, { properties?: Record<string, unknown> }>;
|
||||
};
|
||||
};
|
||||
|
||||
expect(
|
||||
doc.paths?.["/api/auth/passkeys"]?.get,
|
||||
"GET /api/auth/passkeys is not registered in the OpenAPI document",
|
||||
).toBeDefined();
|
||||
|
||||
const published = doc.components?.schemas?.["PasskeyInfo"]?.properties;
|
||||
expect(published, "PasskeyInfo schema is not emitted").toBeDefined();
|
||||
|
||||
expect(Object.keys(published ?? {}).sort()).toEqual(selected);
|
||||
});
|
||||
});
|
||||
|
||||
describe("primary-passkey enrollment route guards", () => {
|
||||
|
||||
Reference in new issue
Block a user