Yet another round of minor refactorings

coderpatros · coderpatros · commit 70dbfa0108a6 · 2019-11-12T12:55:36.000+10:00
diff --git a/Patros.AuthenticatedHttpClient.AuthorizationHeader.Tests/AuthorizationHeaderAuthenticatedHttpClientTests.cs b/Patros.AuthenticatedHttpClient.AuthorizationHeader.Tests/AuthorizationHeaderAuthenticatedHttpClientTests.cs
@@ -25,7 +25,7 @@ public async Task TestRequestAddsAuthenticationHeader()
                 Value = "test-value"
             }, mockHttp);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com");
+            await client.GetStringAsync("https://www.example.com");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
diff --git a/Patros.AuthenticatedHttpClient.AuthorizationHeader/AuthorizationHeaderAuthenticatedHttpMessageHandler.cs b/Patros.AuthenticatedHttpClient.AuthorizationHeader/AuthorizationHeaderAuthenticatedHttpMessageHandler.cs
@@ -9,13 +9,18 @@ public class AuthorizationHeaderAuthenticatedHttpMessageHandler : DelegatingHand
     {
         private readonly AuthenticationHeaderValue _authorizationHeader;
 
-        public AuthorizationHeaderAuthenticatedHttpMessageHandler(AuthorizationHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+        public AuthorizationHeaderAuthenticatedHttpMessageHandler(AuthorizationHeaderAuthenticatedHttpClientOptions options)
         {
-            InnerHandler = innerHandler ?? new HttpClientHandler();
-            
             _authorizationHeader = new AuthenticationHeaderValue(options.Value);
         }
 
+        public AuthorizationHeaderAuthenticatedHttpMessageHandler(
+            AuthorizationHeaderAuthenticatedHttpClientOptions options, 
+            HttpMessageHandler innerHandler) : this(options)
+        {
+            InnerHandler = innerHandler;
+        }
+
         protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
             request.Headers.Authorization = _authorizationHeader;
diff --git a/Patros.AuthenticatedHttpClient.AzureAd.Tests/AzureAdAuthenticatedHttpClientTests.cs b/Patros.AuthenticatedHttpClient.AzureAd.Tests/AzureAdAuthenticatedHttpClientTests.cs
@@ -65,7 +65,7 @@ public async Task TestRequestRetriesThreeTimesToAcquireAccessToken()
             mockMsgHandler.CallBase = true;
             var client = new HttpClient(mockMsgHandler.Object);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com");
+            await client.GetStringAsync("https://www.example.com");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }    
diff --git a/Patros.AuthenticatedHttpClient.AzureAd/AzureAdAuthenticatedHttpMessageHandler.cs b/Patros.AuthenticatedHttpClient.AzureAd/AzureAdAuthenticatedHttpMessageHandler.cs
@@ -12,14 +12,12 @@ namespace Patros.AuthenticatedHttpClient
     // https://github.com/Azure-Samples/active-directory-dotnet-daemon/blob/master/TodoListDaemon/Program.cs
     public class AzureAdAuthenticatedHttpMessageHandler : DelegatingHandler
     {
-        private string _resourceId;
-        private AuthenticationContext _authContext;
+        private readonly string _resourceId;
+        private readonly AuthenticationContext _authContext;
         private readonly ClientCredential _clientCredential;
 
-        public AzureAdAuthenticatedHttpMessageHandler(AzureAdAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+        public AzureAdAuthenticatedHttpMessageHandler(AzureAdAuthenticatedHttpClientOptions options)
         {
-            InnerHandler = innerHandler ?? new HttpClientHandler();
-            
             _resourceId = options.ResourceId;
 
             var authority = String.Format(CultureInfo.InvariantCulture, options.AadInstance, options.Tenant);
@@ -28,6 +26,13 @@ public AzureAdAuthenticatedHttpMessageHandler(AzureAdAuthenticatedHttpClientOpti
             _clientCredential = new ClientCredential(options.ClientId, options.AppKey);
         }
 
+        public AzureAdAuthenticatedHttpMessageHandler(
+            AzureAdAuthenticatedHttpClientOptions options, 
+            HttpMessageHandler innerHandler) : this(options)
+        {
+            InnerHandler = innerHandler;
+        }
+
         internal virtual async Task<string> AcquireAccessTokenAsync()
         {
             var result = await _authContext.AcquireTokenAsync(_resourceId, _clientCredential);
diff --git a/Patros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity/AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler.cs b/Patros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity/AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler.cs
@@ -9,16 +9,22 @@ namespace Patros.AuthenticatedHttpClient
 {
     public class AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler : DelegatingHandler
     {
-        private string _resourceId;
-        private AzureServiceTokenProvider _azureServiceTokenProvider = new AzureServiceTokenProvider();
+        private readonly string _resourceId;
+        private readonly AzureServiceTokenProvider _azureServiceTokenProvider = new AzureServiceTokenProvider();
 
-        public AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler(AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+        public AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler(
+            AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options)
         {
-            InnerHandler = innerHandler ?? new HttpClientHandler();
-
             _resourceId = options.ResourceId;
         }
 
+        public AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler(
+            AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options, 
+            HttpMessageHandler innerHandler) : this(options)
+        {
+            InnerHandler = innerHandler;
+        }
+
         [ExcludeFromCodeCoverage]
         internal virtual async Task<string> GetAccessTokenAsync()
         {
diff --git a/Patros.AuthenticatedHttpClient.Basic/BasicAuthenticatedHttpMessageHandler.cs b/Patros.AuthenticatedHttpClient.Basic/BasicAuthenticatedHttpMessageHandler.cs
@@ -9,15 +9,21 @@ public class BasicAuthenticatedHttpMessageHandler : DelegatingHandler
     {
         private readonly AuthenticationHeaderValue _authorizationHeader;
 
-        public BasicAuthenticatedHttpMessageHandler(BasicAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+        public BasicAuthenticatedHttpMessageHandler(
+            BasicAuthenticatedHttpClientOptions options)
         {
-            InnerHandler = innerHandler ?? new HttpClientHandler();
-            
             _authorizationHeader = new AuthenticationHeaderValue(
                 "Basic", 
                 BasicAuthenticatedHttpMessageHandler.GenerateAuthenticationParameter(options.UserId, options.Password));
         }
 
+        public BasicAuthenticatedHttpMessageHandler(
+            BasicAuthenticatedHttpClientOptions options,
+            HttpMessageHandler innerHandler) : this(options)
+        {
+            InnerHandler = innerHandler;
+        }
+
         internal static string GenerateAuthenticationParameter(string userId, string password)
         {
             // implemented as per RFC 7617 https://tools.ietf.org/html/rfc7617.html
diff --git a/Patros.AuthenticatedHttpClient.CustomHeader.Tests/CustomHeaderAuthenticatedHttpClientTests.cs b/Patros.AuthenticatedHttpClient.CustomHeader.Tests/CustomHeaderAuthenticatedHttpClientTests.cs
@@ -23,7 +23,7 @@ public async Task TestRequestAddsAuthenticationHeader()
                 Value = "test-value"
             }, mockHttp);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com");
+            await client.GetStringAsync("https://www.example.com");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
@@ -48,7 +48,7 @@ public async Task TestMultipleParameterRequestAddsAuthenticationParameters()
                 }
             }, mockHttp);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com");
+            await client.GetStringAsync("https://www.example.com");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
@@ -71,7 +71,7 @@ public async Task TestMultipleParameterWithSingleParameterRequestAddsAuthenticat
                 }
             }, mockHttp);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com");
+            await client.GetStringAsync("https://www.example.com");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
diff --git a/Patros.AuthenticatedHttpClient.CustomHeader/CustomHeaderAuthenticatedHttpMessageHandler.cs b/Patros.AuthenticatedHttpClient.CustomHeader/CustomHeaderAuthenticatedHttpMessageHandler.cs
@@ -8,19 +8,21 @@ public class CustomHeaderAuthenticatedHttpMessageHandler : DelegatingHandler
     {
         private readonly CustomHeaderAuthenticatedHttpClientOptions _options;
 
-        public CustomHeaderAuthenticatedHttpMessageHandler(CustomHeaderAuthenticatedHttpClientOptions options)
+        public CustomHeaderAuthenticatedHttpMessageHandler(
+            CustomHeaderAuthenticatedHttpClientOptions options)
         {
             _options = options;
         }
 
-        public CustomHeaderAuthenticatedHttpMessageHandler(CustomHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)
+        public CustomHeaderAuthenticatedHttpMessageHandler(
+            CustomHeaderAuthenticatedHttpClientOptions options,
+            HttpMessageHandler innerHandler) : this(options)
         {
             InnerHandler = innerHandler;
-            
-            _options = options;
         }
 
-        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        protected override async Task<HttpResponseMessage> SendAsync(
+            HttpRequestMessage request, CancellationToken cancellationToken)
         {
             request.Headers.Remove(_options.Name);
             request.Headers.Add(_options.Name, _options.Value);
diff --git a/Patros.AuthenticatedHttpClient.QueryStringParameter.Tests/QueryStringParameterAuthenticatedHttpClientTests.cs b/Patros.AuthenticatedHttpClient.QueryStringParameter.Tests/QueryStringParameterAuthenticatedHttpClientTests.cs
@@ -25,7 +25,7 @@ public async Task TestRequestAddsAuthenticationParameter()
                 Value = "test-value"
             }, mockHttp);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com");
+            await client.GetStringAsync("https://www.example.com");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
@@ -46,7 +46,7 @@ public async Task TestRequestAddsAuthenticationParameterWithEmptyQuery()
                 Value = "test-value"
             }, mockHttp);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com?");
+            await client.GetStringAsync("https://www.example.com?");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
@@ -137,7 +137,7 @@ public async Task TestMultipleParameterWithSingleParameterRequestAddsAuthenticat
                 }
             }, mockHttp);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com");
