Adding some unit tests. Modifying SocketsHttpHandler constructor, acc…

…epting UseDefaultCredentials
ThreeMammals · Apr 19, 2024 · 04d2653 · 04d2653
1 parent c56269c
commit 04d2653
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/src/Ocelot/Configuration/HttpHandlerOptions.cs b/src/Ocelot/Configuration/HttpHandlerOptions.cs
@@ -65,6 +65,6 @@ public class HttpHandlerOptions
         /// <see langword="true"/> if the default credentials are used; otherwise <see langword="false"/>. The default value is <see langword="false"/>.
         /// The property value is assignable to the <see cref="HttpClientHandler.UseDefaultCredentials"/> one.
         /// </value>
-        public bool UseDefaultCredentials { get; private set; }
+        public bool UseDefaultCredentials { get; }
     }
 }
diff --git a/src/Ocelot/Requester/MessageInvokerPool.cs b/src/Ocelot/Requester/MessageInvokerPool.cs
@@ -77,6 +77,7 @@ private HttpMessageHandler CreateHandler(DownstreamRoute downstreamRoute)
             UseProxy = downstreamRoute.HttpHandlerOptions.UseProxy,
             MaxConnectionsPerServer = downstreamRoute.HttpHandlerOptions.MaxConnectionsPerServer,
             PooledConnectionLifetime = downstreamRoute.HttpHandlerOptions.PooledConnectionLifeTime,
+            Credentials = downstreamRoute.HttpHandlerOptions.UseDefaultCredentials ? CredentialCache.DefaultCredentials : null,
         };
 
         if (downstreamRoute.HttpHandlerOptions.UseCookieContainer)

diff --git a/test/Ocelot.UnitTests/Configuration/HttpHandlerOptionsCreatorTests.cs b/test/Ocelot.UnitTests/Configuration/HttpHandlerOptionsCreatorTests.cs
@@ -185,6 +185,41 @@ public void should_create_options_fixing_specified_MaxConnectionsPerServer_range
                 .Then(x => ThenTheFollowingOptionsReturned(expectedOptions))
                 .BDDfy();
         }
+
+        [Fact]
+        public void Should_create_options_with_useDefaultCredentials_false_as_default()
+        {
+            var fileRoute = new FileRoute
+            {
+                HttpHandlerOptions = new FileHttpHandlerOptions(),
+            };
+
+            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime, false);
+
+            this.Given(x => GivenTheFollowing(fileRoute))
+                .When(x => WhenICreateHttpHandlerOptions())
+                .Then(x => ThenTheFollowingOptionsReturned(expectedOptions))
+                .BDDfy();
+        }
+
+        [Fact]
+        public void Should_create_options_with_useDefaultCredentials_true_if_set()
+        {
+            var fileRoute = new FileRoute
+            {
+                HttpHandlerOptions = new FileHttpHandlerOptions
+                {
+                    UseDefaultCredentials = true,
+                },
+            };
+
+            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime, true);
+
+            this.Given(x => GivenTheFollowing(fileRoute))
+                .When(x => WhenICreateHttpHandlerOptions())
+                .Then(x => ThenTheFollowingOptionsReturned(expectedOptions))
+                .BDDfy();
+        }
 
         private void GivenTheFollowing(FileRoute fileRoute)
         {
@@ -203,7 +238,8 @@ private void ThenTheFollowingOptionsReturned(HttpHandlerOptions expected)
             _httpHandlerOptions.UseCookieContainer.ShouldBe(expected.UseCookieContainer);
             _httpHandlerOptions.UseTracing.ShouldBe(expected.UseTracing);
             _httpHandlerOptions.UseProxy.ShouldBe(expected.UseProxy);
-            _httpHandlerOptions.MaxConnectionsPerServer.ShouldBe(expected.MaxConnectionsPerServer);
+            _httpHandlerOptions.MaxConnectionsPerServer.ShouldBe(expected.MaxConnectionsPerServer);
+            _httpHandlerOptions.UseDefaultCredentials.ShouldBe(expected.UseDefaultCredentials);
         }
 
         private void GivenARealTracer()