From ace3db8eba0355a9ae5773020b7d2dc6ace419d0 Mon Sep 17 00:00:00 2001
From: Juliano Nunes <julianonunes@live.com>
Date: Thu, 14 Jul 2016 09:32:53 -0300
Subject: [PATCH] Adding the option to set WebProxy object to be used on
 HttpClient

---
 CSharpHTTPClient/Client.cs | 40 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/CSharpHTTPClient/Client.cs b/CSharpHTTPClient/Client.cs
index 84a3f46..8f3583e 100644
--- a/CSharpHTTPClient/Client.cs
+++ b/CSharpHTTPClient/Client.cs
@@ -68,11 +68,27 @@ public class Client : DynamicObject
         public string Version;
         public string UrlPath;
         public string MediaType;
+        public WebProxy WebProxy;
         public enum Methods
         {
             DELETE, GET, PATCH, POST, PUT
         }
 
+
+        /// <summary>
+        ///     REST API client.
+        /// </summary>
+        /// <param name="host">Base url (e.g. https://api.sendgrid.com)</param>
+        /// <param name="requestHeaders">A dictionary of request headers</param>
+        /// <param name="version">API version, override AddVersion to customize</param>
+        /// <param name="urlPath">Path to endpoint (e.g. /path/to/endpoint)</param>
+        /// <returns>Fluent interface to a REST API</returns>
+        public Client(WebProxy webProxy, string host, Dictionary<string, string> requestHeaders = null, string version = null, string urlPath = null)
+            : this(host, requestHeaders, version, urlPath)
+        {
+            WebProxy = webProxy;
+        }
+
         /// <summary>
         ///     REST API client.
         /// </summary>
@@ -159,6 +175,28 @@ private Client BuildClient(string name = null)
 
         }
 
+        /// <summary>
+        /// Factory method to return the right HttpClient settings.
+        /// </summary>
+        /// <returns>Instance of HttpClient</returns>
+        private HttpClient BuildHttpClient()
+        {
+            // Add the WebProxy if set
+            if (WebProxy != null)
+            {
+                var httpClientHandler = new HttpClientHandler()
+                {
+                    Proxy = WebProxy,
+                    PreAuthenticate = true,
+                    UseDefaultCredentials = false,
+                };
+
+                return new HttpClient(httpClientHandler);
+            }
+
+            return new HttpClient();
+        }
+
         /// <summary>
         ///     Add the authorization header, override to customize
         /// </summary>
@@ -274,7 +312,7 @@ public async virtual Task<Response> MakeRequest(HttpClient client, HttpRequestMe
         /// <returns>Response object</returns>
         private async Task<Response> RequestAsync(string method, String requestBody = null, String queryParams = null)
         {
-            using (var client = new HttpClient())
+            using (var client = BuildHttpClient())
             {
                 try
                 {