+            await client.GetStringAsync("https://www.example.com");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
diff --git a/Patros.AuthenticatedHttpClient.QueryStringParameter/QueryStringParameterAuthenticatedHttpMessageHandler.cs b/Patros.AuthenticatedHttpClient.QueryStringParameter/QueryStringParameterAuthenticatedHttpMessageHandler.cs
@@ -10,14 +10,17 @@ public class QueryStringParameterAuthenticatedHttpMessageHandler : DelegatingHan
     {
         private readonly QueryStringParameterAuthenticatedHttpClientOptions _options;
 
-        public QueryStringParameterAuthenticatedHttpMessageHandler(QueryStringParameterAuthenticatedHttpClientOptions options)
+        public QueryStringParameterAuthenticatedHttpMessageHandler(
+            QueryStringParameterAuthenticatedHttpClientOptions options)
         {
             _options = options;
         }
 
-        public QueryStringParameterAuthenticatedHttpMessageHandler(QueryStringParameterAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler) : this(options)
+        public QueryStringParameterAuthenticatedHttpMessageHandler(
+            QueryStringParameterAuthenticatedHttpClientOptions options,
+            HttpMessageHandler innerHandler) : this(options)
         {
-            InnerHandler = innerHandler;            
+            InnerHandler = innerHandler;
         }
 
         protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public async Task TestRequestAddsAuthenticationHeader()`
`25`	`25`	`Value = "test-value"`
`26`	`26`	`}, mockHttp);`
`27`	`27`
`28`		`- var responseContent = await client.GetStringAsync("https://www.example.com");`
	`28`	`+ await client.GetStringAsync("https://www.example.com");`
`29`	`29`
`30`	`30`	`mockHttp.VerifyNoOutstandingExpectation();`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,18 @@ public class AuthorizationHeaderAuthenticatedHttpMessageHandler : DelegatingHand`
`9`	`9`	`{`
`10`	`10`	`private readonly AuthenticationHeaderValue _authorizationHeader;`
`11`	`11`
`12`		`- public AuthorizationHeaderAuthenticatedHttpMessageHandler(AuthorizationHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)`
	`12`	`+ public AuthorizationHeaderAuthenticatedHttpMessageHandler(AuthorizationHeaderAuthenticatedHttpClientOptions options)`
