Android HttpClientHandler.ClientCertificates fix (#2270)

JamesNK · analogrelay · commit e1a22b315dae · 2018-05-16T11:25:39.000-07:00
diff --git a/src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.cs
@@ -486,10 +486,16 @@ private HttpClient CreateHttpClient()
                 {
                     httpClientHandler.CookieContainer = _httpConnectionOptions.Cookies;
                 }
-                if (_httpConnectionOptions.ClientCertificates != null)
+
+                // Only access HttpClientHandler.ClientCertificates if the user has configured client certs
+                // Mono does not support client certs and will throw NotImplementedException
+                // https://github.com/aspnet/SignalR/issues/2232
+                var clientCertificates = _httpConnectionOptions.ClientCertificates;
+                if (clientCertificates?.Count > 0)
                 {
-                    httpClientHandler.ClientCertificates.AddRange(_httpConnectionOptions.ClientCertificates);
+                    httpClientHandler.ClientCertificates.AddRange(clientCertificates);
                 }
+
                 if (_httpConnectionOptions.UseDefaultCredentials != null)
                 {
                     httpClientHandler.UseDefaultCredentials = _httpConnectionOptions.UseDefaultCredentials.Value;

Original file line number	Diff line number	Diff line change
`@@ -486,10 +486,16 @@ private HttpClient CreateHttpClient()`
`486`	`486`	`{`
`487`	`487`	`httpClientHandler.CookieContainer = _httpConnectionOptions.Cookies;`
`488`	`488`	`}`
`489`		`- if (_httpConnectionOptions.ClientCertificates != null)`
	`489`	`+`
	`490`	`+ // Only access HttpClientHandler.ClientCertificates if the user has configured client certs`
	`491`	`+ // Mono does not support client certs and will throw NotImplementedException`
	`492`	`+ // https://github.com/aspnet/SignalR/issues/2232`
	`493`	`+ var clientCertificates = _httpConnectionOptions.ClientCertificates;`
	`494`	`+ if (clientCertificates?.Count > 0)`
`490`	`495`	`{`
`491`		`- httpClientHandler.ClientCertificates.AddRange(_httpConnectionOptions.ClientCertificates);`
	`496`	`+ httpClientHandler.ClientCertificates.AddRange(clientCertificates);`
`492`	`497`	`}`
	`498`	`+`
`493`	`499`	`if (_httpConnectionOptions.UseDefaultCredentials != null)`
`494`	`500`	`{`
`495`	`501`	`httpClientHandler.UseDefaultCredentials = _httpConnectionOptions.UseDefaultCredentials.Value;`