Fixed failing unit test.

Author: AndyButland

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

@@ -5,12 +5,6 @@ namespace Umbraco.AuthorizedServices.Services.Implement;
 
 internal class DatabaseAuthorizationParameterStorageBase
 {
-    protected IScopeProvider ScopeProvider { get; }
-
-    protected ISecretEncryptor Encryptor { get; }
-
-    protected ILogger<DatabaseAuthorizationParameterStorageBase> Logger { get; }
-
     public DatabaseAuthorizationParameterStorageBase(
         IScopeProvider scopeProvider,
         ISecretEncryptor encryptor,
@@ -20,4 +14,10 @@ public DatabaseAuthorizationParameterStorageBase(
         Encryptor = encryptor;
         Logger = logger;
     }
+
+    protected IScopeProvider ScopeProvider { get; }
+
+    protected ISecretEncryptor Encryptor { get; }
+
+    protected ILogger<DatabaseAuthorizationParameterStorageBase> Logger { get; }
 }

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

@@ -22,7 +22,7 @@ public void SetUp()
     }
 
     [Test]
-    public async Task SendRequestAsync_WithoutData_WithValidAccessToken_WithSuccessReponse_ReturnsExpectedResponse()
+    public async Task SendRequestAsync_WithoutData_WithValidAccessToken_WithSuccessResponse_ReturnsExpectedResponse()
     {
         // Arrange
         StoreToken();
@@ -42,7 +42,7 @@ public async Task SendRequestAsync_WithoutData_WithValidAccessToken_WithSuccessR
     }
 
     [Test]
-    public async Task SendRequestAsync_WithoutData_WithApiKeyFromStorage_WithSuccessReponse_ReturnsExpectedResponse()
+    public async Task SendRequestAsync_WithoutData_WithApiKeyFromStorage_WithSuccessResponse_ReturnsExpectedResponse()
     {
         // Arrange
         StoreApiKey();
@@ -59,7 +59,7 @@ public async Task SendRequestAsync_WithoutData_WithApiKeyFromStorage_WithSuccess
     }
 
     [Test]
-    public async Task SendRequestAsync_WithoutData_WithValidAccessToken_WithFaileReponse_ThrowsExpectedException()
+    public async Task SendRequestAsync_WithoutData_WithValidAccessToken_WithFailedResponse_ThrowsExpectedException()
     {
         // Arrange
         StoreToken();
@@ -75,7 +75,7 @@ public async Task SendRequestAsync_WithoutData_WithValidAccessToken_WithFaileRep
     }
 
     [Test]
-    public async Task SendRequestRawAsync_WithoutData_WithValidAccessToken_WithSuccessReponse_ReturnsExpectedResponse()
+    public async Task SendRequestRawAsync_WithoutData_WithValidAccessToken_WithSuccessResponse_ReturnsExpectedResponse()
     {
         // Arrange
         StoreToken();
@@ -169,7 +169,7 @@ public async Task SendRequestAsync_WithExpiredAccessToken_WithRefreshTokenSucces
     public void GetApiKey_WithExistingApiKey_ReturnsApiKey()
     {
         // Arrange
-        AuthorizedServiceCaller sut = CreateService(authenticationMethod: AuthenticationMethod.ApiKey);
+        AuthorizedServiceCaller sut = CreateService(authenticationMethod: AuthenticationMethod.ApiKey, withConfiguredApiKey: true);
 
         // Act
         var result = sut.GetApiKey(ServiceAlias);
@@ -184,7 +184,7 @@ public void GetApiKey_WithStoredApiKey_ReturnsStoredApiKey()
     {
         // Arrange
         StoreApiKey();
-        AuthorizedServiceCaller sut = CreateService(authenticationMethod: AuthenticationMethod.ApiKey);
+        AuthorizedServiceCaller sut = CreateService(authenticationMethod: AuthenticationMethod.ApiKey, withConfiguredApiKey: false);
 
         // Act
         var result = sut.GetApiKey(ServiceAlias);
@@ -250,7 +250,8 @@ private AuthorizedServiceCaller CreateService(
         HttpStatusCode statusCode = HttpStatusCode.OK,
         string? responseContent = null,
         HttpStatusCode refreshTokenStatusCode = HttpStatusCode.OK,
-        AuthenticationMethod authenticationMethod = AuthenticationMethod.OAuth2AuthorizationCode)
+        AuthenticationMethod authenticationMethod = AuthenticationMethod.OAuth2AuthorizationCode,
+        bool withConfiguredApiKey = false)
     {
         var authorizationRequestSenderMock = new Mock<IAuthorizationRequestSender>();
 
@@ -264,7 +265,7 @@ private AuthorizedServiceCaller CreateService(
             .Setup(x => x.SendRequest(It.Is<ServiceDetail>(y => y.Alias == ServiceAlias), It.Is<Dictionary<string, string>>(y => y["grant_type"] == "refresh_token")))
             .ReturnsAsync(httpResponseMessage);
 
-        Mock<IOptionsMonitor<ServiceDetail>> optionsMonitorServiceDetailMock = CreateOptionsMonitorServiceDetail(authenticationMethod);
+        Mock<IOptionsMonitor<ServiceDetail>> optionsMonitorServiceDetailMock = CreateOptionsMonitorServiceDetail(authenticationMethod, withConfiguredApiKey);
         var factory = new JsonSerializerFactory(optionsMonitorServiceDetailMock.Object, new JsonNetSerializer());
 
         return new AuthorizedServiceCaller(

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

@@ -13,7 +13,8 @@ internal abstract class AuthorizedServiceTestsBase
     protected Mock<IKeyStorage> KeyStorageMock { get; set; } = null!;
 
     protected static Mock<IOptionsMonitor<ServiceDetail>> CreateOptionsMonitorServiceDetail(
-        AuthenticationMethod authenticationMethod = AuthenticationMethod.OAuth2AuthorizationCode)
+        AuthenticationMethod authenticationMethod = AuthenticationMethod.OAuth2AuthorizationCode,
+        bool withConfiguredApiKey = false)
     {
         var optionsMonitorServiceDetailMock = new Mock<IOptionsMonitor<ServiceDetail>>();
         optionsMonitorServiceDetailMock.Setup(o => o.Get(ServiceAlias)).Returns(new ServiceDetail()
@@ -22,7 +23,7 @@ protected static Mock<IOptionsMonitor<ServiceDetail>> CreateOptionsMonitorServic
             ApiHost = "https://service.url",
             AuthenticationMethod = authenticationMethod,
             JsonSerializer = JsonSerializerOption.JsonNet,
-            ApiKey = authenticationMethod == AuthenticationMethod.ApiKey ? "test-api-key" : string.Empty,
+            ApiKey = authenticationMethod == AuthenticationMethod.ApiKey && withConfiguredApiKey ? "test-api-key" : string.Empty,
             ApiKeyProvision = authenticationMethod == AuthenticationMethod.ApiKey
                 ? new ApiKeyProvision { Method = ApiKeyProvisionMethod.QueryString, Key = "key"} : null
         });