ProblemHttpResult should use ProblemDetailsService when registered. (#47100)

Author: dnperfors

src/Http/Http.Results/src/ProblemHttpResult.cs

@@ -46,23 +46,27 @@ internal ProblemHttpResult(ProblemDetails problemDetails)
     int? IStatusCodeHttpResult.StatusCode => StatusCode;
 
     /// <inheritdoc/>
-    public Task ExecuteAsync(HttpContext httpContext)
+    public async Task ExecuteAsync(HttpContext httpContext)
     {
         ArgumentNullException.ThrowIfNull(httpContext);
 
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger(typeof(ProblemHttpResult));
+        var problemDetailsService = httpContext.RequestServices.GetService<IProblemDetailsService>();
 
         if (StatusCode is { } code)
         {
             HttpResultsHelper.Log.WritingResultAsStatusCode(logger, code);
             httpContext.Response.StatusCode = code;
         }
 
-        return HttpResultsHelper.WriteResultAsJsonAsync(
+        if (problemDetailsService is null || !await problemDetailsService.TryWriteAsync(new() { HttpContext = httpContext, ProblemDetails = ProblemDetails }))
+        {
+            await HttpResultsHelper.WriteResultAsJsonAsync(
                 httpContext,
                 logger,
                 value: ProblemDetails,
                 ContentType);
+        }
     }
 }

src/Http/Http.Results/test/ProblemResultTests.cs

@@ -43,6 +43,38 @@ public async Task ExecuteAsync_UsesDefaults_ForProblemDetails()
         Assert.Equal(StatusCodes.Status500InternalServerError, responseDetails.Status);
     }
 
+    [Fact]
+    public async Task ExecuteAsync_UsesDefaultsFromProblemDetailsServoce_ForProblemDetails()
+    {
+        // Arrange
+        var details = new ProblemDetails();
+
+        var result = new ProblemHttpResult(details);
+        var stream = new MemoryStream();
+        var services = CreateServiceCollection()
+            .AddProblemDetails(options => options.CustomizeProblemDetails = x => x.ProblemDetails.Type = null)
+            .BuildServiceProvider();
+        var httpContext = new DefaultHttpContext()
+        {
+            RequestServices = services,
+            Response =
+                {
+                    Body = stream,
+                },
+        };
+
+        // Act
+        await result.ExecuteAsync(httpContext);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status500InternalServerError, httpContext.Response.StatusCode);
+        stream.Position = 0;
+        var responseDetails = JsonSerializer.Deserialize<ProblemDetails>(stream, SerializerOptions);
+        Assert.Null(responseDetails.Type);
+        Assert.Equal("An error occurred while processing your request.", responseDetails.Title);
+        Assert.Equal(StatusCodes.Status500InternalServerError, responseDetails.Status);
+    }
+
     [Fact]
     public async Task ExecuteAsync_UsesDefaults_ForValidationProblemDetails()
     {
@@ -217,11 +249,17 @@ public void ProblemResult_Implements_IContentTypeHttpResult_Correctly()
         Assert.Equal("application/problem+json", result.ContentType);
     }
 
-    private static IServiceProvider CreateServices()
+    private static IServiceCollection CreateServiceCollection()
     {
         var services = new ServiceCollection();
         services.AddTransient(typeof(ILogger<>), typeof(NullLogger<>));
         services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+        return services;
+    }
+
+    private static IServiceProvider CreateServices()
+    {
+        var services = CreateServiceCollection();
 
         return services.BuildServiceProvider();
     }