## What & why S-15a, the first of the S-15 (#16) split. A new **beheer** portal (medewerker realm, like behandel) shows the ZTC catalogus — the published zaaktypen — **read-only**. A beheerder logs in and sees the seeded BIG-REGISTRATIE zaaktype. Closes #130 ### The vertical portal → BFF `GET /beheer/catalogi/zaaktypen` (medewerker realm + `beheerder` role) → ACL `GET /catalogi/zaaktypen` → ZGW Catalogi API. - **ACL**: new read-only `GET /catalogi/zaaktypen` listing published zaaktypen (reuses the ADR-0021 Catalogi client; public-safe `identificatie`/`omschrijving`). - **BFF**: new typed `IAclClient` + `Downstream:Acl:BaseUrl`, and `GET /beheer/catalogi/zaaktypen` behind a new `beheerder` policy (reuses the medewerker bearer scheme + realm-role lifting). OpenAPI spec + generated Angular client regenerated. - **Keycloak**: `beheerder` realm role + `bram-beheerder` test user in the medewerker realm. - **Frontend**: new `apps/beheer` Angular app (copied from behandel) with a read-only catalogus page; `SECURE_API_ROUTES=['/beheer/']`. - **Infra**: `beheer` compose service (port 8143), added to `WAIT_SVCS` + CI log-dump; a Playwright e2e (beheerder login → catalogus shows BIG-REGISTRATIE). ### New boundary → ADR-0025 The BFF now reaches the **ACL directly** for the catalogus read — a new service-to-service edge (§14). The catalogus is neither a domain nor a projection concern, and §8.1 means only the ACL may read ZGW; routing through the domain would pollute it with a non-domain passthrough. §8.1/§8.3 stay intact. Recorded in **ADR-0025**. ## Definition of Done - [x] Failing test committed before each implementation (red→green per layer: ACL, BFF, frontend). - [x] Conventional Commits referencing #130. - [ ] CI green — pending Gitea Actions run. - [x] `docker compose up` brings up `beheer` (health-gated in `WAIT_SVCS`). - [x] Docs — ADR-0025 + demo-script S-15a note. - [x] Demo note in `docs/demo-script.md`. ## Verified locally lint (`dotnet format`) ✓ · .NET unit (Acl 57 / Big 152 / EventSubscriber 19 / Bff 40) ✓ · frontend lint+test (8 projects) ✓ · frontend build (4 apps) ✓. Mutation ratchet: added a gateway unit test for the new `ListZaaktypenAsync` mapping so the ACL score holds. verify-stack (compose smoke + e2e) runs in CI. ## Notes for reviewers - The BFF drops the ZGW URL from `BeheerZaaktype` (public-safe: identificatie + omschrijving only). - The catalogus e2e asserts on the stable seeded `BIG-REGISTRATIE` (not a per-test reference), safe on the shared verify stack. - Follow-ups: **S-15b** (#131) default-fill CRUD, **S-15c** (#132) medewerker-realm MFA. 🤖 Generated with [Claude Code](https://claude.com/claude-code)Reviewed-on: #133
251 lines
10 KiB
C#
251 lines
10 KiB
C#
using Acl.Application;
|
|
|
|
namespace Acl.Tests;
|
|
|
|
public class AclServiceTests
|
|
{
|
|
private sealed class FakeGateway : IZaakGateway
|
|
{
|
|
// The URLs the catalogus resolves the configured identificatie/omschrijving to (S-27).
|
|
public Uri ResolvedZaaktype { get; } = new("http://openzaak/catalogi/api/v1/zaaktypen/big");
|
|
public Uri ResolvedInformatieobjecttype { get; } = new("http://openzaak/catalogi/api/v1/informatieobjecttypen/dip");
|
|
public string? ResolvedByIdentificatie;
|
|
public string? ResolvedByOmschrijving;
|
|
|
|
public ZaakRequest? Captured;
|
|
public Uri Result { get; } = new("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
public (Uri Zaak, Uri Zaaktype, DateOnly Datum)? Approved;
|
|
|
|
public Task<Uri> OpenZaakAsync(ZaakRequest request, CancellationToken ct = default)
|
|
{
|
|
Captured = request;
|
|
return Task.FromResult(Result);
|
|
}
|
|
|
|
public Task SetZaakToEindstatusAsync(Uri zaakUrl, Uri zaaktypeUrl, DateOnly datumStatusGezet, CancellationToken ct = default)
|
|
{
|
|
Approved = (zaakUrl, zaaktypeUrl, datumStatusGezet);
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
public (Uri Zaak, Uri Zaaktype, DateOnly Datum)? Cancelled;
|
|
|
|
public Task SetZaakToCancellationStatusAsync(Uri zaakUrl, Uri zaaktypeUrl, DateOnly datumStatusGezet, CancellationToken ct = default)
|
|
{
|
|
Cancelled = (zaakUrl, zaaktypeUrl, datumStatusGezet);
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
public Uri? ReadReferenceFor;
|
|
|
|
public Task<string> GetZaakIdentificatieAsync(Uri zaakUrl, CancellationToken ct = default)
|
|
{
|
|
ReadReferenceFor = zaakUrl;
|
|
return Task.FromResult("REG-FROM-ZAAK");
|
|
}
|
|
|
|
public DocumentRequest? StoredDocument;
|
|
public Uri DocumentResult { get; } = new("http://openzaak/documenten/api/v1/enkelvoudiginformatieobjecten/doc-1");
|
|
|
|
public Task<Uri> StoreDocumentAsync(DocumentRequest request, CancellationToken ct = default)
|
|
{
|
|
StoredDocument = request;
|
|
return Task.FromResult(DocumentResult);
|
|
}
|
|
|
|
public Task<Uri> ResolveZaaktypeUrlAsync(string identificatie, CancellationToken ct = default)
|
|
{
|
|
ResolvedByIdentificatie = identificatie;
|
|
return Task.FromResult(ResolvedZaaktype);
|
|
}
|
|
|
|
public Task<Uri> ResolveInformatieobjecttypeUrlAsync(string omschrijving, CancellationToken ct = default)
|
|
{
|
|
ResolvedByOmschrijving = omschrijving;
|
|
return Task.FromResult(ResolvedInformatieobjecttype);
|
|
}
|
|
|
|
public IReadOnlyList<ZaaktypeSummary> Zaaktypen { get; } =
|
|
[
|
|
new("BIG-REGISTRATIE", "BIG-registratie", new Uri("http://openzaak/catalogi/api/v1/zaaktypen/big")),
|
|
];
|
|
|
|
public Task<IReadOnlyList<ZaaktypeSummary>> ListZaaktypenAsync(CancellationToken ct = default) =>
|
|
Task.FromResult(Zaaktypen);
|
|
}
|
|
|
|
private static AclDefaults Defaults() => new()
|
|
{
|
|
Bronorganisatie = "517439943",
|
|
VerantwoordelijkeOrganisatie = "517439943",
|
|
Vertrouwelijkheidaanduiding = "openbaar",
|
|
ZaaktypeIdentificatie = "BIG-REGISTRATIE",
|
|
InformatieobjecttypeOmschrijving = "Diploma",
|
|
};
|
|
|
|
private static AclService ServiceWith(FakeGateway gateway, AclDefaults defaults, DateOnly today) =>
|
|
new(gateway, defaults, new CachedZaaktypeCatalog(gateway, defaults), new FixedClock(today));
|
|
|
|
private sealed class FixedClock(DateOnly today) : IClock
|
|
{
|
|
public DateOnly Today { get; } = today;
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Opening_a_zaak_default_fills_zgw_fields_and_uses_the_resolved_zaaktype()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = ServiceWith(gateway, Defaults(), new DateOnly(2026, 6, 4));
|
|
|
|
var url = await service.OpenZaakAsync(new DomainRegistration("123456782", "reg-77"));
|
|
|
|
Assert.Equal(gateway.Result, url);
|
|
var req = Assert.IsType<ZaakRequest>(gateway.Captured);
|
|
Assert.Equal("517439943", req.Bronorganisatie);
|
|
Assert.Equal("517439943", req.VerantwoordelijkeOrganisatie);
|
|
Assert.Equal("openbaar", req.Vertrouwelijkheidaanduiding);
|
|
// The zaaktype is resolved from the configured identificatie, not a pinned URL (S-27).
|
|
Assert.Equal("BIG-REGISTRATIE", gateway.ResolvedByIdentificatie);
|
|
Assert.Equal(gateway.ResolvedZaaktype, req.Zaaktype);
|
|
Assert.Equal(new DateOnly(2026, 6, 4), req.Startdatum);
|
|
// The registration reference becomes the zaak identificatie (#78).
|
|
Assert.Equal("reg-77", req.Identificatie);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Rejects_a_null_registration_without_calling_the_gateway()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = ServiceWith(gateway, Defaults(), new DateOnly(2026, 6, 4));
|
|
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.OpenZaakAsync(null!));
|
|
Assert.Null(gateway.Captured);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Approving_a_zaak_sets_it_to_its_resolved_zaaktypes_eindstatus_dated_today()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = ServiceWith(gateway, Defaults(), new DateOnly(2026, 6, 4));
|
|
var zaak = new Uri("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
await service.ApproveZaakAsync(zaak);
|
|
|
|
Assert.NotNull(gateway.Approved);
|
|
Assert.Equal(zaak, gateway.Approved!.Value.Zaak);
|
|
Assert.Equal(gateway.ResolvedZaaktype, gateway.Approved.Value.Zaaktype);
|
|
Assert.Equal(new DateOnly(2026, 6, 4), gateway.Approved.Value.Datum);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Approving_a_null_zaak_is_rejected_without_touching_the_gateway()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = ServiceWith(gateway, Defaults(), new DateOnly(2026, 6, 4));
|
|
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.ApproveZaakAsync(null!));
|
|
Assert.Null(gateway.Approved);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Cancelling_a_zaak_sets_it_to_the_cancellation_status_dated_today()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = ServiceWith(gateway, Defaults(), new DateOnly(2026, 6, 4));
|
|
var zaak = new Uri("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
await service.CancelZaakAsync(zaak);
|
|
|
|
Assert.NotNull(gateway.Cancelled);
|
|
Assert.Equal(zaak, gateway.Cancelled!.Value.Zaak);
|
|
Assert.Equal(gateway.ResolvedZaaktype, gateway.Cancelled.Value.Zaaktype);
|
|
Assert.Equal(new DateOnly(2026, 6, 4), gateway.Cancelled.Value.Datum);
|
|
// Cancellation must not touch the approval path.
|
|
Assert.Null(gateway.Approved);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Cancelling_a_null_zaak_is_rejected_without_touching_the_gateway()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = ServiceWith(gateway, Defaults(), new DateOnly(2026, 6, 4));
|
|
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.CancelZaakAsync(null!));
|
|
Assert.Null(gateway.Cancelled);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Storing_a_diploma_default_fills_the_document_fields_and_uses_the_resolved_informatieobjecttype()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = ServiceWith(gateway, Defaults(), new DateOnly(2026, 6, 4));
|
|
var zaak = new Uri("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
var url = await service.StoreDiplomaAsync(zaak, [1, 2, 3], "diploma.pdf", "application/pdf");
|
|
|
|
Assert.Equal(gateway.DocumentResult, url);
|
|
var req = gateway.StoredDocument!;
|
|
Assert.Equal(zaak, req.Zaak);
|
|
// The informatieobjecttype is resolved from the configured omschrijving (S-27).
|
|
Assert.Equal("Diploma", gateway.ResolvedByOmschrijving);
|
|
Assert.Equal(gateway.ResolvedInformatieobjecttype, req.Informatieobjecttype);
|
|
Assert.Equal("517439943", req.Bronorganisatie);
|
|
Assert.Equal("openbaar", req.Vertrouwelijkheidaanduiding);
|
|
Assert.Equal(new DateOnly(2026, 6, 4), req.Creatiedatum);
|
|
Assert.Equal("nld", req.Taal);
|
|
Assert.Equal("diploma.pdf", req.Bestandsnaam);
|
|
Assert.Equal("application/pdf", req.Formaat);
|
|
Assert.Equal(new byte[] { 1, 2, 3 }, req.Inhoud);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Storing_a_diploma_rejects_null_or_blank_arguments()
|
|
{
|
|
var service = ServiceWith(new FakeGateway(), Defaults(), new DateOnly(2026, 6, 4));
|
|
var zaak = new Uri("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.StoreDiplomaAsync(null!, [1], "d.pdf", "application/pdf"));
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.StoreDiplomaAsync(zaak, null!, "d.pdf", "application/pdf"));
|
|
await Assert.ThrowsAnyAsync<ArgumentException>(() => service.StoreDiplomaAsync(zaak, [1], " ", "application/pdf"));
|
|
await Assert.ThrowsAnyAsync<ArgumentException>(() => service.StoreDiplomaAsync(zaak, [1], "d.pdf", " "));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Reading_a_zaak_reference_returns_the_zaaks_identificatie()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = ServiceWith(gateway, Defaults(), new DateOnly(2026, 6, 4));
|
|
var zaak = new Uri("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
var reference = await service.GetZaakReferenceAsync(zaak);
|
|
|
|
Assert.Equal("REG-FROM-ZAAK", reference);
|
|
Assert.Equal(zaak, gateway.ReadReferenceFor);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Reading_a_null_zaak_reference_is_rejected()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = ServiceWith(gateway, Defaults(), new DateOnly(2026, 6, 4));
|
|
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.GetZaakReferenceAsync(null!));
|
|
Assert.Null(gateway.ReadReferenceFor);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Listing_zaaktypen_returns_the_gateways_published_zaaktypen(/* S-15a */)
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = ServiceWith(gateway, Defaults(), new DateOnly(2026, 6, 4));
|
|
|
|
var zaaktypen = await service.ListZaaktypenAsync();
|
|
|
|
var only = Assert.Single(zaaktypen);
|
|
Assert.Equal("BIG-REGISTRATIE", only.Identificatie);
|
|
Assert.Equal("BIG-registratie", only.Omschrijving);
|
|
Assert.Equal(new Uri("http://openzaak/catalogi/api/v1/zaaktypen/big"), only.Url);
|
|
}
|
|
}
|