Merge pull request #308 from watson-developer-cloud/validate-icp

Disable SSL

Author: mediumTaj

src/IBM.WatsonDeveloperCloud/Http/WatsonHttpClient.cs

@@ -39,16 +39,7 @@ public class WatsonHttpClient : IClient
 
         public WatsonHttpClient(string baseUri)
         {
-            if (Insecure)
-            {
-                var httpClientHandler = new HttpClientHandler();
-                httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; };
-                this.BaseClient = new HttpClient(httpClientHandler);
-            }
-            else
-            {
-                this.BaseClient = new HttpClient();
-            }
+            this.BaseClient = new HttpClient();
             this.Filters = new List<IHttpFilter> { new ErrorFilter() };
             if (baseUri != null)
                 this.BaseClient.BaseAddress = new Uri(baseUri);
@@ -58,16 +49,7 @@ public WatsonHttpClient(string baseUri)
 
         public WatsonHttpClient(string baseUri, string userName, string password)
         {
-            if (Insecure)
-            {
-                var httpClientHandler = new HttpClientHandler();
-                httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; };
-                this.BaseClient = new HttpClient(httpClientHandler);
-            }
-            else
-            {
-                this.BaseClient = new HttpClient();
-            }
+            this.BaseClient = new HttpClient();
             this.Filters = new List<IHttpFilter> { new ErrorFilter() };
             if (baseUri != null)
                 this.BaseClient.BaseAddress = new Uri(baseUri);
@@ -77,16 +59,7 @@ public WatsonHttpClient(string baseUri, string userName, string password)
 
         public WatsonHttpClient(string baseUri, string userName, string password, HttpClient client)
         {
-            if (Insecure)
-            {
-                var httpClientHandler = new HttpClientHandler();
-                httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; };
-                this.BaseClient = new HttpClient(httpClientHandler);
-            }
-            else
-            {
-                this.BaseClient = new HttpClient();
-            }
+            this.BaseClient = new HttpClient();
             this.Filters = new List<IHttpFilter> { new ErrorFilter() };
             if (baseUri != null)
                 this.BaseClient.BaseAddress = new Uri(baseUri);
@@ -110,7 +83,7 @@ public IClient WithAuthentication(string userName, string password)
 
         public IClient WithAuthentication(string apikey)
         {
-            if(!string.IsNullOrEmpty(apikey))
+            if (!string.IsNullOrEmpty(apikey))
             {
                 this.BaseClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", apikey);
             }
@@ -193,7 +166,16 @@ protected virtual void Dispose(bool isDisposing)
 
         public void SendAsInsecure(bool insecure)
         {
-            Insecure = insecure;
+            if (insecure)
+            {
+                var httpClientHandler = new HttpClientHandler();
+                httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => { return true; };
+                this.BaseClient = new HttpClient(httpClientHandler);
+            }
+            else
+            {
+                this.BaseClient = new HttpClient();
+            }
         }
     }
 }