Add ClaimResult with headers and cookies

Author: pwelter34

Directory.Packages.props

@@ -31,7 +31,7 @@
     <PackageVersion Include="MailKit" Version="4.17.0" />
     <PackageVersion Include="MediatR" Version="14.2.0" />
     <PackageVersion Include="MessagePack" Version="3.1.8" />
-    <PackageVersion Include="Meziantou.Analyzer" Version="3.0.190" />
+    <PackageVersion Include="Meziantou.Analyzer" Version="3.0.194" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.11" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.11" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.11" />
@@ -70,21 +70,21 @@
     <PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.18.0" />
     <PackageVersion Include="Riok.Mapperly" Version="4.3.1" />
     <PackageVersion Include="Rocks" Version="10.3.0" />
-    <PackageVersion Include="Scalar.AspNetCore" Version="2.17.1" />
+    <PackageVersion Include="Scalar.AspNetCore" Version="2.17.2" />
     <PackageVersion Include="SendGrid.Extensions.DependencyInjection" Version="1.0.1" />
     <PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageVersion Include="SimpleBase" Version="5.6.4" />
     <PackageVersion Include="starkbank-ecdsa" Version="1.3.3" />
     <PackageVersion Include="System.IO.Hashing" Version="10.0.11" />
-    <PackageVersion Include="System.Linq.Dynamic.Core" Version="1.7.3" />
+    <PackageVersion Include="System.Linq.Dynamic.Core" Version="1.7.4" />
     <PackageVersion Include="System.Text.Json" Version="10.0.4" />
     <PackageVersion Include="SystemTextJsonPatch" Version="5.0.0" />
     <PackageVersion Include="TestHost.Abstracts" Version="2.0.1" />
     <PackageVersion Include="Testcontainers.MongoDb" Version="4.14.0" />
     <PackageVersion Include="Testcontainers.MsSql" Version="4.14.0" />
     <PackageVersion Include="TUnit" Version="1.65.68" />
-    <PackageVersion Include="Twilio" Version="7.14.9" />
-    <PackageVersion Include="Verify.TUnit" Version="31.28.0" />
+    <PackageVersion Include="Twilio" Version="8.0.0" />
+    <PackageVersion Include="Verify.TUnit" Version="32.0.0" />
     <PackageVersion Include="YamlDotNet" Version="18.1.0" />
   </ItemGroup>
   <!-- TFM-specific overrides -->

src/Arbiter.CommandQuery.Endpoints/ClaimResult.cs

@@ -0,0 +1,28 @@
+using Arbiter.CommandQuery.Models;
+
+using MessagePack;
+
+namespace Arbiter.CommandQuery.Endpoints;
+
+/// <summary>
+/// Represents claim-related endpoint output including headers and claims.
+/// </summary>
+[MessagePackObject(true)]
+public sealed class ClaimResult
+{
+    /// <summary>
+    /// Gets or sets the request headers.
+    /// </summary>
+    public IList<KeyValue<string, string>>? Headers { get; set; }
+
+    /// <summary>
+    /// Gets or sets the request cookies.
+    /// </summary>
+    public IList<KeyValue<string, string>>? Cookies { get; set; }
+
+    /// <summary>
+    /// Gets or sets the resolved claims.
+    /// </summary>
+    public IList<ClaimType>? Claims { get; set; }
+
+}

src/Arbiter.CommandQuery.Endpoints/DiagnosticsEndpoint.cs

@@ -183,24 +183,45 @@ private async Task<Results<Ok<HealthReportModel>, ProblemHttpResult>> HealthChec
     }
 
     /// <summary>
-    /// Returns the current user's claims.
+    /// Returns request headers and the current user's claims.
     /// </summary>
+    /// <param name="httpContext">The HTTP context containing the incoming request headers.</param>
     /// <param name="user">The current user principal.</param>
     /// <param name="cancellationToken">The cancellation token.</param>
-    /// <returns>A list of claim type and value pairs.</returns>
-    private async Task<Results<Ok<List<ClaimType>>, ProblemHttpResult>> ClaimsCheck(
+    /// <returns>A claim result containing request headers and claim type/value pairs, or problem details when an error occurs.</returns>
+    private async Task<Results<Ok<ClaimResult>, ProblemHttpResult>> ClaimsCheck(
+        HttpContext httpContext,
         ClaimsPrincipal? user = default,
         CancellationToken cancellationToken = default)
     {
         LogClaimsCheckRequested(_logger, user?.Identity?.Name ?? "anonymous");
 
         try
         {
+            var headers = httpContext.Request.Headers
+                .SelectMany(h => h.Value, (h, v) => new KeyValue<string, string> { Key = h.Key, Value = v })
+                .OrderBy(c => c.Key, StringComparer.Ordinal)
+                .ThenBy(c => c.Value, StringComparer.Ordinal)
+                .ToList();
+
+            var cookies = httpContext.Request.Cookies
+                .Select(c => new KeyValue<string, string> { Key = c.Key, Value = c.Value })
+                .OrderBy(c => c.Key, StringComparer.Ordinal)
+                .ToList();
+
             var claims = user?.Claims
                 .Select(c => new ClaimType { Type = c.Type, Value = c.Value })
+                .OrderBy(c => c.Type, StringComparer.Ordinal)
                 .ToList();
 
-            return TypedResults.Ok(claims);
+            var results = new ClaimResult
+            {
+                Headers = headers,
+                Cookies = cookies,
+                Claims = claims,
+            };
+
+            return TypedResults.Ok(results);
         }
         catch (Exception ex)
         {

src/Arbiter.CommandQuery/Models/KeyValue.cs

@@ -0,0 +1,37 @@
+using System.Text.Json.Serialization;
+
+using MessagePack;
+
+namespace Arbiter.CommandQuery.Models;
+
+/// <summary>
+/// Represents a key and associated value.
+/// </summary>
+/// <typeparam name="TKey">The type of the key.</typeparam>
+/// <typeparam name="TValue">The type of the value associated with the key.</typeparam>
+[Equatable]
+[MessagePackObject(true)]
+public partial class KeyValue<TKey, TValue>
+{
+    /// <summary>
+    /// Gets or sets the key.
+    /// </summary>
+    [JsonPropertyName("key")]
+    public TKey Key { get; set; } = default!;
+
+    /// <summary>
+    /// Gets or sets the value associated with the key.
+    /// </summary>
+    [JsonPropertyName("value")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public TValue? Value { get; set; }
+
+    /// <summary>
+    /// Returns a string representation of the key-value pair.
+    /// </summary>
+    /// <returns>A string representation of the key-value pair.</returns>
+    public override string ToString()
+    {
+        return $"KeyValue: Key = {Key}, Value = {Value}";
+    }
+}