diff --git a/app/api/orders/[id]/route.ts b/app/api/orders/[id]/route.ts index 2d6a248..4daf1c8 100644 --- a/app/api/orders/[id]/route.ts +++ b/app/api/orders/[id]/route.ts @@ -1,5 +1,6 @@ import { NextRequest, NextResponse } from "next/server"; -import { getOrder, setStatus } from "@/lib/orders-store"; +import { getOrder, setStatusIfCurrent } from "@/lib/orders-store"; +import { requireRouteAuth } from "@/src/auth/require-route-auth"; // GET /api/orders/{id} export async function GET(_req: NextRequest, ctx: { params: Promise<{ id: string }> }) { @@ -12,6 +13,8 @@ export async function GET(_req: NextRequest, ctx: { params: Promise<{ id: string // PATCH /api/orders/{id} — status transition (deposit → in_production → review → accepted ...). // Escrow rule (docs/01): balance never charged before 'accepted'. Stripe wiring follows. export async function PATCH(req: NextRequest, ctx: { params: Promise<{ id: string }> }) { + const auth = await requireRouteAuth(req); + if (auth.response) return auth.response; const { id } = await ctx.params; let body: { status?: string }; try { @@ -22,11 +25,27 @@ export async function PATCH(req: NextRequest, ctx: { params: Promise<{ id: strin if (!body || typeof body !== "object") { return NextResponse.json({ error: { code: "bad_json", message: "Invalid JSON body" } }, { status: 400 }); } - const allowed = ["draft", "quoted", "deposit_pending", "in_production", "review", "revision", "accepted", "delivered"]; + // Paid states are owned exclusively by the signed, matching Stripe webhook. + if (body.status === "in_production" || body.status === "delivered") { + return NextResponse.json({ error: { code: "payment_event_required" } }, { status: 403 }); + } + const allowed = ["quoted", "deposit_pending", "review", "revision", "accepted"]; if (!body.status || !allowed.includes(body.status)) { return NextResponse.json({ error: { code: "bad_status", message: "Ogiltig status" } }, { status: 400 }); } - const order = await setStatus(id, body.status); + const order = await getOrder(id); if (!order) return NextResponse.json({ error: { code: "not_found", message: "Order saknas" } }, { status: 404 }); - return NextResponse.json(order); + const previous: Record = { + quoted: ["draft"], + deposit_pending: ["draft", "quoted"], + review: ["in_production"], + revision: ["review"], + accepted: ["review", "revision"], + }; + if (!previous[body.status]?.includes(order.status)) { + return NextResponse.json({ error: { code: "invalid_transition" } }, { status: 409 }); + } + const updated = await setStatusIfCurrent(id, order.status, body.status); + if (!updated) return NextResponse.json({ error: { code: "stale_transition" } }, { status: 409 }); + return NextResponse.json(updated); } diff --git a/app/api/payments/[order_id]/release/route.ts b/app/api/payments/[order_id]/release/route.ts index d781e57..1915d8e 100644 --- a/app/api/payments/[order_id]/release/route.ts +++ b/app/api/payments/[order_id]/release/route.ts @@ -1,10 +1,13 @@ import { NextRequest, NextResponse } from "next/server"; import { getStripe } from "@/lib/stripe"; import { getOrder } from "@/lib/orders-store"; +import { requireRouteAuth } from "@/src/auth/require-route-auth"; // POST /api/payments/{order_id}/release (docs/04) — charge the held 50% balance. // Called on ACCEPT only; escrow balance is never charged before approval. export async function POST(req: NextRequest, ctx: { params: Promise<{ order_id: string }> }) { + const auth = await requireRouteAuth(req); + if (auth.response) return auth.response; const { order_id } = await ctx.params; const order = await getOrder(order_id); if (!order) return NextResponse.json({ error: { code: "not_found", message: "Order saknas" } }, { status: 404 }); diff --git a/app/api/webhooks/stripe/route.ts b/app/api/webhooks/stripe/route.ts index 6638702..acfba19 100644 --- a/app/api/webhooks/stripe/route.ts +++ b/app/api/webhooks/stripe/route.ts @@ -1,7 +1,7 @@ import { NextRequest, NextResponse } from "next/server"; import type Stripe from "stripe"; import { getStripe } from "@/lib/stripe"; -import { getOrder, setStatus } from "@/lib/orders-store"; +import { getOrder, setStatusIfCurrent } from "@/lib/orders-store"; // POST /api/webhooks/stripe (docs/04) — verify signature, advance order status. export async function POST(req: NextRequest) { @@ -43,7 +43,7 @@ export async function POST(req: NextRequest) { if (order.status !== "accepted" && order.status !== "delivered") { return NextResponse.json({ error: "invalid_order_state" }, { status: 409 }); } - if (order.status === "accepted" && !(await setStatus(oid, "delivered"))) { + if (order.status === "accepted" && !(await setStatusIfCurrent(oid, "accepted", "delivered"))) { return NextResponse.json({ error: "order_update_failed" }, { status: 503 }); } } else { @@ -51,7 +51,7 @@ export async function POST(req: NextRequest) { if (order.status !== "draft" && order.status !== "deposit_pending" && !alreadyAdvanced) { return NextResponse.json({ error: "invalid_order_state" }, { status: 409 }); } - if (!alreadyAdvanced && !(await setStatus(oid, "in_production"))) { + if (!alreadyAdvanced && !(await setStatusIfCurrent(oid, order.status, "in_production"))) { return NextResponse.json({ error: "order_update_failed" }, { status: 503 }); } } diff --git a/app/bestall/forskott/page.tsx b/app/bestall/forskott/page.tsx index db93b98..c6f514a 100644 --- a/app/bestall/forskott/page.tsx +++ b/app/bestall/forskott/page.tsx @@ -1,7 +1,6 @@ "use client"; import Link from "next/link"; -import { useRouter } from "next/navigation"; import { useEffect, useState } from "react"; import { OrderStepper } from "@/components/order-stepper"; import { useT } from "@/components/locale-provider"; @@ -58,8 +57,8 @@ export default function DepositPage() { }); const [orderId, setOrderId] = useState(null); const [paying, setPaying] = useState(false); + const [paymentError, setPaymentError] = useState(false); const reveal = useReveal(); - const router = useRouter(); useEffect(() => { try { @@ -103,6 +102,7 @@ export default function DepositPage() { async function pay() { if (paying) return; setPaying(true); + setPaymentError(false); if (orderId) { try { const r = await fetch(`/api/payments/${orderId}/deposit`, { method: "POST" }); @@ -111,18 +111,11 @@ export default function DepositPage() { if (body.url) { window.location.href = body.url; return; } } } catch {} - // Stripe not configured — advance status directly (demo mode) - try { - await fetch(`/api/orders/${orderId}`, { - method: "PATCH", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ status: "in_production" }), - }); - } catch {} - router.push(`/order/${orderId}`); - return; } - router.push("/order/SX-4471"); + // No Checkout URL means no payment. Keep the draft and let the customer + // retry; never simulate a successful payment or redirect to a demo order. + setPaymentError(true); + setPaying(false); } return ( @@ -283,6 +276,11 @@ export default function DepositPage() { > {paying ? t({ en: "Starting…", sv: "Startar…" }) : t({ en: "Pay. Start. →", sv: "Betala. Starta. →" })} + {paymentError && ( +

