Add support for avoiding exceptions thrown in EnsureSuccessStatusCodeHttpMessageHandler and handling it yourself

Author: C0nquistadore

src/Dibix.Http.Client/Client/HttpClientBuilderExtensions.cs

@@ -1,20 +1,26 @@
-using System.Net.Http;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
 using Dibix.Http.Client;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class HttpClientBuilderExtensions
     {
-        public static IHttpClientBuilder AddBuiltinHttpMessageHandlers(this IHttpClientBuilder builder)
+        public static IHttpClientBuilder AddBuiltinHttpMessageHandlers(this IHttpClientBuilder builder, params Type[] excludedHandlers)
         {
-            AddHttpMessageHandler<TraceProxyHttpMessageHandler>(builder);
-            AddHttpMessageHandler<EnsureSuccessStatusCodeHttpMessageHandler>(builder);
-            AddHttpMessageHandler<TraceSourceHttpMessageHandler>(builder);
+            AddHttpMessageHandler<TraceProxyHttpMessageHandler>(builder, excludedHandlers);
+            AddHttpMessageHandler<EnsureSuccessStatusCodeHttpMessageHandler>(builder, excludedHandlers);
+            AddHttpMessageHandler<TraceSourceHttpMessageHandler>(builder, excludedHandlers);
             return builder;
         }
 
-        private static void AddHttpMessageHandler<T>(IHttpClientBuilder builder) where T : DelegatingHandler, new()
+        private static void AddHttpMessageHandler<T>(IHttpClientBuilder builder, IEnumerable<Type> excludedHandlers) where T : DelegatingHandler, new()
         {
+            if (excludedHandlers.Contains(typeof(T)))
+                return;
+
             builder.AddHttpMessageHandler(() => new T());
         }
     }

src/Dibix.Http.Client/Client/HttpException.cs

@@ -22,7 +22,7 @@ private protected HttpException(HttpRequestMessage request, string requestConten
             this.ResponseContentText = responseContentText;
         }
 
-        internal static async Task<HttpException> Create(HttpRequestMessage request, HttpResponseMessage response)
+        public static async Task<HttpException> Create(HttpRequestMessage request, HttpResponseMessage response)
         {
             string requestContentText = null;
             if (request.Content != null)

tests/Dibix.Http.Client.Tests/HttpMessageFormattingTests.cs

@@ -15,7 +15,7 @@ public sealed class HttpMessageFormattingTests
         [TestMethod]
         public async Task HttpException_GetFormattedText_WithMaskedSecret()
         {
-            MethodInfo createMethod = typeof(HttpException).SafeGetMethod("Create", BindingFlags.NonPublic | BindingFlags.Static, new[] { typeof(HttpRequestMessage), typeof(HttpResponseMessage) });
+            MethodInfo createMethod = typeof(HttpException).SafeGetMethod("Create", BindingFlags.Public | BindingFlags.Static, new[] { typeof(HttpRequestMessage), typeof(HttpResponseMessage) });
             HttpRequestMessage request = new HttpRequestMessage();
             request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
             request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/json"));
@@ -60,7 +60,7 @@ GET  HTTP/1.1
         [TestMethod]
         public async Task HttpException_GetFormattedText_WithNoMaskedSecret()
         {
-            MethodInfo createMethod = typeof(HttpException).SafeGetMethod("Create", BindingFlags.NonPublic | BindingFlags.Static, new[] { typeof(HttpRequestMessage), typeof(HttpResponseMessage) });
+            MethodInfo createMethod = typeof(HttpException).SafeGetMethod("Create", BindingFlags.Public | BindingFlags.Static, new[] { typeof(HttpRequestMessage), typeof(HttpResponseMessage) });
             HttpRequestMessage request = new HttpRequestMessage();
             request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", "Secret!");
             request.Content = new FormUrlEncodedContent(new[]
@@ -96,7 +96,7 @@ GET  HTTP/1.1
         [TestMethod]
         public async Task HttpException_GetFormattedText_WithUnmaskedSecret()
         {
-            MethodInfo createMethod = typeof(HttpException).SafeGetMethod("Create", BindingFlags.NonPublic | BindingFlags.Static, new[] { typeof(HttpRequestMessage), typeof(HttpResponseMessage) });
+            MethodInfo createMethod = typeof(HttpException).SafeGetMethod("Create", BindingFlags.Public | BindingFlags.Static, new[] { typeof(HttpRequestMessage), typeof(HttpResponseMessage) });
             HttpRequestMessage request = new HttpRequestMessage();
             request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", "Okay");