RE #20269 - API Keystone HubSpot to EMG order system (#44)

* RE #20269 - API Keystone HubSpot to EMG order system Remove usage of ITokenSelector and include InnerHandler for OAuthenticator * RE #20269 - API Keystone HubSpot to EMG order system Fix unit tests * RE #20269 - API Keystone HubSpot to EMG order system Cleanup OAuthSettings model
keghub · Sep 13, 2022 · 5d421f5 · 5d421f5
1 parent db212ce
commit 5d421f5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/src/HubSpot.Client/Authentication/OAuthHubSpotAuthenticator.cs b/src/HubSpot.Client/Authentication/OAuthHubSpotAuthenticator.cs
@@ -15,22 +15,20 @@ public class OAuthHubSpotAuthenticator : DelegatingHandler
     {
         private readonly OAuthOptions _options;
 
-        public OAuthHubSpotAuthenticator(IOptions<OAuthOptions> options, ITokenSelector tokenSelector)
+        public OAuthHubSpotAuthenticator(IOptions<OAuthOptions> options, HttpMessageHandler handler) : base(handler)
         {
             _options = options?.Value ?? throw new ArgumentNullException(nameof(options));
-            _tokenSelector = tokenSelector ?? throw new ArgumentNullException(nameof(options));
         }
 
         private readonly ConcurrentDictionary<string, AuthToken> _tokens = new ConcurrentDictionary<string, AuthToken>();
-        private readonly ITokenSelector _tokenSelector;
 
         protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
             var requestUri = request.RequestUri;
 
             var key = ExtractKey(requestUri);
 
-            if (!_tokens.TryGetValue(key, out var token) || !IsTokenValid(token) || _tokenSelector.IsTokenChanged())
+            if (!_tokens.TryGetValue(key, out var token) || !IsTokenValid(token))
             {
                 token = await GetToken(requestUri, cancellationToken);
 
@@ -64,7 +62,7 @@ private async Task<AuthToken> GetToken(Uri requestUri, CancellationToken cancell
                 ["client_id"] = _options.ClientId,
                 ["client_secret"] = _options.SecretKey,
                 ["redirect_uri"] = _options.RedirectUri.ToString(),
-                ["refresh_token"] = _tokenSelector.SelectToken(_options.RefreshTokens)
+                ["refresh_token"] = _options.RefreshToken
             };
 
             request.Content = new FormUrlEncodedContent(form);
@@ -116,7 +114,7 @@ public class OAuthOptions
 
         public Uri RedirectUri { get; set; } = new Uri("https://www.hubspot.com");
 
-        public Dictionary<string, string> RefreshTokens { get; set; }
+        public string RefreshToken { get; set; }
 
         public string SecretKey { get; set; }
 

diff --git a/tests/Tests.HubSpot.Client/Authentication/OAuthHubSpotAuthenticatorTests.cs b/tests/Tests.HubSpot.Client/Authentication/OAuthHubSpotAuthenticatorTests.cs
@@ -23,9 +23,7 @@ private HttpClient CreateClient(OAuthOptions options, params HttpMessageOptions[
 
             var wrapper = new OptionsWrapper<OAuthOptions>(options);
 
-            var testTokenSelector = new TestTokenSelector();
-
-            var authenticator = new OAuthHubSpotAuthenticator(wrapper, testTokenSelector) { InnerHandler = handler };
+            var authenticator = new OAuthHubSpotAuthenticator(wrapper, handler);
 
             var client = new HttpClient(authenticator, false);
 
@@ -53,7 +51,7 @@ public async Task Single_request_is_authenticated_and_executed(string methodName
                     ["client_id"] = options.ClientId,
                     ["client_secret"] = options.SecretKey,
                     ["redirect_uri"] = options.RedirectUri.ToString(),
-                    ["refresh_token"] = tokenSelector.SelectToken(options.RefreshTokens)
+                    ["refresh_token"] = options.RefreshToken
                 }),
                 HttpResponseMessage = new HttpResponseMessage(HttpStatusCode.OK)
                 {
@@ -106,7 +104,7 @@ public async Task Multiple_requests_reuse_the_same_token(string methodName, OAut
                     ["client_id"] = options.ClientId,
                     ["client_secret"] = options.SecretKey,
                     ["redirect_uri"] = options.RedirectUri.ToString(),
-                    ["refresh_token"] = tokenSelector.SelectToken(options.RefreshTokens)
+                    ["refresh_token"] = options.RefreshToken
                 }),
                 HttpResponseMessage = new HttpResponseMessage(HttpStatusCode.OK)
                 {
@@ -164,7 +162,7 @@ public async Task Token_is_refreshed_if_expired(string methodName, OAuthOptions
                     ["client_id"] = options.ClientId,
                     ["client_secret"] = options.SecretKey,
                     ["redirect_uri"] = options.RedirectUri.ToString(),
-                    ["refresh_token"] = tokenSelector.SelectToken(options.RefreshTokens)
+                    ["refresh_token"] = options.RefreshToken
                 }),
                 HttpResponseMessage = CreateNewResponse()
             };
@@ -235,7 +233,7 @@ public async Task Token_is_not_attached_if_request_fails(string methodName, OAut
                     ["client_id"] = options.ClientId,
                     ["client_secret"] = options.SecretKey,
                     ["redirect_uri"] = options.RedirectUri.ToString(),
-                    ["refresh_token"] = tokenSelector.SelectToken(options.RefreshTokens)
+                    ["refresh_token"] = options.RefreshToken
                 }),
                 HttpResponseMessage = new HttpResponseMessage(HttpStatusCode.Unauthorized)
             };

diff --git a/tests/Tests.HubSpot.Client/Configuration/HubSpotClientConfiguratorExtensionsTests.cs b/tests/Tests.HubSpot.Client/Configuration/HubSpotClientConfiguratorExtensionsTests.cs
@@ -4,6 +4,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using NUnit.Framework;
+using System.Net.Http;
 using Tests.Model;
 
 namespace Tests.Configuration
@@ -35,7 +36,7 @@ public void UseApiKeyAuthentication_registers_needed_services(HubSpotClientConfi
         }
 
         [Test, CustomAutoData]
-        public void UseOAuthAuthentication_registers_needed_services(HubSpotClientConfigurator configurator, OAuthOptions apiKeyOptions, TestTokenSelector tokenSelector, ServiceCollection services)
+        public void UseOAuthAuthentication_registers_needed_services(HubSpotClientConfigurator configurator, OAuthOptions apiKeyOptions, HttpMessageHandler httpMessageHandler, ServiceCollection services)
         {
             var configurationBuilder = new ConfigurationBuilder();
 
@@ -47,7 +48,7 @@ public void UseOAuthAuthentication_registers_needed_services(HubSpotClientConfig
 
             configurator.ApplyServiceConfigurations(services);
 
-            services.AddSingleton<ITokenSelector, TestTokenSelector>();
+            services.AddSingleton(httpMessageHandler);
 
             var serviceProvider = services.BuildServiceProvider();