From 168eaf8e37902b7784e1d76b6e1cbef5ea2cdcbe Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 11 Aug 2021 18:05:02 +0000
Subject: [PATCH]

---
 source/Plugins/AyaNova.Plugin.V8/V8.cs   |  2 +-
 source/Plugins/AyaNova.Plugin.V8/util.cs | 29 ++++++++++++++++--------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index b2bc97d..0655221 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -139,7 +139,7 @@ namespace AyaNova.PlugIn.V8
             }
             //#endif
 
-
+            util.Initialized = false;
             Auth d = new Auth();
             var res = d.ShowDialog(); ;
             if (res == DialogResult.Cancel)
diff --git a/source/Plugins/AyaNova.Plugin.V8/util.cs b/source/Plugins/AyaNova.Plugin.V8/util.cs
index 61674b8..8aecde8 100644
--- a/source/Plugins/AyaNova.Plugin.V8/util.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/util.cs
@@ -21,7 +21,7 @@ namespace AyaNova.PlugIn.V8
         public static GZTW.AyaNova.BLL.LocalizedTextTable LocaleText = null;
         const string TEST_ROUTE = "notify/hello";
         const string API_BASE_ROUTE = "api/v8/";
-        static HttpClient client = new HttpClient();
+        public static HttpClient client = null;
         //url once known to be good
         internal static string ApiBaseUrl { get; set; }
         internal static string JWT { get; set; }
@@ -40,6 +40,10 @@ namespace AyaNova.PlugIn.V8
         private static void InitClient()
         {
             if (Initialized) return;
+            if (client != null)
+                client.Dispose();
+            client = null;
+            client = new HttpClient();
             client.BaseAddress = new Uri(ApiBaseUrl);
             client.DefaultRequestHeaders.Accept.Clear();
             client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
@@ -63,22 +67,27 @@ namespace AyaNova.PlugIn.V8
             }
 
             if (!serverUrl.StartsWith("http")) serverUrl = "http://" + serverUrl;
+            ApiBaseUrl = serverUrl;
+            InitClient();
 
             //try to connect, ping the server api
-            if (!Initialized)
-            {
-                client.BaseAddress = new Uri(serverUrl);
-                client.DefaultRequestHeaders.Accept.Clear();
-                client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-                Initialized = true;
-            }
+            //if (!Initialized)
+            //{
+            //    client.BaseAddress = new Uri(serverUrl);
+            //    client.DefaultRequestHeaders.Accept.Clear();
+            //    client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+            //    Initialized = true;
+            //}
 
             try
             {
+                // TimeSpan tsDefault = client.Timeout;
+                //  client.Timeout = new TimeSpan(0, 0, 20);
                 HttpResponseMessage response = await client.GetAsync(serverUrl + TEST_ROUTE);
+                //  client.Timeout = tsDefault;
                 if (response.IsSuccessStatusCode)
                 {
-                    ApiBaseUrl = serverUrl;
+                   
                     return "OK";
                 }
                 else
@@ -775,7 +784,7 @@ Locale Français is customized [signature: 804154061] exporting
             //<path d="M 79.400,15.300 C 82.236,17.326 82.400,16.800 85.400,18.300" stroke-width="5.525" stroke="rgb(0, 0, 0)" fill="none" stroke-linecap="round"></path>
             //<path d="M 85.400,18.300 C 88.884,19.030 88.736,19.326 92.400,19.300" stroke-wke="rgb(0, 0, 0)" fill="none" stroke-linecap="round"></path><path d="M 510.400,91.300 C 513.725,93.769 513.448,93.840 517.400,95.300" stroke-width="4.888" stroke="rgb(0, 0, 0)" fill="none" stroke-linecap="round"></path><path d="M 517.400,95.300 C 519.870,96.105 519.725,96.269 522.400,96.300" stroke-width="5.121" stroke="rgb(0, 0, 0)" fill="none" stroke-linecap="round"></path></svg>
             //https://developer.mozilla.org/en-US/docs/Web/SVG/Tutorial/Paths
-            
+
 
             System.Text.StringBuilder sb = new System.Text.StringBuilder();
             //open