`13`	`13`	`{`
`14`		`- InnerHandler = innerHandler ?? new HttpClientHandler();`
`15`		`-`
`16`	`14`	`_authorizationHeader = new AuthenticationHeaderValue(options.Value);`
`17`	`15`	`}`
`18`	`16`
	`17`	`+ public AuthorizationHeaderAuthenticatedHttpMessageHandler(`
	`18`	`+ AuthorizationHeaderAuthenticatedHttpClientOptions options,`
	`19`	`+ HttpMessageHandler innerHandler) : this(options)`
	`20`	`+ {`
	`21`	`+ InnerHandler = innerHandler;`
	`22`	`+ }`
	`23`	`+`
`19`	`24`	`protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)`
`20`	`25`	`{`
`21`	`26`	`request.Headers.Authorization = _authorizationHeader;`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public async Task TestRequestRetriesThreeTimesToAcquireAccessToken()`
`65`	`65`	`mockMsgHandler.CallBase = true;`
`66`	`66`	`var client = new HttpClient(mockMsgHandler.Object);`
`67`	`67`
`68`		`- var responseContent = await client.GetStringAsync("https://www.example.com");`
	`68`	`+ await client.GetStringAsync("https://www.example.com");`
`69`	`69`
`70`	`70`	`mockHttp.VerifyNoOutstandingExpectation();`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,16 +9,22 @@ namespace Patros.AuthenticatedHttpClient`
`9`	`9`	`{`
`10`	`10`	`public class AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler : DelegatingHandler`
`11`	`11`	`{`
`12`		`- private string _resourceId;`
`13`		`- private AzureServiceTokenProvider _azureServiceTokenProvider = new AzureServiceTokenProvider();`
	`12`	`+ private readonly string _resourceId;`
	`13`	`+ private readonly AzureServiceTokenProvider _azureServiceTokenProvider = new AzureServiceTokenProvider();`
