From ecdc46cb942d74870867a02db128d289193d3123 Mon Sep 17 00:00:00 2001 From: Sluijsens Date: Tue, 10 Nov 2026 13:26:27 +0100 Subject: [PATCH] Docs: rebase-resultaat in de fase-1-overdracht Co-Authored-By: Claude Sonnet 5.5 --- .../contact-forms-module/construction/phase-1-handoff.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/aidlc-docs/features/contact-forms-module/construction/phase-1-handoff.md b/aidlc-docs/features/contact-forms-module/construction/phase-1-handoff.md index 5d17898..135cefb 100644 --- a/aidlc-docs/features/contact-forms-module/construction/phase-1-handoff.md +++ b/aidlc-docs/features/contact-forms-module/construction/phase-1-handoff.md @@ -104,3 +104,6 @@ CMS switch (not configuration): table `ContactSettings`, `PUT /contact-settings` - Frontend (`frontend/`): `pnpm lint`, `npx tsc -b`, `pnpm test` (278 tests at CMS-U1b). 15 pre-existing files under `features/offerings` fail `prettier --check` (tech debt, not touched). - The admin frontend work of phase 1 is only the offerings part (new routes, `useMoveOffering` via `PUT /offerings/order`, categories dialog + select, query key `['offerings','list']`). - Last test run (CMS-U4): Contact.Tests 223, Core 205, Availability 95, Offerings 86, Identity 37, Master 57, Api.Tests 4 — all green. + +## 6. Rebase result (2026-11-10) +Rebased onto `origin/master` `e671078` (merge of PR #11: identity-email-notifications + andreaslop-site-hosting). Conflicts: `aidlc-docs/active-features.md` (kept master's table, appended our row), `AvailabilityMiddleware` (kept their `CheckAdmin` / expired-token 401 behaviour, our marker block before it), `AddCmsRateLimiting.OnRejected` (kept their Retry-After logic for sliding windows, added the `60 s` fallback for policies without a wait and the problem+json body), `SlpModularCms.sln` (took master's, re-added the two Contact projects). No EF snapshot conflict (own contexts). Checklist steps 1 and 2 are DONE: `ContactRateLimitPartition.KeyFor` now returns `ClientPartitionKey.For(context)` and its test asserts different buckets per address. Still open: step 3 (`ForwardedHeaders:KnownProxies` per host), step 5 (`Contact:Enabled=true`), step 6 (CMS switch). `GET /System/capabilities` now carries `[PublicSiteEndpoint]` (never 503; separate commit). The pipeline tests for the management routes log in with a real user (the host validates every access token against its user and security stamp).