Add proxy back in

Author: mwatson

Src/StackifyLib/Utils/HttpClient.cs

@@ -28,7 +28,7 @@ public class AppIdentityInfo
 
     public class HttpClient
     {
-        // public static IWebProxy CustomWebProxy = null;
+         public static IWebProxy CustomWebProxy = null;
 
         public string BaseAPIUrl { get; private set; }
 
@@ -74,7 +74,9 @@ public class StackifyWebResponse
 
         static HttpClient()
         {
-            //LoadWebProxyConfig();
+#if NET45 || NET40
+            LoadWebProxyConfig();
+#endif
         }
 
         public HttpClient(string apiKey, string apiUrl)
@@ -110,49 +112,50 @@ public HttpClient(string apiKey, string apiUrl)
                 BaseAPIUrl += "/";
         }
 
-        //    public static void LoadWebProxyConfig()
-        //    {
-        //        try
-        //        {
-        //string val = Config.Get("Stackify.ProxyServer");
-
-        //            if (!string.IsNullOrEmpty(val))
-        //            {
+#if NET45 || NET40
+        public static void LoadWebProxyConfig()
+        {
+            try
+            {
+                string val = Config.Get("Stackify.ProxyServer");
 
-        //                StackifyAPILogger.Log("Setting proxy server based on override config", true);
+                if (!string.IsNullOrEmpty(val))
+                {
 
-        //                var uri = new Uri(val);
+                    StackifyAPILogger.Log("Setting proxy server based on override config", true);
 
-        //                var proxy = new WebProxy(uri, false);
+                    var uri = new Uri(val);
 
-        //                if (!string.IsNullOrEmpty(uri.UserInfo) && uri.UserInfo.Contains(":"))
-        //                {
-        //                    string[] pieces = uri.UserInfo.Split(':');
+                    var proxy = new WebProxy(uri, false);
 
-        //                    proxy.Credentials = new NetworkCredential(pieces[0], pieces[1]);
-        //                }
-        //                else
-        //                {
+                    if (!string.IsNullOrEmpty(uri.UserInfo) && uri.UserInfo.Contains(":"))
+                    {
+                        string[] pieces = uri.UserInfo.Split(':');
 
-        //		string settingUseDefault = Config.Get("Stackify.ProxyUseDefaultCredentials");
+                        proxy.Credentials = new NetworkCredential(pieces[0], pieces[1]);
+                    }
+                    else
+                    {
 
-        //                    bool useDefault;
+                        string settingUseDefault = Config.Get("Stackify.ProxyUseDefaultCredentials");
 
-        //                    if (!string.IsNullOrEmpty(settingUseDefault) && bool.TryParse(settingUseDefault, out useDefault))
-        //                    {
-        //                        //will make it use the user of the running windows service
-        //                        proxy.UseDefaultCredentials = useDefault;
-        //                    }
-        //                }
-        //                CustomWebProxy = proxy;
-        //            }
-        //        }
-        //        catch (Exception ex)
-        //        {
-        //            StackifyAPILogger.Log("Error setting default web proxy " + ex.Message, true);
-        //        }
-        //    }
+                        bool useDefault;
 
+                        if (!string.IsNullOrEmpty(settingUseDefault) && bool.TryParse(settingUseDefault, out useDefault))
+                        {
+                            //will make it use the user of the running windows service
+                            proxy.UseDefaultCredentials = useDefault;
+                        }
+                    }
+                    CustomWebProxy = proxy;
+                }
+            }
+            catch (Exception ex)
+            {
+                StackifyAPILogger.Log("Error setting default web proxy " + ex.Message, true);
+            }
+        }
+#endif
 
         /// <summary>
         /// This method does some throttling when errors happen to control when it should try again. Error backoff logic
@@ -582,7 +585,7 @@ private HttpWebRequest BuildJsonRequest(string url, string jsonData, bool compre
 
             request.Headers["X-Stackify-Key"] = this.APIKey;
             request.ContentType = "application/json";
-            request.Headers[HttpRequestHeader.UserAgent] = "StackifyLibCore-" + _version;
+            request.Headers[HttpRequestHeader.UserAgent] = "StackifyLib-" + _version;
 
             //if (HttpClient.CustomWebProxy != null)
             //{