Merge pull request #60 from umbraco/v15/feature/allow-custom-http-clients

Add support for custom http clients

Author: acoumb

README.md

@@ -442,6 +442,10 @@ Responsible for defining the operations building the dictionary of parameters us
 
 Responsible for making requests to the authorized services for the purposes of accessing business functionality. This is used by Umbraco solution developers and is described in detail above. Implemented by `AuthorizedServiceCaller`.
 
+#### IAuthorizedServiceHttpClientFactory
+
+Responsible for constructing an HTTP client used for making requests to the authorized service. Implemented by `AuthorizedServiceHttpClientFactory`.
+
 #### IRefreshTokenParametersBuilder
 
 Responsible for creating a dictionary of parameters provided in the request to retrieve an access token from a refresh token. Implemented by `RefreshTokenParametersBuilder`.

src/Umbraco.AuthorizedServices/AuthorizedServicesComposer.cs

@@ -43,6 +43,7 @@ private static void RegisterServices(IUmbracoBuilder builder)
         builder.Services.AddUnique<IAuthorizedServiceAuthorizer, AuthorizedServiceAuthorizer>();
         builder.Services.AddUnique<IAuthorizationUrlBuilder, AuthorizationUrlBuilder>();
         builder.Services.AddUnique<IAuthorizedRequestBuilder, AuthorizedRequestBuilder>();
+        builder.Services.AddUnique<IAuthorizedServiceHttpClientFactory, AuthorizedServiceHttpClientFactory>();
 
         builder.Services.AddUnique<IAuthorizedServiceCaller, AuthorizedServiceCaller>();
         builder.Services.AddUnique<IServiceResponseMetadataParser, ServiceResponseMetadataParser>();

src/Umbraco.AuthorizedServices/Services/IAuthorizedServiceHttpClientFactory.cs

@@ -0,0 +1,11 @@
+using Umbraco.AuthorizedServices.Configuration;
+
+namespace Umbraco.AuthorizedServices.Services;
+
+/// <summary>
+/// Defines operations on creation of HTTP clients for authorized services.
+/// </summary>
+public interface IAuthorizedServiceHttpClientFactory
+{
+    HttpClient CreateClient(ServiceDetail serviceDetail, string path, HttpMethod httpMethod);
+}

src/Umbraco.AuthorizedServices/Services/Implement/AuthorizedServiceCaller.cs

@@ -13,7 +13,7 @@ namespace Umbraco.AuthorizedServices.Services.Implement;
 
 internal sealed class AuthorizedServiceCaller : AuthorizedServiceBase, IAuthorizedServiceCaller
 {
-    private readonly IHttpClientFactory _httpClientFactory;
+    private readonly IAuthorizedServiceHttpClientFactory _httpClientFactory;
     private readonly IJsonSerializer _jsonSerializer;
     private readonly IAuthorizedRequestBuilder _authorizedRequestBuilder;
     private readonly IRefreshTokenParametersBuilder _refreshTokenParametersBuilder;
@@ -30,7 +30,7 @@ public AuthorizedServiceCaller(
         IAuthorizationRequestSender authorizationRequestSender,
         ILogger<AuthorizedServiceCaller> logger,
         IOptionsMonitor<ServiceDetail> serviceDetailOptions,
-        IHttpClientFactory httpClientFactory,
+        IAuthorizedServiceHttpClientFactory httpClientFactory,
         IJsonSerializer jsonSerializer,
         IAuthorizedRequestBuilder authorizedRequestBuilder,
         IRefreshTokenParametersBuilder refreshTokenParametersBuilder,
@@ -99,8 +99,6 @@ public async Task<Attempt<AuthorizedServiceResponse<string>>> SendRequestRawAsyn
     {
         ServiceDetail serviceDetail = GetServiceDetail(serviceAlias);
 
-        HttpClient httpClient = _httpClientFactory.CreateClient();
-
         Attempt<HttpRequestMessage?> requestMessageAttempt = await CreateHttpRequestMessage(serviceDetail, path, httpMethod, requestContent);
         if (!requestMessageAttempt.Success)
         {
@@ -109,6 +107,8 @@ public async Task<Attempt<AuthorizedServiceResponse<string>>> SendRequestRawAsyn
                 requestMessageAttempt.Exception!)!;
         }
 
+        HttpClient httpClient = _httpClientFactory.CreateClient(serviceDetail, path, httpMethod);
+
         HttpResponseMessage response = await httpClient.SendAsync(requestMessageAttempt.Result!);
 
         ServiceResponseMetadata serviceMetadata = _serviceResponseMetadataParser.ParseMetadata(response);

src/Umbraco.AuthorizedServices/Services/Implement/AuthorizedServiceHttpClientFactory.cs

@@ -0,0 +1,12 @@
+using Umbraco.AuthorizedServices.Configuration;
+
+namespace Umbraco.AuthorizedServices.Services.Implement;
+
+internal sealed class AuthorizedServiceHttpClientFactory : IAuthorizedServiceHttpClientFactory
+{
+    private readonly IHttpClientFactory _httpClientFactory;
+
+    public AuthorizedServiceHttpClientFactory(IHttpClientFactory httpClientFactory) => _httpClientFactory = httpClientFactory;
+
+    public HttpClient CreateClient(ServiceDetail serviceDetail, string path, HttpMethod httpMethod) => _httpClientFactory.CreateClient();
+}

tests/Umbraco.AuthorizedServices.Tests/Services/AuthorizedServiceCallerTests.cs

@@ -376,7 +376,7 @@ private AuthorizedServiceCaller CreateService(
             authorizationRequestSenderMock.Object,
             new NullLogger<AuthorizedServiceCaller>(),
             optionsMonitorServiceDetailMock.Object,
-            new TestHttpClientFactory(statusCode, responseContent),
+            new AuthorizedServiceHttpClientFactory(new TestHttpClientFactory(statusCode, responseContent)),
             jsonSerializer,
             new AuthorizedRequestBuilder(jsonSerializer),
             new RefreshTokenParametersBuilder(),

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "15.1.1",
+  "version": "15.2.0",
   "assemblyVersion": {
     "precision": "build"
   },