Fixed a bug causing duplicate user-agent headers when using a shared …

…`HttpClient`. (#2008) * Added product version to the user-agent check when configuring HttpClient. * Created a unit test to handle duplicate user agent scenario.
restsharp · Mar 12, 2023 · 41bff69 · 41bff69
1 parent 9ca6777
commit 41bff69
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/RestSharp/RestClient.cs b/src/RestSharp/RestClient.cs
@@ -210,7 +210,7 @@ public partial class RestClient : IRestClient {
     static void ConfigureHttpClient(HttpClient httpClient, RestClientOptions options) {
         if (options.MaxTimeout > 0) httpClient.Timeout = TimeSpan.FromMilliseconds(options.MaxTimeout);
 
-        if (options.UserAgent != null && httpClient.DefaultRequestHeaders.UserAgent.All(x => x.Product?.Name != options.UserAgent)) {
+        if (options.UserAgent != null && httpClient.DefaultRequestHeaders.UserAgent.All(x => $"{x.Product?.Name}/{x.Product?.Version}" != Options.UserAgent)) {
             httpClient.DefaultRequestHeaders.TryAddWithoutValidation(KnownHeaders.UserAgent, options.UserAgent);
         }
 

diff --git a/test/RestSharp.Tests/RestClientTests.cs b/test/RestSharp.Tests/RestClientTests.cs
@@ -116,4 +116,19 @@ public class RestClientTests {
 
         client1.HttpClient.Should().NotBeSameAs(client2.HttpClient);
     }
+
+    [Fact]
+    public void ConfigureHttpClient_does_not_duplicate_user_agent_for_same_client() {
+        // arrange
+        var httpClient = new HttpClient();
+        var clientOptions = new RestClientOptions();
+
+        // act
+        var restClient1 = new RestClient(httpClient, clientOptions);
+        var restClient2 = new RestClient(httpClient, clientOptions);
+
+        // assert
+        Assert.Contains(httpClient.DefaultRequestHeaders.UserAgent, agent => $"{agent.Product.Name}/{agent.Product.Version}" == clientOptions.UserAgent);
+        Assert.Single(httpClient.DefaultRequestHeaders.UserAgent);
+    }
 }