[v2] Refactor http client provider (#153 #158)

Author: henrikfroehling

src/libs/Trakt.NET.HttpClientFactory/HttpClientFactoryProvider.cs

@@ -1,6 +1,6 @@
-namespace TraktNET
+namespace TraktNET
 {
-    internal sealed class HttpClientFactoryProvider(IHttpClientFactory httpClientFactory) : HttpClientProvider
+    internal sealed class HttpClientFactoryProvider(IHttpClientFactory httpClientFactory) : HttpClientProvider<TraktContext>
     {
         internal override HttpClient GetHttpClient(TraktContext context) => httpClientFactory.CreateClient(context.ID);
     }

src/libs/Trakt.NET/Internal/Constants.cs

@@ -20,6 +20,8 @@ internal static class API
 
         internal static class Request
         {
+            internal const string AuthenticationScheme = "Bearer";
+
             internal static class Headers
             {
                 internal const string APIVersionHeaderKey = "trakt-api-version";

src/libs/Trakt.NET/Internal/Contexts/ITraktContext.cs

@@ -0,0 +1,9 @@
+namespace TraktNET
+{
+    public interface ITraktContext
+    {
+        string ID { get; }
+
+        Uri BaseUri { get; }
+    }
+}

src/libs/Trakt.NET/Internal/Contexts/TraktContext.cs

@@ -1,33 +1,13 @@
-namespace TraktNET
+namespace TraktNET
 {
-    public abstract class TraktContext
+    public abstract class TraktContext : ITraktContext
     {
         private string _clientID = string.Empty;
         private string _clientSecret = string.Empty;
 
-        internal string ID { get; }
+        public string ID { get; }
 
-        internal string ClientID
-        {
-            get => _clientID;
-
-            set
-            {
-                ArgumentValidator.ThrowIfNullOrWhiteSpace(value, "client ID must not be null or empty or only whitespace", checkSpaces: true);
-                _clientID = value;
-            }
-        }
-
-        internal string ClientSecret
-        {
-            get => _clientSecret;
-
-            set
-            {
-                ArgumentValidator.ThrowIfNullOrWhiteSpace(value, "client secret must not be null or empty or only whitespace", checkSpaces: true);
-                _clientSecret = value;
-            }
-        }
+        public Uri BaseUri { get; internal set; }
 
         public TraktAuthorization? Authorization { get; set; }
 
@@ -102,12 +82,6 @@ public static TraktContext Create(string clientID, string clientSecret)
         public static TraktContext CreateForSandbox(string clientID, string clientSecret)
             => new TraktSandboxContext(clientID, clientSecret);
 
-        internal Uri BaseUri { get; set; }
-
-        internal Uri BaseAuthorizationUri { get; set; }
-
-        internal HttpClientProvider HttpClientProvider { get; set; }
-
         protected TraktContext(string clientID, string clientSecret)
         {
             ID = Guid.NewGuid().ToString();
@@ -140,6 +114,32 @@ protected TraktContext(string clientID, string clientSecret)
             Users = new TraktUsersModule(this);
         }
 
+        internal string ClientID
+        {
+            get => _clientID;
+
+            set
+            {
+                ArgumentValidator.ThrowIfNullOrWhiteSpace(value, "client ID must not be null or empty or only whitespace", checkSpaces: true);
+                _clientID = value;
+            }
+        }
+
+        internal string ClientSecret
+        {
+            get => _clientSecret;
+
+            set
+            {
+                ArgumentValidator.ThrowIfNullOrWhiteSpace(value, "client secret must not be null or empty or only whitespace", checkSpaces: true);
+                _clientSecret = value;
+            }
+        }
+
+        internal Uri BaseAuthorizationUri { get; set; }
+
+        internal HttpClientProvider<TraktContext> HttpClientProvider { get; set; }
+
         internal HttpClient GetHttpClient() => HttpClientProvider.GetHttpClient(this);
     }
 }

src/libs/Trakt.NET/Internal/Requests/HttpClientProvider.cs

@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Net.Http.Headers;
 
 #if !NETSTANDARD2_0
@@ -7,11 +7,11 @@
 
 namespace TraktNET
 {
-    internal abstract class HttpClientProvider
+    internal abstract class HttpClientProvider<TContext> where TContext : ITraktContext
     {
-        internal abstract HttpClient GetHttpClient(TraktContext context);
+        internal abstract HttpClient GetHttpClient(TContext context);
 
-        protected static HttpClient CreateHttpClient(TraktContext context)
+        protected static HttpClient CreateHttpClient(TContext context)
         {
             var httpClient = new HttpClient { BaseAddress = context.BaseUri };
 
@@ -25,7 +25,7 @@ protected static HttpClient CreateHttpClient(TraktContext context)
         }
     }
 
-    internal sealed class DefaultHttpClientProvider : HttpClientProvider
+    internal sealed class DefaultHttpClientProvider : HttpClientProvider<TraktContext>
     {
         private static readonly ConcurrentDictionary<string, HttpClient> s_httpClientCache = new();
 

src/libs/Trakt.NET/Internal/Requests/RequestHandler.cs

@@ -1,4 +1,4 @@
-using System.Net.Http.Headers;
+using System.Net.Http.Headers;
 
 namespace TraktNET
 {
@@ -97,8 +97,6 @@ private static async Task<RequestResponse> ExecuteRequestAsync(bool withContent,
 
         private static void AddRequestMessageHeaders(TraktContext context, RequestBase request)
         {
-            const string AuthenticationScheme = "Bearer";
-
             request.Headers.Add(Constants.Request.Headers.APIVersionHeaderKey, $"{Constants.API.Version}");
             request.Headers.Add(Constants.Request.Headers.APIClientIDHeaderKey, context.ClientID);
 
@@ -117,7 +115,7 @@ private static void AddRequestMessageHeaders(TraktContext context, RequestBase r
 
             if (context.Authorization != null)
             {
-                request.Headers.Authorization = new AuthenticationHeaderValue(AuthenticationScheme, context.Authorization!.AccessToken ?? string.Empty);
+                request.Headers.Authorization = new AuthenticationHeaderValue(Constants.Request.AuthenticationScheme, context.Authorization!.AccessToken ?? string.Empty);
             }
         }
 

src/libs/Trakt.NET/Internal/TraktClient.cs

@@ -4,7 +4,7 @@ public sealed partial class TraktClient
     {
         private readonly TraktContext _context;
 
-        internal HttpClientProvider HttpClientProvider
+        internal HttpClientProvider<TraktContext> HttpClientProvider
         {
             get => _context.HttpClientProvider;
             set => _context.HttpClientProvider = value;

src/tests/libs/Trakt.NET.Tests.Utility/TestHttpClientProvider.cs

@@ -1,4 +1,4 @@
-using RichardSzalay.MockHttp;
+using RichardSzalay.MockHttp;
 using System.Net;
 
 #if TRAKT_NET_4XX_FRAMEWORK_TARGET
@@ -10,7 +10,7 @@
 
 namespace TraktNET
 {
-    internal sealed class TestHttpClientProvider : HttpClientProvider, IDisposable
+    internal sealed class TestHttpClientProvider : HttpClientProvider<TraktContext>, IDisposable
     {
         private const string AcceptMediaType = "application/json";
         private const string TraktApiHeaderKey = "trakt-api-key";