response headers handler

Author: Ihar Yakimush

Commmunity.AspNetCore.ExceptionHandling.Integration/Startup.cs

@@ -28,7 +28,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddExceptionHandlingPolicies(options =>
             {
                 options.For<ArgumentOutOfRangeException>().AddLog().AddRethrow();
-                options.For<InvalidCastException>().AddLog().AddStatusCode(e => 400).AddHeaders((h, e) => h["X-qwe"] = e.Message);
+                options.For<InvalidCastException>().AddLog().AddNewResponse(e => 400).WithHeaders((h, e) => h["X-qwe"] = e.Message);
             });
 
             services.AddLogging(b => b.AddConsole());
@@ -37,7 +37,7 @@ public void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
-            app.UseDeveloperExceptionPage().UseExceptionHandlingPolicies();
+            app.UseDeveloperExceptionPage().UseExceptionHandler().UseExceptionHandlingPolicies();
             app.UseMvc();
         }
     }

Commmunity.AspNetCore.ExceptionHandling/Builder/ExceptionMapping.cs

@@ -3,7 +3,7 @@
     using System;
     using Microsoft.Extensions.DependencyInjection;
 
-    public class ExceptionMapping<TException> : IExceptionPolicyBuilder
+    public class ExceptionMapping<TException> : IExceptionPolicyBuilder, IExceptionMapping<TException>, IResponseHandlers<TException>
         where TException : Exception
     {
         public IExceptionPolicyBuilder Builder { get; }

Commmunity.AspNetCore.ExceptionHandling/Builder/IExceptionMapping.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Commmunity.AspNetCore.ExceptionHandling.Builder
+{
+    public interface IExceptionMapping<TException> : IExceptionPolicyBuilder
+    where TException : Exception
+    {        
+    }
+
+    public interface IResponseHandlers<TException> : IExceptionPolicyBuilder
+        where TException : Exception
+    {
+    }
+}

Commmunity.AspNetCore.ExceptionHandling/PolicyBuilderExtensions.cs

@@ -11,35 +11,34 @@ namespace Commmunity.AspNetCore.ExceptionHandling
 {
     public static class PolicyBuilderExtensions
     {
-        public static ExceptionMapping<TException> For<TException>(
+        public static IExceptionMapping<TException> For<TException>(
             this IExceptionPolicyBuilder builder, int index = -1) where TException : Exception
         {
             builder.Options.EnsureException(typeof(TException), index);
             return new ExceptionMapping<TException>(builder);
         }
 
-        public static ExceptionMapping<TException> EnsureHandler<TException,THandler>(
-            this ExceptionMapping<TException> builder, int index = -1) 
+        public static void EnsureHandler<TException,THandler>(
+            this IExceptionPolicyBuilder builder, int index = -1) 
             where THandler : class , IExceptionHandler
             where TException : Exception
 
         {
             builder.Options.Value.EnsureHandler(typeof(TException), typeof(THandler), index);
             builder.Services.TryAddSingleton<THandler>();
-            return builder;
         }
 
-        public static ExceptionMapping<TException> RemoveHandler<TException, THandler>(
-            this ExceptionMapping<TException> builder)
+        public static IExceptionMapping<TException> RemoveHandler<TException, THandler>(
+            this IExceptionMapping<TException> builder)
             where THandler : IExceptionHandler
             where TException : Exception
         {
             builder.Options.Value.RemoveHandler(typeof(TException), typeof(THandler));
             return builder;
         }
 
-        public static ExceptionMapping<TException> Clear<TException>(
-            this ExceptionMapping<TException> builder)
+        public static IExceptionMapping<TException> Clear<TException>(
+            this IExceptionMapping<TException> builder)
             where TException : Exception
         {
             builder.Options.Value.ClearHandlers(typeof(TException));
@@ -48,39 +47,44 @@ public static ExceptionMapping<TException> Clear<TException>(
 
         // rethrow
         public static IExceptionPolicyBuilder AddRethrow<TException>(
-            this ExceptionMapping<TException> builder, int index = -1)
+            this IExceptionMapping<TException> builder, int index = -1)
             where TException : Exception
-        {            
-            return builder.EnsureHandler<TException,ReThrowExceptionHandler>(index);
+        {
+            builder.EnsureHandler<TException, ReThrowExceptionHandler>(index);
+            return builder;
         }
 
         // Log
-        public static ExceptionMapping<TException> AddLog<TException>(
-            this ExceptionMapping<TException> builder, Action<LogHandlerOptions<TException>> settings = null, int index = -1)
+        public static IExceptionMapping<TException> AddLog<TException>(
+            this IExceptionMapping<TException> builder, Action<LogHandlerOptions<TException>> settings = null, int index = -1)
             where TException : Exception
         {
             LogHandlerOptions<TException> options = new LogHandlerOptions<TException>();
             settings?.Invoke(options);
             builder.Services.TryAddSingleton(options);
-            return builder.EnsureHandler<TException, LogExceptionHandler<TException>>(index);
+            builder.EnsureHandler<TException, LogExceptionHandler<TException>>(index);
+
+            return builder;
         }
 
         // Set status code
-        public static ExceptionMapping<TException> AddStatusCode<TException>(
-            this ExceptionMapping<TException> builder, Func<TException,int> settings = null, int index = -1)
+        public static IResponseHandlers<TException> AddNewResponse<TException>(
+            this IExceptionMapping<TException> builder, Func<TException,int> statusCodeFactory = null, int index = -1)
             where TException : Exception
         {
-            if (settings != null)
+            if (statusCodeFactory != null)
             {
-                builder.Services.Configure<SetStatusCodeOptions<TException>>(codeOptions =>
-                    codeOptions.StatusCodeFactory = settings);
+                builder.Services.Configure<NewResponseOptions<TException>>(codeOptions =>
+                    codeOptions.StatusCodeFactory = statusCodeFactory);
             }
-            
-            return builder.EnsureHandler<TException, SetStatusCodeHandler<TException>>(index);
+
+            builder.EnsureHandler<TException, NewResponseHandler<TException>>(index);
+
+            return builder as IResponseHandlers<TException>;
         }
 
-        public static ExceptionMapping<TException> AddHeaders<TException>(
-            this ExceptionMapping<TException> builder, Action<IHeaderDictionary,TException> settings = null, int index = -1)
+        public static IResponseHandlers<TException> WithHeaders<TException>(
+            this IResponseHandlers<TException> builder, Action<IHeaderDictionary,TException> settings = null, int index = -1)
             where TException : Exception
         {
             if (settings != null)
@@ -89,7 +93,9 @@ public static ExceptionMapping<TException> AddHeaders<TException>(
                     codeOptions.SetHeadersAction = settings);
             }
 
-            return builder.EnsureHandler<TException, SetHeadersHandler<TException>>(index);
+            builder.EnsureHandler<TException, SetHeadersHandler<TException>>(index);
+
+            return builder;
         }
     }
 }

…andling/Response/SetStatusCodeHandler.cs …nHandling/Response/NewResponseHandler.csCommmunity.AspNetCore.ExceptionHandling/Response/SetStatusCodeHandler.cs renamed to Commmunity.AspNetCore.ExceptionHandling/Response/NewResponseHandler.cs Commmunity.AspNetCore.ExceptionHandling/Response/SetStatusCodeHandler.cs renamed to Commmunity.AspNetCore.ExceptionHandling/Response/NewResponseHandler.cs

@@ -4,10 +4,10 @@
 
 namespace Commmunity.AspNetCore.ExceptionHandling.Response
 {
-    public class SetStatusCodeHandler<TException> : RawResponseExceptionHandler<TException>
+    public class NewResponseHandler<TException> : RawResponseExceptionHandler<TException>
     where TException : Exception
     {
-        public SetStatusCodeHandler(IOptions<SetStatusCodeOptions<TException>> options,
+        public NewResponseHandler(IOptions<NewResponseOptions<TException>> options,
             ILoggerFactory loggerFactory) : base(options.Value, loggerFactory)
         {
         }

…andling/Response/SetStatusCodeOptions.cs …nHandling/Response/NewResponseOptions.csCommmunity.AspNetCore.ExceptionHandling/Response/SetStatusCodeOptions.cs renamed to Commmunity.AspNetCore.ExceptionHandling/Response/NewResponseOptions.cs Commmunity.AspNetCore.ExceptionHandling/Response/SetStatusCodeOptions.cs renamed to Commmunity.AspNetCore.ExceptionHandling/Response/NewResponseOptions.cs

@@ -4,10 +4,10 @@
 
 namespace Commmunity.AspNetCore.ExceptionHandling.Response
 {
-    public class SetStatusCodeOptions<TException> : IOptions<SetStatusCodeOptions<TException>>, IOptions<RawResponseHandlerOptions<TException>>
+    public class NewResponseOptions<TException> : IOptions<NewResponseOptions<TException>>, IOptions<RawResponseHandlerOptions<TException>>
     where TException : Exception
     {
-        public SetStatusCodeOptions<TException> Value => this;
+        public NewResponseOptions<TException> Value => this;
 
         public Func<TException, int> StatusCodeFactory =
             exception => StatusCodes.Status500InternalServerError;
@@ -18,6 +18,9 @@ public class SetStatusCodeOptions<TException> : IOptions<SetStatusCodeOptions<TE
                 SetResponse =
                     async (context, exception) =>
                     {
+                        context.Response.Headers.Clear();
+                        if (context.Response.Body.CanSeek)
+                            context.Response.Body.SetLength(0L);
                         context.Response.StatusCode = this.StatusCodeFactory(exception);
                     }
             };