8 files changed, 112 insertions, 28 deletions

diff --git a/Blog/Components/Pages/BRP.razor b/Blog/Components/Pages/BRP.razor
index 6595d3a..89c8510 100644
--- a/Blog/Components/Pages/BRP.razor
+++ b/Blog/Components/Pages/BRP.razor
@@ -1,8 +1,17 @@
 @page "/BRP/{BSN}"
-@using System.Text.Json
 <PageTitle>BRP</PageTitle>
 
 <main>
-    <JsonRender Element="Entry?.RootElement"></JsonRender>
+    <div>
+        <details>
+            <summary><h1>Request</h1></summary>
+            <JsonRender Element="RequestBody?.RootElement"></JsonRender>
+        </details>
+    </div>
+    <div>
+        <h1>Response</h1>
+        <JsonRender Element="Entry?.RootElement">
+        </JsonRender>
+    </div>
 </main>
 
diff --git a/Blog/Components/Pages/BRP.razor.cs b/Blog/Components/Pages/BRP.razor.cs
index e7298a9..1398a01 100644
--- a/Blog/Components/Pages/BRP.razor.cs
+++ b/Blog/Components/Pages/BRP.razor.cs
@@ -2,7 +2,6 @@ using System.Text.Json;
 using System.Text.RegularExpressions;
 using Blog.Services;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Blog.Components.Pages;
 
@@ -13,12 +12,14 @@ public partial class BRP : ComponentBase
     
     [Inject]
     public required BrpService Service { get; set; }
+    
+    private JsonDocument RequestBody { get; set; }
 
     private JsonDocument Entry { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
-        Entry = await Service.GetBrpEntryAsync(BSN).ConfigureAwait(true);
+        (RequestBody, Entry) = await Service.GetBrpEntryAsync(BSN).ConfigureAwait(true);
         await base.OnInitializedAsync();
     }
 
diff --git a/Blog/Components/Pages/BrpTestData.razor b/Blog/Components/Pages/BrpTestData.razor
index 1b6240e..bbaab8c 100644
--- a/Blog/Components/Pages/BrpTestData.razor
+++ b/Blog/Components/Pages/BrpTestData.razor
@@ -2,11 +2,13 @@
 <PageTitle>BRP Test Data</PageTitle>
 
 <main>
-    @foreach (var entry in Entries)
-    {
-        <div>
-            <NavLink href=@($"/BRP/{@entry.bsn}")>@entry.bsn</NavLink>
-            @entry.naam
-        </div>
-    }
+    <div class="two-column">
+        @foreach (var entry in Entries)
+        {
+            <div>
+                <NavLink href=@($"/BRP/{@entry.bsn}")>@entry.bsn</NavLink>
+                @entry.naam
+            </div>
+        }
+    </div>
 </main>
\ No newline at end of file
diff --git a/Blog/Components/_Shared/JsonRender.razor b/Blog/Components/_Shared/JsonRender.razor
index 17e08a1..45b1825 100644
--- a/Blog/Components/_Shared/JsonRender.razor
+++ b/Blog/Components/_Shared/JsonRender.razor
@@ -4,6 +4,7 @@
 
     [Parameter]
     public JsonElement? Element { get; set; }
+
 }
 @if (Element is { } element)
 {
@@ -14,7 +15,7 @@
             <ul>
                 @foreach (var property in element.EnumerateObject())
                 {
-                    <li>
+                    <li class="dash">
                         <span class="name">@property.Name</span>
                         <JsonRender Element="property.Value"/>
                     </li>
@@ -45,6 +46,27 @@
             {
                 <span>@value</span>
             }
+
+            break;
+        }
+        case JsonValueKind.Null:
+        {
+            <span>Null</span>
+            break;
+        }
+        case JsonValueKind.True:
+        {
+            <span class="json-true">True</span>
+            break;
+        }
+        case JsonValueKind.False:
+        {
+            <span class="json-false">False</span>
+            break;
+        }
+        case JsonValueKind.Number:
+        {
+            <span class="json-number">@element.GetDouble()</span>
             break;
         }
     }
diff --git a/Blog/Models/RaadpleegMetBurgerservicenummer.cs b/Blog/Models/RaadpleegMetBurgerservicenummer.cs
new file mode 100644
index 0000000..785cf82
--- /dev/null
+++ b/Blog/Models/RaadpleegMetBurgerservicenummer.cs
@@ -0,0 +1,24 @@
+namespace Blog.Models;
+
+public record RaadpleegMetBurgerservicenummer
+{
+    private const string _type = "RaadpleegMetBurgerservicenummer";
+    private static readonly string[] _fields =
+    [
+        "aNummer", "adressering", "burgerservicenummer", "datumEersteInschrijvingGBA",
+        "datumInschrijvingInGemeente", "europeesKiesrecht", "geboorte", "gemeenteVanInschrijving",
+        "geslacht", "gezag", "immigratie", "indicatieCurateleRegister", "kinderen", "leeftijd", "naam",
+        "nationaliteiten", "ouders", "overlijden", "partners", "uitsluitingKiesrecht", "verblijfplaats",
+        "verblijfstitel", "verblijfplaatsBinnenland", "adresseringBinnenland"
+    ];
+    
+    
+    public string Type => _type;
+    public string[] Fields => _fields;
+    public string[] Burgerservicenummer { get; init; }
+
+    public RaadpleegMetBurgerservicenummer(string bsn)
+    {
+        Burgerservicenummer = [ bsn ];
+    }
+}
\ No newline at end of file
diff --git a/Blog/Program.cs b/Blog/Program.cs
index a6b9c39..893d226 100644
--- a/Blog/Program.cs
+++ b/Blog/Program.cs
@@ -4,11 +4,19 @@ using Blog.Services;
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-builder.Services.AddRazorComponents();
+builder.Services.AddRazorComponents()
+    .AddInteractiveServerComponents();
 
 builder.Services.AddHttpClient();
 builder.Services.AddHybridCache();
