Merge pull request #5 from cnblogs/support-httpclientfactory

Implement GitLabClientFactory to support IHttpClientFactory

Author: cnblogs-dudu

.editorconfig

@@ -23,6 +23,21 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
+  <Choose>
+    <When Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">
+      <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.3" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />

src/GitLabApiClient/GitLabApiClient.csproj

@@ -24,7 +24,7 @@ public sealed class GitLabClient : IGitLabClient
         /// <param name="authenticationToken">Personal access token. Obtained from GitLab profile settings.</param>
         /// <param name="httpMessageHandler">Optional handler for HTTP messages. Used for SSL pinning or canceling validation for example.</param>
         /// <param name="clientTimeout">Timespan with the HTTP client timeout if null default timeout is used. Sometimes required to upload files to a gitlab instance depending on filesize and networkspeed.</param>
-        public GitLabClient(string hostUrl, string authenticationToken = "", HttpMessageHandler httpMessageHandler = null, TimeSpan? clientTimeout = null)
+        public GitLabClient(string hostUrl, string authenticationToken = "", HttpClient httpClient = null, TimeSpan? clientTimeout = null)
         {
             Guard.NotEmpty(hostUrl, nameof(hostUrl));
             Guard.NotNull(authenticationToken, nameof(authenticationToken));
@@ -36,7 +36,7 @@ public GitLabClient(string hostUrl, string authenticationToken = "", HttpMessage
                 HostUrl,
                 jsonSerializer,
                 authenticationToken,
-                httpMessageHandler,
+                httpClient ?? new HttpClient(),
                 clientTimeout);
 
             var projectQueryBuilder = new ProjectsQueryBuilder();

src/GitLabApiClient/GitLabClient.cs

@@ -0,0 +1,27 @@
+using System.Net.Http;
+
+using Microsoft.Extensions.Options;
+
+namespace GitLabApiClient
+{
+    public class GitLabClientFactory : IGitLabClientFactory
+    {
+        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly GitLabClientOptions _options;
+
+        public GitLabClientFactory(IHttpClientFactory httpClientFactory, IOptions<GitLabClientOptions> options)
+        {
+            _httpClientFactory = httpClientFactory;
+            _options = options.Value;
+        }
+
+        public IGitLabClient CreateClient()
+        {
+            return new GitLabClient(
+                _options.HostUrl,
+                _options.AuthenticationToken,
+                _httpClientFactory.CreateClient(),
+                _options.ClientTimeout);
+        }
+    }
+}

src/GitLabApiClient/GitLabClientFactory.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace GitLabApiClient
+{
+    public class GitLabClientOptions
+    {
+        public string HostUrl { get; set; }
+        public string AuthenticationToken { get; set; }
+        public TimeSpan? ClientTimeout { get; internal set; }
+    }
+}

src/GitLabApiClient/GitLabClientOptions.cs

@@ -0,0 +1,26 @@
+using System;
+
+using GitLabApiClient;
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class GitLabClientServiceCollectionExtensions
+    {
+        public static IServiceCollection AddGitLabClient(
+            this IServiceCollection services,
+            string sectionKey = "gitLabClient")
+        {
+            services.AddOptions();
+            var config = services.BuildServiceProvider().GetRequiredService<IConfiguration>(); ;
+            services.Configure<GitLabClientOptions>(config.GetSection(sectionKey));
+
+            services.AddHttpClient();
+            services.TryAddSingleton<IGitLabClientFactory, GitLabClientFactory>();
+
+            return services;
+        }
+    }
+}

src/GitLabApiClient/GitLabClientServiceCollectionExtensions.cs

@@ -0,0 +1,7 @@
+namespace GitLabApiClient
+{
+    public interface IGitLabClientFactory
+    {
+        IGitLabClient CreateClient();
+    }
+}

src/GitLabApiClient/IGitLabClientFactory.cs

@@ -4,6 +4,7 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
+
 using GitLabApiClient.Internal.Http.Serialization;
 using GitLabApiClient.Models.Oauth.Requests;
 using GitLabApiClient.Models.Oauth.Responses;
@@ -20,17 +21,18 @@ internal sealed class GitLabHttpFacade
         private GitLabApiRequestor _requestor;
         private GitLabApiPagedRequestor _pagedRequestor;
 
-        private GitLabHttpFacade(string hostUrl, RequestsJsonSerializer jsonSerializer, HttpMessageHandler httpMessageHandler, TimeSpan? clientTimeout = null)
+        private GitLabHttpFacade(string hostUrl, RequestsJsonSerializer jsonSerializer, HttpClient httpClient, TimeSpan? clientTimeout = null)
         {
-            _httpClient = new HttpClient(httpMessageHandler ?? new HttpClientHandler()) { BaseAddress = new Uri(hostUrl) };
+            _httpClient = httpClient ?? new HttpClient();
+            _httpClient.BaseAddress = new Uri(hostUrl);
             if (clientTimeout.HasValue)
                 _httpClient.Timeout = clientTimeout.Value;
 
             Setup(jsonSerializer);
         }
 
-        public GitLabHttpFacade(string hostUrl, RequestsJsonSerializer jsonSerializer, string authenticationToken = "", HttpMessageHandler httpMessageHandler = null, TimeSpan? clientTimeout = null) :
-            this(hostUrl, jsonSerializer, httpMessageHandler, clientTimeout)
+        public GitLabHttpFacade(string hostUrl, RequestsJsonSerializer jsonSerializer, string authenticationToken = "", HttpClient httpClient = null, TimeSpan? clientTimeout = null) :
+            this(hostUrl, jsonSerializer, httpClient, clientTimeout)
         {
             switch (authenticationToken.Length)
             {
@@ -49,7 +51,7 @@ public GitLabHttpFacade(string hostUrl, RequestsJsonSerializer jsonSerializer, s
 
         public GitLabHttpFacade(RequestsJsonSerializer jsonSerializer, HttpClient httpClient)
         {
-            _httpClient = httpClient;
+            _httpClient = httpClient ?? new HttpClient();
             Setup(jsonSerializer);
         }