add http version middleware (#351)

commercetools · Sep 4, 2024 · aeaba0e · aeaba0e
1 parent b3a369b
commit aeaba0e
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 6 deletions.
diff --git a/commercetools.Sdk/commercetools.Base.Client/ClientFactory.cs b/commercetools.Sdk/commercetools.Base.Client/ClientFactory.cs
@@ -17,26 +17,27 @@ public static IClient Create(
             ISerializerService serializerService,
             ITokenProvider tokenProvider,
             bool readResponseAsStream = false,
-            ICorrelationIdProvider correlationIdProvider = null)
+            ICorrelationIdProvider correlationIdProvider = null,
+            Version httpVersion = null)
         {
             Validator.ValidateObject(configuration, new ValidationContext(configuration), true);
             if (readResponseAsStream && serializerService is IStreamSerializerService streamSerializer)
             {
                 return new StreamCtpClient(
-                    CreateMiddlewareStack(clientName, configuration, factory, tokenProvider, true, correlationIdProvider),
+                    CreateMiddlewareStack(clientName, configuration, factory, tokenProvider, true, correlationIdProvider, httpVersion),
                     streamSerializer,
                     clientName
                 );
             }
             return new CtpClient(
-                CreateMiddlewareStack(clientName, configuration, factory, tokenProvider, false, correlationIdProvider),
+                CreateMiddlewareStack(clientName, configuration, factory, tokenProvider, false, correlationIdProvider, httpVersion),
                 serializerService,
                 clientName
             );
         }
 
         public static Middleware CreateMiddlewareStack(string clientName, IClientConfiguration configuration,
-            IHttpClientFactory factory, ITokenProvider tokenProvider, bool readResponseAsStream = false, ICorrelationIdProvider correlationIdProvider = null)
+            IHttpClientFactory factory, ITokenProvider tokenProvider, bool readResponseAsStream = false, ICorrelationIdProvider correlationIdProvider = null, Version httpVersion = null)
         {
             var httpClient = factory.CreateClient(clientName);
             httpClient.BaseAddress = new Uri(configuration.ApiBaseAddress);
@@ -48,6 +49,10 @@ public static Middleware CreateMiddlewareStack(string clientName, IClientConfigu
                     correlationIdProvider ?? new DefaultCorrelationIdProvider(configuration)
                 )
             };
+            if (httpVersion != null)
+            {
+                handlers.Add(CreateVersionMiddleware(httpVersion));
+            }
 
             var httpMiddleware =
                 readResponseAsStream ? (DelegatingMiddleware)new StreamHttpMiddleware(httpClient) : new HttpMiddleware(httpClient);
@@ -70,5 +75,10 @@ public static CorrelationIdMiddleware CreateCorrelationIdMiddleware(
         {
             return new CorrelationIdMiddleware(correlationIdProvider);
         }
+
+        public static VersionMiddleware CreateVersionMiddleware(Version httpVersion)
+        {
+            return new VersionMiddleware(httpVersion);
+        }
     }
 }
diff --git a/commercetools.Sdk/commercetools.Base.Client/ClientOptions.cs b/commercetools.Sdk/commercetools.Base.Client/ClientOptions.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Net;
 
 namespace commercetools.Base.Client
@@ -8,5 +9,7 @@ public class ClientOptions
             DecompressionMethods.Deflate | DecompressionMethods.GZip;
 
         public bool ReadResponseAsStream { get; set; } = false;
+
+        public Version UseHttpVersion { get; set; } = null;
     }
 }
diff --git a/commercetools.Sdk/commercetools.Base.Client/DependencyInjectionSetup.cs b/commercetools.Sdk/commercetools.Base.Client/DependencyInjectionSetup.cs
@@ -60,7 +60,8 @@ private static IDictionary<string, IHttpClientBuilder> UseMultipleClients(this I
                         serializerFactory(serviceProvider),
                         tokenProviderSupplier(clientName, configuration, serviceProvider),
                         options.ReadResponseAsStream,
-                        serviceProvider.GetService<ICorrelationIdProvider>());
+                        serviceProvider.GetService<ICorrelationIdProvider>(),
+                        options.UseHttpVersion);
                     client.Name = clientName;
                     return client;
                 });
@@ -86,7 +87,8 @@ private static IDictionary<string, IHttpClientBuilder> UseSingleClient(this ISer
                     serializerFactory(serviceProvider),
                     tokenProviderSupplier(clientName, configuration, serviceProvider),
                     options.ReadResponseAsStream,
-                    serviceProvider.GetService<ICorrelationIdProvider>());
+                    serviceProvider.GetService<ICorrelationIdProvider>(),
+                    options.UseHttpVersion);
 
                 client.Name = clientName;
                 return client;

diff --git a/commercetools.Sdk/commercetools.Base.Client/Middlewares/VersionMiddleware.cs b/commercetools.Sdk/commercetools.Base.Client/Middlewares/VersionMiddleware.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace commercetools.Base.Client.Middlewares
+{
+    public class VersionMiddleware: DelegatingMiddleware
+    {
+        private readonly Version _httpVersion;
+
+        public VersionMiddleware(Version httpVersion)
+        {
+            this._httpVersion = httpVersion;
+        }
+
+        protected internal override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            request.Version = _httpVersion;
+            return await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
+        }
+
+    }
+}