-builder.Services.AddSingleton<BrpService>();
+builder.Services.AddHttpClient<BrpService>(
+    client =>
+    {
+        client.BaseAddress = new Uri("https://brp.bes.is/");
+    });
+
+// builder.Services.AddTransient<BrpService>();
+// builder.Services.AddTransient<NsService>();
 
 var app = builder.Build();
 
@@ -25,6 +33,7 @@ app.UseHttpsRedirection();
 app.UseAntiforgery();
 
 app.MapStaticAssets();
-app.MapRazorComponents<App>();
+app.MapRazorComponents<App>()
+    .AddInteractiveServerRenderMode();
 
 app.Run();
\ No newline at end of file
diff --git a/Blog/Services/BrpService.cs b/Blog/Services/BrpService.cs
index e2e23c0..c3eed5a 100644
--- a/Blog/Services/BrpService.cs
+++ b/Blog/Services/BrpService.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.Caching.Hybrid;
 
 namespace Blog.Services;
 
-public class BrpService(HybridCache cache, IHttpClientFactory httpClientFactory)
+public class BrpService(HybridCache cache, HttpClient client)
 {
     public async Task<BRPEntry[]> GetBrpEntriesAsync(CancellationToken cancellationToken = default)
     {
@@ -21,7 +21,7 @@ public class BrpService(HybridCache cache, IHttpClientFactory httpClientFactory)
             .ConfigureAwait(false);
     }
 
-    public async Task<JsonDocument> GetBrpEntryAsync(string bsn, CancellationToken cancellationToken = default)
+    public async Task<(JsonDocument request, JsonDocument response)> GetBrpEntryAsync(string bsn, CancellationToken cancellationToken = default)
     {
         return await cache.GetOrCreateAsync(
                 $"brp/{bsn}",
@@ -31,21 +31,20 @@ public class BrpService(HybridCache cache, IHttpClientFactory httpClientFactory)
             .ConfigureAwait(false);
     }
 
-    private async Task<JsonDocument> FetchBrpEntryAsync(string bsn, CancellationToken cancellationToken)
+    private async Task<(JsonDocument request, JsonDocument response)> FetchBrpEntryAsync(string bsn, CancellationToken cancellationToken)
     {
-        var client = httpClientFactory.CreateClient("brp");
         var response = await client.PostAsJsonAsync(
-                "https://brp.bes.is/haalcentraal/api/brp/personen", 
-                new
-                {
-                    type = "RaadpleegMetBurgerservicenummer",
-                    burgerservicenummer = new[] { bsn },
-                    fields = new[] {"aNummer","adressering","burgerservicenummer","datumEersteInschrijvingGBA","datumInschrijvingInGemeente","europeesKiesrecht","geboorte","gemeenteVanInschrijving","geslacht","gezag","immigratie","indicatieCurateleRegister","kinderen","leeftijd","naam","nationaliteiten","ouders","overlijden","partners","uitsluitingKiesrecht","verblijfplaats","verblijfstitel","verblijfplaatsBinnenland","adresseringBinnenland"},
-                },
+                "haalcentraal/api/brp/personen", 
+                new RaadpleegMetBurgerservicenummer(bsn),
                 cancellationToken)
             .ConfigureAwait(false);
 
         await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
-        return await JsonDocument.ParseAsync(stream, cancellationToken: cancellationToken).ConfigureAwait(false);
+        var responseDocument = await JsonDocument.ParseAsync(stream, cancellationToken: cancellationToken).ConfigureAwait(false);
+        
+        await using var requestStream = await response.RequestMessage!.Content!.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+        var requestDocument = await JsonDocument.ParseAsync(requestStream, cancellationToken: cancellationToken).ConfigureAwait(false);
+
+        return (requestDocument, responseDocument);
     }
 }
\ No newline at end of file
diff --git a/Blog/wwwroot/app.css b/Blog/wwwroot/app.css
index 038f76e..d5dd2b4 100644
--- a/Blog/wwwroot/app.css
+++ b/Blog/wwwroot/app.css
@@ -39,7 +39,7 @@ h1:focus {
 
 * {
     box-sizing: border-box;
-    font-size: calc(1rem + 0.5vw);
+    font-size: calc(1rem + 0.4vw);
     font-family: monospace;
 }
 
@@ -48,6 +48,7 @@ h1:focus {
     --white: #fafafa;
     --error: #da0000;
     --info: #669aba;
+    --green: #5fbb5d;
 
     --ratio: 1.5;
     --s0: 1rem;
@@ -248,6 +249,10 @@ footer > ul {
     columns: 2;
 }
 
+.two-column {
+    columns: 2;
+}
+
 legend::before {
     content: "( ";
 }
@@ -298,3 +303,16 @@ span.name {
 li.dash {
     list-style-type: "- ";
 }
+
+.json-true {
+    color: var(--green);
+}
+
+.json-false {
+    color: var(--error);
+}
+
+.json-number {
+    color: var(--info);
+}
+