Use ContentTypes from options

khellang · Mar 15, 2021 · 01c1b58 · 01c1b58
1 parent c284622
commit 01c1b58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/ProblemDetails/Mvc/ProblemDetailsResultFilter.cs b/src/ProblemDetails/Mvc/ProblemDetailsResultFilter.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Options;
 using static Hellang.Middleware.ProblemDetails.ProblemDetailsOptionsSetup;
 using MvcProblemDetails = Microsoft.AspNetCore.Mvc.ProblemDetails;
 using MvcProblemDetailsFactory = Microsoft.AspNetCore.Mvc.Infrastructure.ProblemDetailsFactory;
@@ -8,9 +9,10 @@ namespace Hellang.Middleware.ProblemDetails.Mvc
 {
     internal class ProblemDetailsResultFilter : IAlwaysRunResultFilter, IOrderedFilter
     {
-        public ProblemDetailsResultFilter(MvcProblemDetailsFactory factory)
+        public ProblemDetailsResultFilter(MvcProblemDetailsFactory factory, IOptions<ProblemDetailsOptions> options)
         {
             Factory = factory;
+            Options = options.Value;
         }
 
         /// <summary>
@@ -20,6 +22,8 @@ public ProblemDetailsResultFilter(MvcProblemDetailsFactory factory)
 
         private MvcProblemDetailsFactory Factory { get; }
 
+        private ProblemDetailsOptions Options { get; }
+
         public void OnResultExecuting(ResultExecutingContext context)
         {
             // Only handle ObjectResult for now.
@@ -45,10 +49,7 @@ public void OnResultExecuting(ResultExecutingContext context)
             context.Result = new ObjectResult(problemDetails)
             {
                 StatusCode = problemDetails.Status,
-                ContentTypes = {
-                    "application/problem+json",
-                    "application/problem+xml",
-                },
+                ContentTypes = Options.ContentTypes,
             };
         }
 

diff --git a/src/ProblemDetails/ProblemDetailsMiddleware.cs b/src/ProblemDetails/ProblemDetailsMiddleware.cs
@@ -135,11 +135,8 @@ private async Task WriteProblemDetails(HttpContext context, MvcProblemDetails de
             {
                 StatusCode = details.Status ?? context.Response.StatusCode,
                 ContentTypes = Options.ContentTypes,
-                DeclaredType = details.GetType(),
             };
 
-            result.ContentTypes = Options.ContentTypes;
-
             await Executor.ExecuteAsync(actionContext, result);
 
             await context.Response.CompleteAsync();