Add tests for org config

Author: Hawxy

src/Auth0Net.DependencyInjection/HttpClient/Auth0TokenHandler.cs

@@ -33,7 +33,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
     {
         var audience = _handlerConfig.Audience ?? _handlerConfig.AudienceResolver?.Invoke(request) ?? throw new ArgumentException("Audience cannot be computed");
 
-        var org = _accessor.Organization ?? _handlerConfig.Organization ?? _handlerConfig.AudienceResolver?.Invoke(request);
+        var org = _accessor.Organization ?? _handlerConfig.Organization ?? _handlerConfig.OrganizationResolver?.Invoke(request);
         var token = await _cache.GetTokenAsync(audience, org, cancellationToken);
 
         request.Headers.Authorization = new AuthenticationHeaderValue(Scheme, token);

tests/Auth0Net.DependencyInjection.Tests/OrganizationAccessorTests.cs

@@ -63,6 +63,136 @@ public async Task TokenHandler_AccessorOrganizationTakesPrecedenceOverConfig()
             .MustHaveHappenedOnceExactly();
     }
 
+    [Fact]
+    public async Task TokenHandler_UsesOrganizationResolver_WhenAccessorAndConfigAreEmpty()
+    {
+        var cache = A.Fake<IAuth0TokenCache>();
+        A.CallTo(() => cache.GetTokenAsync(A<string>._, A<string?>._, A<CancellationToken>._))
+            .Returns("access-token");
+
+        var accessor = new HttpClientOrganizationAccessor();
+        var config = new Auth0TokenHandlerConfig
+        {
+            Audience = "api://test",
+            OrganizationResolver = _ => "org-from-resolver"
+        };
+
+        using var invoker = BuildInvoker(cache, config, accessor);
+        await invoker.SendAsync(new HttpRequestMessage(HttpMethod.Get, "https://example.com"), CancellationToken.None);
+
+        A.CallTo(() => cache.GetTokenAsync("api://test", "org-from-resolver", A<CancellationToken>._))
+            .MustHaveHappenedOnceExactly();
+    }
+
+    [Fact]
+    public async Task TokenHandler_ConfigOrganizationTakesPrecedenceOverResolver()
+    {
+        var cache = A.Fake<IAuth0TokenCache>();
+        A.CallTo(() => cache.GetTokenAsync(A<string>._, A<string?>._, A<CancellationToken>._))
+            .Returns("access-token");
+
+        var accessor = new HttpClientOrganizationAccessor();
+        var config = new Auth0TokenHandlerConfig
+        {
+            Audience = "api://test",
+            Organization = "org-from-config",
+            OrganizationResolver = _ => "org-from-resolver"
+        };
+
+        using var invoker = BuildInvoker(cache, config, accessor);
+        await invoker.SendAsync(new HttpRequestMessage(HttpMethod.Get, "https://example.com"), CancellationToken.None);
+
+        A.CallTo(() => cache.GetTokenAsync("api://test", "org-from-config", A<CancellationToken>._))
+            .MustHaveHappenedOnceExactly();
+    }
+
+    [Fact]
+    public async Task TokenHandler_AccessorTakesPrecedenceOverResolver()
+    {
+        var cache = A.Fake<IAuth0TokenCache>();
+        A.CallTo(() => cache.GetTokenAsync(A<string>._, A<string?>._, A<CancellationToken>._))
+            .Returns("access-token");
+
+        var accessor = new HttpClientOrganizationAccessor { Organization = "org-from-accessor" };
+        var config = new Auth0TokenHandlerConfig
+        {
+            Audience = "api://test",
+            OrganizationResolver = _ => "org-from-resolver"
+        };
+
+        using var invoker = BuildInvoker(cache, config, accessor);
+        await invoker.SendAsync(new HttpRequestMessage(HttpMethod.Get, "https://example.com"), CancellationToken.None);
+
+        A.CallTo(() => cache.GetTokenAsync("api://test", "org-from-accessor", A<CancellationToken>._))
+            .MustHaveHappenedOnceExactly();
+    }
+
+    [Fact]
+    public async Task TokenHandler_OrganizationResolver_ReceivesHttpRequestMessage()
+    {
+        var cache = A.Fake<IAuth0TokenCache>();
+        A.CallTo(() => cache.GetTokenAsync(A<string>._, A<string?>._, A<CancellationToken>._))
+            .Returns("access-token");
+
+        HttpRequestMessage? capturedRequest = null;
+
+        var accessor = new HttpClientOrganizationAccessor();
+        var config = new Auth0TokenHandlerConfig
+        {
+            Audience = "api://test",
+            OrganizationResolver = req =>
+            {
+                capturedRequest = req;
+                return "org-resolved";
+            }
+        };
+
+        using var invoker = BuildInvoker(cache, config, accessor);
+        var request = new HttpRequestMessage(HttpMethod.Get, "https://example.com/api/resource");
+        await invoker.SendAsync(request, CancellationToken.None);
+
+        Assert.NotNull(capturedRequest);
+        Assert.Equal("https://example.com/api/resource", capturedRequest.RequestUri!.ToString());
+    }
+
+    [Fact]
+    public async Task TokenHandler_OrganizationResolver_ReturnsNull_PassesNullToCache()
+    {
+        var cache = A.Fake<IAuth0TokenCache>();
+        A.CallTo(() => cache.GetTokenAsync(A<string>._, A<string?>._, A<CancellationToken>._))
+            .Returns("access-token");
+
+        var accessor = new HttpClientOrganizationAccessor();
+        var config = new Auth0TokenHandlerConfig
+        {
+            Audience = "api://test",
+            OrganizationResolver = _ => null
+        };
+
+        using var invoker = BuildInvoker(cache, config, accessor);
+        await invoker.SendAsync(new HttpRequestMessage(HttpMethod.Get, "https://example.com"), CancellationToken.None);
+
+        A.CallTo(() => cache.GetTokenAsync("api://test", null, A<CancellationToken>._))
+            .MustHaveHappenedOnceExactly();
+    }
+
+    [Fact]
+    public async Task TokenHandler_NoOrganizationConfigured_PassesNullToCache()
+    {
+        var cache = A.Fake<IAuth0TokenCache>();
+        A.CallTo(() => cache.GetTokenAsync(A<string>._, A<string?>._, A<CancellationToken>._))
+            .Returns("access-token");
+
+        var accessor = new HttpClientOrganizationAccessor();
+        var config = new Auth0TokenHandlerConfig { Audience = "api://test" };
+
+        using var invoker = BuildInvoker(cache, config, accessor);
+        await invoker.SendAsync(new HttpRequestMessage(HttpMethod.Get, "https://example.com"), CancellationToken.None);
+
+        A.CallTo(() => cache.GetTokenAsync("api://test", null, A<CancellationToken>._))
+            .MustHaveHappenedOnceExactly();
+    }
+
     private static HttpMessageInvoker BuildInvoker(
         IAuth0TokenCache cache,
         Auth0TokenHandlerConfig config,