require options at client classes

DuendeArchive · Aug 30, 2019 · 305ec2a · 305ec2a
1 parent d6bb721
commit 305ec2a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/src/Client/IntrospectionClient.cs b/src/Client/IntrospectionClient.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+
+using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
@@ -31,7 +34,7 @@ public IntrospectionClient(HttpMessageInvoker client, IntrospectionClientOptions
         public IntrospectionClient(Func<HttpMessageInvoker> client, IntrospectionClientOptions options)
         {
             _client = client ?? throw new ArgumentNullException(nameof(client));
-            _options = options ?? new IntrospectionClientOptions();
+            _options = options ?? throw new ArgumentNullException(nameof(options));
         }
 
         /// <summary>

diff --git a/src/Client/TokenClient.cs b/src/Client/TokenClient.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+
+using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
@@ -33,7 +36,7 @@ public TokenClient(HttpMessageInvoker client, TokenClientOptions options)
         public TokenClient(Func<HttpMessageInvoker> client, TokenClientOptions options)
         {
             _client = client ?? throw new ArgumentNullException(nameof(client));
-            _options = options ?? new TokenClientOptions();
+            _options = options ?? throw new ArgumentNullException(nameof(options));
         }
 
         /// <summary>

diff --git a/test/UnitTests/TokenClientRequestTests.cs b/test/UnitTests/TokenClientRequestTests.cs
@@ -134,7 +134,7 @@ public async Task Password_request_without_password_should_have_correct_format()
         [Fact]
         public void Password_request_without_username_should_fail()
         {
-            var tokenClient = new TokenClient(_client, null);
+            var tokenClient = new TokenClient(_client, new TokenClientOptions());
 
             Func<Task> act = async () => await tokenClient.RequestPasswordTokenAsync(userName: null);
 
@@ -167,7 +167,7 @@ public async Task Code_request_should_have_correct_format()
         [Fact]
         public void Code_request_without_code_should_fail()
         {
-            var tokenClient = new TokenClient(_client, null);
+            var tokenClient = new TokenClient(_client, new TokenClientOptions());
 
             Func<Task> act = async () => await tokenClient.RequestAuthorizationCodeTokenAsync(code: null, redirectUri: "uri", codeVerifier: "verifier");
 
@@ -177,7 +177,7 @@ public void Code_request_without_code_should_fail()
         [Fact]
         public void Code_request_without_redirect_uri_should_fail()
         {
-            var tokenClient = new TokenClient(_client, null);
+            var tokenClient = new TokenClient(_client, new TokenClientOptions());
 
             Func<Task> act = async () => await tokenClient.RequestAuthorizationCodeTokenAsync(code: "code", redirectUri: null, codeVerifier: "verifier");
 
@@ -207,7 +207,7 @@ public async Task Refresh_request_should_have_correct_format()
         [Fact]
         public void Refresh_request_without_refresh_token_should_fail()
         {
-            var tokenClient = new TokenClient(_client, null);
+            var tokenClient = new TokenClient(_client, new TokenClientOptions());
 
             Func<Task> act = async () => await tokenClient.RequestRefreshTokenAsync(refreshToken: null, scope: "scope");
 
@@ -217,7 +217,7 @@ public void Refresh_request_without_refresh_token_should_fail()
         [Fact]
         public void Setting_no_grant_type_should_fail()
         {
-            var tokenClient = new TokenClient(_client, null);
+            var tokenClient = new TokenClient(_client, new TokenClientOptions());
 
             Func<Task> act = async () => await tokenClient.RequestTokenAsync(grantType: null);
 
@@ -227,7 +227,7 @@ public void Setting_no_grant_type_should_fail()
         [Fact]
         public async Task Setting_custom_parameters_should_have_correct_format()
         {
-            var tokenClient = new TokenClient(_client, null);
+            var tokenClient = new TokenClient(_client, new TokenClientOptions());
 
             var parameters = new Dictionary<string, string>
             {