Added tests and removed duplication method.

Author: AndyButland

src/Umbraco.AuthorizedServices/Services/IRefreshTokenParametersBuilder.cs

@@ -14,12 +14,4 @@ public interface IRefreshTokenParametersBuilder
     /// <param name="refreshToken">The refresh token.</param>
     /// <returns>A dictionary containing the refresh token parameters.</returns>
     Dictionary<string, string> BuildParameters(ServiceDetail serviceDetail, string refreshToken);
-
-    /// <summary>
-    /// Builds the parameter dictionary used in long lived token refresh requests.
-    /// </summary>
-    /// <param name="serviceDetail">The service detail.</param>
-    /// <param name="accessToken">The acccess token.</param>
-    /// <returns>A dictionary containing the refresh token parameters.</returns>
-    Dictionary<string, string> BuildParametesForOAuth2AccessTokenExchange(ServiceDetail serviceDetail, string accessToken);
 }

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

@@ -16,6 +16,7 @@ internal sealed class AuthorizedServiceCaller : AuthorizedServiceBase, IAuthoriz
     private readonly JsonSerializerFactory _jsonSerializerFactory;
     private readonly IAuthorizedRequestBuilder _authorizedRequestBuilder;
     private readonly IRefreshTokenParametersBuilder _refreshTokenParametersBuilder;
+    private readonly IExchangeTokenParametersBuilder _exchangeTokenParametersBuilder;
 
     public AuthorizedServiceCaller(
         AppCaches appCaches,
@@ -28,13 +29,15 @@ public AuthorizedServiceCaller(
         IHttpClientFactory httpClientFactory,
         JsonSerializerFactory jsonSerializerFactory,
         IAuthorizedRequestBuilder authorizedRequestBuilder,
-        IRefreshTokenParametersBuilder refreshTokenParametersBuilder)
+        IRefreshTokenParametersBuilder refreshTokenParametersBuilder,
+        IExchangeTokenParametersBuilder exchangeTokenParametersBuilder)
         : base(appCaches, tokenFactory, tokenStorage, keyStorage, authorizationRequestSender, logger, serviceDetailOptions)
     {
         _httpClientFactory = httpClientFactory;
         _jsonSerializerFactory = jsonSerializerFactory;
         _authorizedRequestBuilder = authorizedRequestBuilder;
         _refreshTokenParametersBuilder = refreshTokenParametersBuilder;
+        _exchangeTokenParametersBuilder = exchangeTokenParametersBuilder;
     }
 
     public async Task SendRequestAsync(string serviceAlias, string path, HttpMethod httpMethod)
@@ -174,7 +177,7 @@ private async Task<Token> EnsureExchangeAccessToken(string serviceAlias, Token t
         ServiceDetail serviceDetail = GetServiceDetail(serviceAlias);
 
         Dictionary<string, string> parameters = serviceDetail.CanExchangeToken
-            ? _refreshTokenParametersBuilder.BuildParametesForOAuth2AccessTokenExchange(serviceDetail, refreshToken)
+            ? _exchangeTokenParametersBuilder.BuildParameters(serviceDetail, refreshToken)
             : _refreshTokenParametersBuilder.BuildParameters(serviceDetail, refreshToken);
 
         HttpResponseMessage response = serviceDetail.CanExchangeToken

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

@@ -12,13 +12,4 @@ public Dictionary<string, string> BuildParameters(ServiceDetail serviceDetail, s
                 { "client_secret", serviceDetail.ClientSecret },
                 { "refresh_token", refreshToken }
             };
-
-    public Dictionary<string, string> BuildParametesForOAuth2AccessTokenExchange(ServiceDetail serviceDetail, string accessToken) =>
-        new Dictionary<string, string>
-        {
-            {
-                "grant_type", serviceDetail.ExchangeTokenProvision is not null ? serviceDetail.ExchangeTokenProvision.RefreshTokenGrantType : string.Empty
-            },
-            { "access_token", accessToken }
-        };
 }

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

@@ -279,7 +279,8 @@ private AuthorizedServiceCaller CreateService(
             new TestHttpClientFactory(statusCode, responseContent),
             factory,
             new AuthorizedRequestBuilder(factory),
-            new RefreshTokenParametersBuilder());
+            new RefreshTokenParametersBuilder(),
+            new ExchangeTokenParametersBuilder());
     }
 
     private class TestHttpClientFactory : IHttpClientFactory

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

@@ -0,0 +1,33 @@
+using Umbraco.AuthorizedServices.Configuration;
+using Umbraco.AuthorizedServices.Services.Implement;
+
+namespace Umbraco.AuthorizedServices.Tests.Services;
+
+internal class ExchangeTokenParametersBuilderTests
+{
+    [Test]
+    public void BuildParameters_ReturnsExpectedResult()
+    {
+        // Arrange
+        var serviceDetail = new ServiceDetail
+        {
+            ClientSecret = "TestClientSecret",
+            CanExchangeToken = true,
+            ExchangeTokenProvision = new()
+            {
+                TokenGrantType = "ig_exchange_token"
+            }
+        };
+        const string AccessToken = "abcd";
+        var sut = new ExchangeTokenParametersBuilder();
+
+        // Act
+        Dictionary<string, string> result = sut.BuildParameters(serviceDetail, AccessToken);
+
+        // Assert
+        result.Count.Should().Be(3);
+        result["grant_type"].Should().Be("ig_exchange_token");
+        result["client_secret"].Should().Be("TestClientSecret");
+        result["access_token"].Should().Be(AccessToken);
+    }
+}