Use JSON source generator & enable trimming (#304)

* Use JSON source generator and enable trimming on Fido2.Models

* [Ctap2] Enable trimming

* Rename FidoModelSerializer -> FidoModelSerializerContext

* Use JSON source generator & enable trimming on main project

Author: iamcarbon

Src/Fido2.Ctap2/Fido2.Ctap2.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
   <ItemGroup>

Src/Fido2.Models/AssertionOptions.cs

@@ -4,6 +4,7 @@
 using System.Text.Json.Serialization;
 
 using Fido2NetLib.Objects;
+using Fido2NetLib.Serialization;
 
 namespace Fido2NetLib
 {
@@ -67,12 +68,12 @@ public static AssertionOptions Create(Fido2Configuration config, byte[] challeng
 
         public string ToJson()
         {
-            return JsonSerializer.Serialize(this);
+            return JsonSerializer.Serialize(this, FidoModelSerializerContext.Default.AssertionOptions);
         }
 
         public static AssertionOptions FromJson(string json)
         {
-            return JsonSerializer.Deserialize<AssertionOptions>(json);
+            return JsonSerializer.Deserialize(json, FidoModelSerializerContext.Default.AssertionOptions);
         }
     }
 }

Src/Fido2.Models/CredentialCreateOptions.cs

@@ -3,7 +3,8 @@
 using System.Text.Json.Serialization;
 
 using Fido2NetLib.Objects;
-
+using Fido2NetLib.Serialization;
+
 namespace Fido2NetLib
 {
     public sealed class CredentialCreateOptions : Fido2ResponseBase
@@ -101,12 +102,12 @@ public static CredentialCreateOptions Create(Fido2Configuration config, byte[] c
 
         public string ToJson()
         {
-            return JsonSerializer.Serialize(this);
+            return JsonSerializer.Serialize(this, FidoModelSerializerContext.Default.CredentialCreateOptions);
         }
 
         public static CredentialCreateOptions FromJson(string json)
         {
-            return JsonSerializer.Deserialize<CredentialCreateOptions>(json);
+            return JsonSerializer.Deserialize(json, FidoModelSerializerContext.Default.CredentialCreateOptions);
         }
     }
 

Src/Fido2.Models/Fido2.Models.csproj

@@ -3,6 +3,7 @@
     <TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <RootNamespace>Fido2NetLib</RootNamespace>
+    <IsTrimmable>true</IsTrimmable>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
 

Src/Fido2.Models/Objects/PublicKeyCredentialUserEntity.cs

@@ -5,7 +5,9 @@ namespace Fido2NetLib.Objects
     public sealed class PublicKeyCredentialUserEntity
     {
         [MaxLength(64)]
+#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
         public byte[] Id { get; set; }
+#pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
 
         public string Name { get; set; }
 

Src/Fido2.Models/Serialization/FidoModelSerializerContext.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace Fido2NetLib.Serialization;
+
+[JsonSerializable(typeof(AssertionOptions))]
+[JsonSerializable(typeof(AuthenticatorAssertionRawResponse))]
+[JsonSerializable(typeof(MetadataBLOBPayload))]
+[JsonSerializable(typeof(CredentialCreateOptions))]
+[JsonSerializable(typeof(MetadataStatement))]
+public partial class FidoModelSerializerContext : JsonSerializerContext
+{
+}

Src/Fido2/AuthenticatorResponse.cs

@@ -4,6 +4,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
+using Fido2NetLib.Serialization;
+
 namespace Fido2NetLib
 {
     /// <summary>
@@ -24,7 +26,7 @@ protected AuthenticatorResponse(ReadOnlySpan<byte> utf8EncodedJson)
             AuthenticatorResponse response;
             try
             {
-                response = JsonSerializer.Deserialize<AuthenticatorResponse>(utf8EncodedJson)!;
+                response = JsonSerializer.Deserialize(utf8EncodedJson, FidoSerializerContext.Default.AuthenticatorResponse)!;
             }
             catch (Exception e) when (e is JsonException)
             {

Src/Fido2/Fido2.csproj

@@ -3,6 +3,7 @@
     <TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
     <Nullable>enable</Nullable>
     <RootNamespace>Fido2NetLib</RootNamespace>
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
   <ItemGroup>

Src/Fido2/Internal/GetBLOBRequest.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace Fido2NetLib.Internal;
+
+public readonly struct GetBLOBRequest
+{
+    [JsonConstructor]
+    public GetBLOBRequest(string endpoint)
+    {
+        Endpoint = endpoint;
+    }
+
+    [JsonPropertyName("endpoint")]
+    public string Endpoint { get; }
+}

Src/Fido2/Metadata/ConformanceMetadataRepository.cs

@@ -3,12 +3,18 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Linq;
 using System.Net.Http;
+using System.Net.Http.Json;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
+
+using Fido2NetLib.Internal;
+using Fido2NetLib.Serialization;
+
 using Microsoft.IdentityModel.Tokens;
 
 namespace Fido2NetLib
@@ -48,15 +54,16 @@ public ConformanceMetadataRepository(HttpClient? client, string origin)
 
         public async Task<MetadataBLOBPayload> GetBLOBAsync(CancellationToken cancellationToken = default)
         {
-            var req = new
+            var req = new GetBLOBRequest(_origin);
+
+            var content = new ByteArrayContent(JsonSerializer.SerializeToUtf8Bytes(req, FidoSerializerContext.Default.GetBLOBRequest))
             {
-                endpoint = _origin
+                Headers = { { "Content-Type", "application/json" } }
             };
 
-            var content = new StringContent(JsonSerializer.Serialize(req), Encoding.UTF8, "application/json");
             using var response = await _httpClient.PostAsync(_getEndpointsUrl, content, cancellationToken);
             await using var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken);
-            var result = await JsonSerializer.DeserializeAsync<MDSGetEndpointResponse>(responseStream, cancellationToken: cancellationToken);
+            MDSGetEndpointResponse? result = await JsonSerializer.DeserializeAsync(responseStream, FidoSerializerContext.Default.MDSGetEndpointResponse, cancellationToken: cancellationToken);
             var conformanceEndpoints = result!.Result;
 
             var combinedBlob = new MetadataBLOBPayload
@@ -231,7 +238,7 @@ public async Task<MetadataBLOBPayload> DeserializeAndValidateBlob(string rawBLOB
 
             var blobPayload = ((JwtSecurityToken)validatedToken).Payload.SerializeToJson();
 
-            var blob = JsonSerializer.Deserialize<MetadataBLOBPayload>(blobPayload)!;
+            MetadataBLOBPayload blob = JsonSerializer.Deserialize(blobPayload, FidoModelSerializerContext.Default.MetadataBLOBPayload)!;
             blob.JwtAlg = blobAlg;
             return blob;
         }