From a49bc148fc7ddbe9bc185608779f349b569269f0 Mon Sep 17 00:00:00 2001 From: sax3l Date: Tue, 29 Sep 2026 12:21:02 +0200 Subject: [PATCH] =?UTF-8?q?feat(admin):=20authz-pilot=20=E2=80=94=20server?= =?UTF-8?q?-renderad=20advance-resolution=20+=20ActionGate=20(ADR-0001)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GET /api/orders returnerar per order frozen advance_action (resolveAction ur lib/order-flow); admin renderar via ActionGate — policy i serverlagret, presentation i klienten (DoD §21). Terminala/okända statusar → read_only med varför-text i stället för missvisande 'klar'. tests/order-flow.test.ts 3/3; full svit 1138 godkända; typecheck grön. --- app/admin/page.tsx | 18 +++---- app/api/orders/route.ts | 6 ++- docs/adr/ADR-0001-server-rendered-authz.md | 60 ++++++++++++++++++++++ lib/order-flow.ts | 23 +++++++++ package.json | 3 +- pnpm-lock.yaml | 3 ++ tests/order-flow.test.ts | 19 +++++++ 7 files changed, 118 insertions(+), 14 deletions(-) create mode 100644 docs/adr/ADR-0001-server-rendered-authz.md create mode 100644 lib/order-flow.ts create mode 100644 tests/order-flow.test.ts diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 370497c..13cfec9 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -1,5 +1,8 @@ "use client"; +import { ActionGate } from "@siax/ui"; +import { NEXT_STATUS } from "@/lib/order-flow"; + import { useCallback, useEffect, useState } from "react"; import { toast } from "sonner"; import { useT } from "@/components/locale-provider"; @@ -25,13 +28,6 @@ interface Metrics { pipeline_ore: number; } -const NEXT_STATUS: Record = { - draft: "quoted", - quoted: "in_production", - in_production: "review", - review: "accepted", - accepted: "delivered", -}; export default function AdminPage() { const t = useT(); @@ -112,16 +108,14 @@ export default function AdminPage() { {formatSEK(o.total_ore / 100)} - {NEXT_STATUS[o.status] ? ( + - ) : ( - {t({ en: "done", sv: "klar" })} - )} + ))} diff --git a/app/api/orders/route.ts b/app/api/orders/route.ts index 4321809..ca59c8a 100644 --- a/app/api/orders/route.ts +++ b/app/api/orders/route.ts @@ -1,6 +1,7 @@ import { NextRequest, NextResponse } from "next/server"; import { createOrder, listOwnedOrders, IdempotencyKeyConflictError, type OrderConfig } from "@/lib/orders-store"; import { requireOrderOwner } from "@/src/auth/require-order-owner"; +import { resolveAdvanceAction } from "@/lib/order-flow"; import { isSiaxError, siaxErrorResponseForLegacy } from "../siax-error-mapping"; // POST /api/orders (docs/04) — create a draft order from a configurator config. @@ -56,7 +57,10 @@ export async function GET(req: NextRequest) { if (auth.response) return auth.response; try { const orders = await listOwnedOrders(auth.owner.tenantId); - return NextResponse.json(orders); + // ADR-0001: servern resolvér advance-aktionen per order — klienten + // renderar bara (ActionGate). Policy ägs här, inte i UI-lagret. + const withActions = orders.map((o) => ({ ...o, advance_action: resolveAdvanceAction(o.status) })); + return NextResponse.json(withActions); } catch (err: unknown) { if (isSiaxError(err)) return siaxErrorResponseForLegacy(err); throw err; diff --git a/docs/adr/ADR-0001-server-rendered-authz.md b/docs/adr/ADR-0001-server-rendered-authz.md new file mode 100644 index 0000000..c6aa297 --- /dev/null +++ b/docs/adr/ADR-0001-server-rendered-authz.md @@ -0,0 +1,60 @@ +# ADR-0001 — Server-renderad authz-resolution för orderåtgärder + +**Status:** Accepted +**Date:** 2026-09-29 +**Owners:** 0pt (simon@siax.io) +**Related requirements:** DoD §21 (backend enforcement), §78 (error/why-UX), våg 3.6–3.7 (authz-ux/entitlement) +**Related capabilities:** `@siax/contracts/authz-ux` 0.10.0, `@siax/ui` ActionGate 0.11.1 + +## Context +Admin-ordkön behöver gate:a advance-aktionen. 0pt saknar klientsides-policy; +`requireOrderOwner` är server-side. Att resolvé:a i klienten vore påhittad +policy (DoD §15). + +## Existing implementations +- PATCH `/api/orders/{id}` enforcar ägarskap server-side (sanningsvärdet). +- Admin-sidan hämtar ordrar via GET `/api/orders` (owner-scopad). + +## Decision +**Server-renderad resolution:** GET `/api/orders` returnerar per order ett +frozen `advance_action` (ResolvedAction från `resolveAction`), derivat i +`lib/order-flow.ts` ur kanoniskt flöde + sessionens ägarskap. Klienten +renderar via `ActionGate` — ingen policylogik i UI-lagret. Ingen extra +fetch: resolutionen rids med ordningssvaret. + +## Ownership +0pt äger flödet och resolutionen; DES1GN äger kontraktet (`authz-ux`) och +renderingen (ActionGate). Product Firewall: 0pt importerar @siax/*, aldrig +tvärtom. + +## Contract +`ResolvedAction {state, reason?}` — stängda uppsättningar enligt authz-ux. + +## Provider boundary +Framtida pay0-entitlement projiceras via `deriveEntitlement` in i samma +resolve — ingen ny endpoint behövs. + +## Dependency rules +`@siax/ui`/`@siax/contracts` → 0pt. Aldrig reverse. + +## Migration +Enda konsument: admin-sidan (denna PR). Övriga ytor migreras per aktion. + +## Alternatives considered +- **Klientsides-resolution mot ny endpoint:** extra roundtrip, policy-läckage­ + risk, mer kod — avvisad. +- **Hårdkodad disabled i UI:** duplicerar serverns sanningsvärde — avvisad + (DoD §21: backend är enforcement, UI är presentation). + +## Risks +Flödesändringar måste skriva i `lib/order-flow.ts` (enda källan) — +lint-/test-täckning finns (tests/order-flow.test.ts). + +## Testing / Evidence +- `tests/order-flow.test.ts`: available för aktiva steg, read_only för + terminala (incl. okända statusar i fri-text-DB) — 3/3. +- Full svit 1138+3 godkända; typecheck grön. + +## Rollback +Ta bort `advance_action`-fältet + ActionGate-wrappen — klienten faller +tillbaka till tidigare rendering (flödet oförändrat). diff --git a/lib/order-flow.ts b/lib/order-flow.ts new file mode 100644 index 0000000..352c17f --- /dev/null +++ b/lib/order-flow.ts @@ -0,0 +1,23 @@ +import { resolveAction, type ResolvedAction } from "@siax/contracts/authz-ux"; + +/** Kanonisk orderflöde — servern äger resolutionen (ADR-0001), UI renderar. */ +export const NEXT_STATUS: Record = { + draft: "quoted", + quoted: "in_production", + in_production: "review", + review: "accepted", + accepted: "delivered", +}; + +/** + * Server-renderad action-resolution för advance-steget (ADR-0001): + * ägarskapenforces redan av requireOrderOwner på GET/PATCH; tillståndet + * avgör read_only. Innan Session/roller finns i 0pt är permission alltid + * granted för autentiserade ägare — hårdkoda aldrig denna resolve i klienten. + */ +export function resolveAdvanceAction(status: string): ResolvedAction { + if (NEXT_STATUS[status]) { + return resolveAction({ permission: "granted", entitlement: "active", approval: "not_required", readOnly: false }); + } + return resolveAction({ permission: "granted", entitlement: "active", approval: "not_required", readOnly: true }); +} diff --git a/package.json b/package.json index 91ab9f5..d82c692 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,8 @@ "tailwind-merge": "^3.3.1", "tailwindcss-animate": "^1.0.7", "vaul": "^1.1.2", - "zod": "3.25.76" + "zod": "3.25.76", + "@siax/contracts": "^0.10.0" }, "devDependencies": { "@eslint/js": "^9.15.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 52975e6..398e70e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -104,6 +104,9 @@ importers: '@siax/config': specifier: ^0.2.1 version: 0.2.1(tailwindcss@4.3.3) + '@siax/contracts': + specifier: ^0.10.0 + version: 0.10.0 '@siax/tokens': specifier: ^0.1.2 version: 0.1.2 diff --git a/tests/order-flow.test.ts b/tests/order-flow.test.ts new file mode 100644 index 0000000..abbb82e --- /dev/null +++ b/tests/order-flow.test.ts @@ -0,0 +1,19 @@ +import { describe, it, expect } from "vitest"; +import { NEXT_STATUS, resolveAdvanceAction } from "@/lib/order-flow"; + +describe("order-flow — server-renderad advance-resolution (ADR-0001)", () => { + it("flödets fem steg har nästa status", () => { + expect(NEXT_STATUS.draft).toBe("quoted"); + expect(NEXT_STATUS.accepted).toBe("delivered"); + }); + + it("aktivt steg → available", () => { + expect(resolveAdvanceAction("draft")).toMatchObject({ state: "available" }); + expect(resolveAdvanceAction("review")).toMatchObject({ state: "available" }); + }); + + it("terminalt steg → read_only/read_only_resource (inte fake available)", () => { + expect(resolveAdvanceAction("delivered")).toMatchObject({ state: "read_only", reason: "read_only_resource" }); + expect(resolveAdvanceAction("cancelled")).toMatchObject({ state: "read_only", reason: "read_only_resource" }); + }); +});