+ {t({ en: "Payment could not be started. Your order is still a draft; please try again.", sv: "Betalningen kunde inte startas. Din order är fortfarande ett utkast; försök igen." })} +

+ )} { + const sql = getSqlForDurableStore("0pt.orders"); + if (sql) { + const rows = await sql` + UPDATE orders SET status = ${next}, updated_at = now() + WHERE order_id::text = ${id} AND status = ${current} + RETURNING order_id, flow, status, config, total_ore, deposit_ore, balance_ore, est_days, est_confidence, created_at`; + return rows[0] ? coerceOrder(rows[0]) : null; + } + const order = mem.get(id); + if (!order || order.status !== current) return null; + order.status = next; + mem.set(id, order); + return order; +} diff --git a/tests/api/order-status-transitions.test.ts b/tests/api/order-status-transitions.test.ts new file mode 100644 index 0000000..7ae7104 --- /dev/null +++ b/tests/api/order-status-transitions.test.ts @@ -0,0 +1,54 @@ +import { beforeEach, expect, it, vi } from "vitest"; +import { NextRequest, NextResponse } from "next/server"; + +const mocks = vi.hoisted(() => ({ + auth: vi.fn(), + getOrder: vi.fn(), + setStatusIfCurrent: vi.fn(), +})); +vi.mock("@/src/auth/require-route-auth", () => ({ requireRouteAuth: mocks.auth })); +vi.mock("@/lib/orders-store", () => ({ + getOrder: mocks.getOrder, + setStatusIfCurrent: mocks.setStatusIfCurrent, +})); + +import { PATCH } from "@/app/api/orders/[id]/route"; + +beforeEach(() => { + mocks.auth.mockReset().mockResolvedValue({ ctx: { tenantId: "verified-tenant" } }); + mocks.getOrder.mockReset().mockResolvedValue({ order_id: "order-1", status: "draft" }); + mocks.setStatusIfCurrent.mockReset().mockResolvedValue({ order_id: "order-1", status: "accepted" }); +}); + +function request(status: string) { + return new NextRequest("https://0pt.app/api/orders/order-1", { + method: "PATCH", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ status }), + }); +} + +const ctx = { params: Promise.resolve({ id: "order-1" }) }; + +it("requires verified auth before changing an order", async () => { + mocks.auth.mockResolvedValue({ response: NextResponse.json({ error: "unauthenticated" }, { status: 401 }) }); + expect((await PATCH(request("accepted"), ctx)).status).toBe(401); + expect(mocks.getOrder).not.toHaveBeenCalled(); +}); + +it("rejects client writes to payment-confirmed states", async () => { + expect((await PATCH(request("in_production"), ctx)).status).toBe(403); + expect((await PATCH(request("delivered"), ctx)).status).toBe(403); + expect(mocks.setStatusIfCurrent).not.toHaveBeenCalled(); +}); + +it("cannot jump from draft directly to accepted", async () => { + expect((await PATCH(request("accepted"), ctx)).status).toBe(409); + expect(mocks.setStatusIfCurrent).not.toHaveBeenCalled(); +}); + +it("uses an atomic compare-and-set transition after review", async () => { + mocks.getOrder.mockResolvedValue({ order_id: "order-1", status: "review" }); + expect((await PATCH(request("accepted"), ctx)).status).toBe(200); + expect(mocks.setStatusIfCurrent).toHaveBeenCalledWith("order-1", "review", "accepted"); +}); diff --git a/tests/api/stripe-balance-no-premature-delivery.test.ts b/tests/api/stripe-balance-no-premature-delivery.test.ts index 6ae1bad..be1b636 100644 --- a/tests/api/stripe-balance-no-premature-delivery.test.ts +++ b/tests/api/stripe-balance-no-premature-delivery.test.ts @@ -1,7 +1,7 @@ import { expect, it, vi } from "vitest"; -import { NextRequest } from "next/server"; +import { NextRequest, NextResponse } from "next/server"; -const mocks = vi.hoisted(() => ({ create: vi.fn(), setStatus: vi.fn() })); +const mocks = vi.hoisted(() => ({ create: vi.fn(), setStatus: vi.fn(), auth: vi.fn() })); vi.mock("@/lib/stripe", () => ({ getStripe: () => ({ checkout: { sessions: { create: mocks.create } } }), })); @@ -9,10 +9,14 @@ vi.mock("@/lib/orders-store", () => ({ getOrder: vi.fn().mockResolvedValue({ order_id: "order-1", status: "accepted", balance_ore: 5000 }), setStatus: mocks.setStatus, })); +vi.mock("@/src/auth/require-route-auth", () => ({ + requireRouteAuth: mocks.auth, +})); import { POST } from "@/app/api/payments/[order_id]/release/route"; it("does not mark delivery complete merely by creating a balance Checkout Session", async () => { + mocks.auth.mockResolvedValue({ ctx: { tenantId: "verified-tenant" } }); mocks.create.mockResolvedValue({ url: "https://checkout.stripe.com/test" }); const req = new NextRequest("https://0pt.app/api/payments/order-1/release", { method: "POST" }); @@ -23,3 +27,12 @@ it("does not mark delivery complete merely by creating a balance Checkout Sessio })); expect(mocks.setStatus).not.toHaveBeenCalled(); }); + +it("rejects an unauthenticated balance Checkout request", async () => { + mocks.create.mockClear(); + mocks.auth.mockResolvedValue({ response: NextResponse.json({ error: "unauthenticated" }, { status: 401 }) }); + const req = new NextRequest("https://0pt.app/api/payments/order-1/release", { method: "POST" }); + + expect((await POST(req, { params: Promise.resolve({ order_id: "order-1" }) })).status).toBe(401); + expect(mocks.create).not.toHaveBeenCalled(); +}); diff --git a/tests/api/stripe-webhook-payment.test.ts b/tests/api/stripe-webhook-payment.test.ts index 146eac2..5a4170f 100644 --- a/tests/api/stripe-webhook-payment.test.ts +++ b/tests/api/stripe-webhook-payment.test.ts @@ -4,7 +4,7 @@ import { NextRequest } from "next/server"; const mocks = vi.hoisted(() => ({ constructEvent: vi.fn(), getOrder: vi.fn(), - setStatus: vi.fn(), + setStatusIfCurrent: vi.fn(), })); vi.mock("@/lib/stripe", () => ({ @@ -12,7 +12,7 @@ vi.mock("@/lib/stripe", () => ({ })); vi.mock("@/lib/orders-store", () => ({ getOrder: mocks.getOrder, - setStatus: mocks.setStatus, + setStatusIfCurrent: mocks.setStatusIfCurrent, })); import { POST } from "@/app/api/webhooks/stripe/route"; @@ -23,8 +23,8 @@ beforeEach(() => { process.env.STRIPE_WEBHOOK_SECRET = "whsec_fake_local_regression"; mocks.constructEvent.mockReset(); mocks.getOrder.mockReset(); - mocks.setStatus.mockReset(); - mocks.setStatus.mockResolvedValue({ order_id: "order-1" }); + mocks.setStatusIfCurrent.mockReset(); + mocks.setStatusIfCurrent.mockResolvedValue({ order_id: "order-1" }); }); afterEach(() => { @@ -57,7 +57,7 @@ it("advances a matching paid deposit only after a verified event", async () => { mocks.getOrder.mockResolvedValue({ order_id: "order-1", status: "draft", deposit_ore: 5000, balance_ore: 5000 }); expect((await POST(delivery())).status).toBe(200); - expect(mocks.setStatus).toHaveBeenCalledWith("order-1", "in_production"); + expect(mocks.setStatusIfCurrent).toHaveBeenCalledWith("order-1", "draft", "in_production"); }); it("never advances an unpaid or amount-mismatched deposit", async () => { @@ -66,7 +66,7 @@ it("never advances an unpaid or amount-mismatched deposit", async () => { expect((await POST(delivery())).status).toBe(503); session("deposit", "paid", 4999); expect((await POST(delivery())).status).toBe(422); - expect(mocks.setStatus).not.toHaveBeenCalled(); + expect(mocks.setStatusIfCurrent).not.toHaveBeenCalled(); }); it("marks a matching paid balance delivered only after acceptance", async () => { @@ -74,5 +74,5 @@ it("marks a matching paid balance delivered only after acceptance", async () => mocks.getOrder.mockResolvedValue({ order_id: "order-1", status: "accepted", deposit_ore: 5000, balance_ore: 5000 }); expect((await POST(delivery())).status).toBe(200); - expect(mocks.setStatus).toHaveBeenCalledWith("order-1", "delivered"); + expect(mocks.setStatusIfCurrent).toHaveBeenCalledWith("order-1", "accepted", "delivered"); }); diff --git a/tests/lib/orders-status-cas.test.ts b/tests/lib/orders-status-cas.test.ts new file mode 100644 index 0000000..47625fe --- /dev/null +++ b/tests/lib/orders-status-cas.test.ts @@ -0,0 +1,9 @@ +import { expect, it } from "vitest"; +import { createOrder, getOrder, setStatusIfCurrent } from "@/lib/orders-store"; + +it("rejects a stale status writer in the in-memory fallback", async () => { + const { order } = await createOrder("custom", { markets: ["SE"], type: "Bolag" }); + expect((await setStatusIfCurrent(order.order_id, "draft", "quoted"))?.status).toBe("quoted"); + expect(await setStatusIfCurrent(order.order_id, "draft", "accepted")).toBeNull(); + expect((await getOrder(order.order_id))?.status).toBe("quoted"); +});