Merge pull request #592 from 0xced/BetterArgumentExceptionMessage

Improve ArgumentException error messages

Author: josephdecock

src/Client/Extensions/HttpClientDiscoveryExtensions.cs

@@ -23,6 +23,8 @@ public static class HttpClientDiscoveryExtensions
     /// <returns></returns>
     public static async Task<DiscoveryDocumentResponse> GetDiscoveryDocumentAsync(this HttpClient client, string? address = null, CancellationToken cancellationToken = default)
     {
+        if (address == null && client.BaseAddress == null)
+            throw new ArgumentException("Either the address parameter or the HttpClient BaseAddress must not be null.");
         return await client.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest { Address = address }, cancellationToken).ConfigureAwait();
     }
 
@@ -40,13 +42,13 @@ public static async Task<DiscoveryDocumentResponse> GetDiscoveryDocumentAsync(th
         {
             address = request.Address!;
         }
-        else if (client is HttpClient httpClient)
+        else if (client is HttpClient httpClient && httpClient.BaseAddress != null)
         {
             address = httpClient.BaseAddress!.GetLeftPart(UriPartial.Authority);
         }
         else
         {
-            throw new ArgumentException("An address is required.");
+            throw new ArgumentException("Either the DiscoveryDocumentRequest Address or the HttpClient BaseAddress must not be null.");
         }
 
         var parsed = DiscoveryEndpoint.ParseUrl(address, request.Policy.DiscoveryDocumentPath);

test/UnitTests/HttpClientExtensions/DiscoveryExtensionsTests.cs

@@ -90,6 +90,26 @@ public async Task Base_address_should_work(string baseAddress)
             disco.IsError.Should().BeFalse();
         }
 
+        [Fact]
+        public async Task Null_client_base_address_should_throw()
+        {
+            var client = new HttpClient(_successHandler) { BaseAddress = null };
+
+            Func<Task> act = () => client.GetDiscoveryDocumentAsync();
+
+            await act.Should().ThrowAsync<ArgumentException>().WithMessage("Either the address parameter or the HttpClient BaseAddress must not be null.");
+        }
+
+        [Fact]
+        public async Task Null_discovery_document_address_should_throw()
+        {
+            var client = new HttpClient(_successHandler) { BaseAddress = null };
+
+            Func<Task> act = () => client.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest());
+
+            await act.Should().ThrowAsync<ArgumentException>().WithMessage("Either the DiscoveryDocumentRequest Address or the HttpClient BaseAddress must not be null.");
+        }
+
         [Fact]
         public async Task Explicit_address_should_work()
         {