Apply resolver and converter to JsonOptions

Author: JamesNK

src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonTranscodingServiceExtensions.cs

@@ -6,6 +6,8 @@
 using Grpc.Shared;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Binding;
+using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
+using Microsoft.AspNetCore.Http.Json;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 
@@ -27,6 +29,7 @@ public static IGrpcServerBuilder AddJsonTranscoding(this IGrpcServerBuilder buil
 
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton(typeof(IServiceMethodProvider<>), typeof(JsonTranscodingServiceMethodProvider<>)));
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<GrpcJsonTranscodingOptions>, GrpcJsonTranscodingOptionsSetup>());
+        builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<JsonOptions>, JsonOptionsSetup>());
         builder.Services.TryAddSingleton<DescriptorRegistry>();
 
         return builder;
@@ -63,4 +66,25 @@ public void Configure(GrpcJsonTranscodingOptions options)
             options.DescriptorRegistry = _descriptorRegistry;
         }
     }
+
+    private sealed class JsonOptionsSetup : IConfigureOptions<JsonOptions>
+    {
+        private readonly DescriptorRegistry _descriptorRegistry;
+        private readonly GrpcJsonTranscodingOptions _transcodingOptions;
+
+        public JsonOptionsSetup(DescriptorRegistry descriptorRegistry, IOptions<GrpcJsonTranscodingOptions> transcodingOptions)
+        {
+            _descriptorRegistry = descriptorRegistry;
+            _transcodingOptions = transcodingOptions.Value;
+        }
+
+        public void Configure(JsonOptions options)
+        {
+            ArgumentNullException.ThrowIfNull(options);
+
+            var context = new JsonContext(_transcodingOptions.JsonSettings, _transcodingOptions.TypeRegistry, _descriptorRegistry);
+
+            JsonConverterHelper.ApplyConverterAndTypeInfoSerializerOptions(options.SerializerOptions, context);
+        }
+    }
 }

src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/JsonConverterHelper.cs

@@ -37,17 +37,26 @@ internal static JsonSerializerOptions CreateSerializerOptions(JsonContext contex
         // For streaming to work, indenting must be disabled when streaming.
         var writeIndented = !isStreamingOptions ? context.Settings.WriteIndented : false;
 
-        var typeInfoResolver = JsonTypeInfoResolver.Combine(
-            new MessageTypeInfoResolver(context),
-            new DefaultJsonTypeInfoResolver());
-
         var options = new JsonSerializerOptions
         {
             WriteIndented = writeIndented,
             NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals,
-            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-            TypeInfoResolver = typeInfoResolver
+            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
         };
+
+        ApplyConverterAndTypeInfoSerializerOptions(options, context);
+
+        return options;
+    }
+
+    internal static void ApplyConverterAndTypeInfoSerializerOptions(JsonSerializerOptions options, JsonContext context)
+    {
+        var typeInfoResolver = JsonTypeInfoResolver.Combine(
+            new MessageTypeInfoResolver(context),
+            options.TypeInfoResolver ?? new DefaultJsonTypeInfoResolver());
+
+        options.TypeInfoResolver = typeInfoResolver;
+
         options.Converters.Add(new NullValueConverter());
         options.Converters.Add(new ByteStringConverter());
         options.Converters.Add(new Int64Converter(context));
@@ -56,8 +65,6 @@ internal static JsonSerializerOptions CreateSerializerOptions(JsonContext contex
         options.Converters.Add(new JsonConverterFactoryForEnum(context));
         options.Converters.Add(new JsonConverterFactoryForWrappers(context));
         options.Converters.Add(new JsonConverterFactoryForWellKnownTypes(context));
-
-        return options;
     }
 
     internal static Type GetFieldType(FieldDescriptor descriptor)