`14`	`14`
`15`		`- public AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler(AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)`
	`15`	`+ public AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler(`
	`16`	`+ AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options)`
`16`	`17`	`{`
`17`		`- InnerHandler = innerHandler ?? new HttpClientHandler();`
`18`		`-`
`19`	`18`	`_resourceId = options.ResourceId;`
`20`	`19`	`}`
`21`	`20`
	`21`	`+ public AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler(`
	`22`	`+ AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options,`
	`23`	`+ HttpMessageHandler innerHandler) : this(options)`
	`24`	`+ {`
	`25`	`+ InnerHandler = innerHandler;`
	`26`	`+ }`
	`27`	`+`
`22`	`28`	`[ExcludeFromCodeCoverage]`
`23`	`29`	`internal virtual async Task<string> GetAccessTokenAsync()`
`24`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,21 @@ public class BasicAuthenticatedHttpMessageHandler : DelegatingHandler`
`9`	`9`	`{`
`10`	`10`	`private readonly AuthenticationHeaderValue _authorizationHeader;`
`11`	`11`
`12`		`- public BasicAuthenticatedHttpMessageHandler(BasicAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)`
	`12`	`+ public BasicAuthenticatedHttpMessageHandler(`
	`13`	`+ BasicAuthenticatedHttpClientOptions options)`
`13`	`14`	`{`
`14`		`- InnerHandler = innerHandler ?? new HttpClientHandler();`
`15`		`-`
`16`	`15`	`_authorizationHeader = new AuthenticationHeaderValue(`
`17`	`16`	`"Basic",`
`18`	`17`	`BasicAuthenticatedHttpMessageHandler.GenerateAuthenticationParameter(options.UserId, options.Password));`
`19`	`18`	`}`
`20`	`19`
	`20`	`+ public BasicAuthenticatedHttpMessageHandler(`
	`21`	`+ BasicAuthenticatedHttpClientOptions options,`
	`22`	`+ HttpMessageHandler innerHandler) : this(options)`
	`23`	`+ {`
	`24`	`+ InnerHandler = innerHandler;`
	`25`	`+ }`
	`26`	`+`
`21`	`27`	`internal static string GenerateAuthenticationParameter(string userId, string password)`
`22`	`28`	`{`
`23`	`29`	`// implemented as per RFC 7617 https://tools.ietf.org/html/rfc7617.html`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public async Task TestRequestAddsAuthenticationHeader()`
`23`	`23`	`Value = "test-value"`
`24`	`24`	`}, mockHttp);`
`25`	`25`
`26`		`- var responseContent = await client.GetStringAsync("https://www.example.com");`
	`26`	`+ await client.GetStringAsync("https://www.example.com");`
`27`	`27`
`28`	`28`	`mockHttp.VerifyNoOutstandingExpectation();`
`29`	`29`	`}`
`@@ -48,7 +48,7 @@ public async Task TestMultipleParameterRequestAddsAuthenticationParameters()`
`48`	`48`	`}`
`49`	`49`	`}, mockHttp);`
`50`	`50`
`51`		`- var responseContent = await client.GetStringAsync("https://www.example.com");`
	`51`	`+ await client.GetStringAsync("https://www.example.com");`
`52`	`52`
`53`	`53`	`mockHttp.VerifyNoOutstandingExpectation();`
`54`	`54`	`}`
`@@ -71,7 +71,7 @@ public async Task TestMultipleParameterWithSingleParameterRequestAddsAuthenticat`
`71`	`71`	`}`
`72`	`72`	`}, mockHttp);`
`73`	`73`
`74`		`- var responseContent = await client.GetStringAsync("https://www.example.com");`
	`74`	`+ await client.GetStringAsync("https://www.example.com");`
`75`	`75`
`76`	`76`	`mockHttp.VerifyNoOutstandingExpectation();`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,19 +8,21 @@ public class CustomHeaderAuthenticatedHttpMessageHandler : DelegatingHandler`
`8`	`8`	`{`
`9`	`9`	`private readonly CustomHeaderAuthenticatedHttpClientOptions _options;`
`10`	`10`
`11`		`- public CustomHeaderAuthenticatedHttpMessageHandler(CustomHeaderAuthenticatedHttpClientOptions options)`
	`11`	`+ public CustomHeaderAuthenticatedHttpMessageHandler(`
	`12`	`+ CustomHeaderAuthenticatedHttpClientOptions options)`
`12`	`13`	`{`
`13`	`14`	`_options = options;`
`14`	`15`	`}`
`15`	`16`
`16`		`- public CustomHeaderAuthenticatedHttpMessageHandler(CustomHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)`
	`17`	`+ public CustomHeaderAuthenticatedHttpMessageHandler(`
	`18`	`+ CustomHeaderAuthenticatedHttpClientOptions options,`
	`19`	`+ HttpMessageHandler innerHandler) : this(options)`
`17`	`20`	`{`
`18`	`21`	`InnerHandler = innerHandler;`
`19`		`-`
`20`		`- _options = options;`
`21`	`22`	`}`
`22`	`23`
`23`		`- protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)`
	`24`	`+ protected override async Task<HttpResponseMessage> SendAsync(`
	`25`	`+ HttpRequestMessage request, CancellationToken cancellationToken)`
`24`	`26`	`{`
`25`	`27`	`request.Headers.Remove(_options.Name);`
`26`	`28`	`request.Headers.Add(_options.Name, _options.Value);`
Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,17 @@ public class QueryStringParameterAuthenticatedHttpMessageHandler : DelegatingHan`
`10`	`10`	`{`
`11`	`11`	`private readonly QueryStringParameterAuthenticatedHttpClientOptions _options;`
`12`	`12`
`13`		`- public QueryStringParameterAuthenticatedHttpMessageHandler(QueryStringParameterAuthenticatedHttpClientOptions options)`
	`13`	`+ public QueryStringParameterAuthenticatedHttpMessageHandler(`
	`14`	`+ QueryStringParameterAuthenticatedHttpClientOptions options)`
`14`	`15`	`{`
`15`	`16`	`_options = options;`
`16`	`17`	`}`
`17`	`18`
`18`		`- public QueryStringParameterAuthenticatedHttpMessageHandler(QueryStringParameterAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler) : this(options)`
	`19`	`+ public QueryStringParameterAuthenticatedHttpMessageHandler(`
	`20`	`+ QueryStringParameterAuthenticatedHttpClientOptions options,`
	`21`	`+ HttpMessageHandler innerHandler) : this(options)`
`19`	`22`	`{`
`20`		`- InnerHandler = innerHandler;`
	`23`	`+ InnerHandler = innerHandler;`
`21`	`24`	`}`
`22`	`25`
`23`	`26`	`protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)`