Improved Growatt authentication procedure.

Author: danwale

ChargeHQSender.cs

@@ -22,7 +22,7 @@ public string UserId
         {
             get
             {
-                if (ChargeHQSettings.ApiKey != null && ChargeHQSettings.ApiKey != default(Guid))
+                if (ChargeHQSettings != null && ChargeHQSettings.ApiKey != null && ChargeHQSettings.ApiKey != default(Guid))
                 {
                     return ChargeHQSettings.ApiKey.Value.ToString();
                 }
@@ -134,7 +134,7 @@ public async Task<bool> SendErrorData(string errorMessage)
         /// </returns>
         public async Task<bool> SendData(SiteMeterPush data)
         {
-            if (ChargeHQSettings.ApiKey != null && ChargeHQSettings.ApiKey != default(Guid))
+            if (ChargeHQSettings != null && ChargeHQSettings.ApiKey != null && ChargeHQSettings.ApiKey != default(Guid))
             {
                 // Send the SiteMeterPush data model to ChargeHQ Push API
                 logger.LogDebug("ChargeHQ Site Meter Push: {0}", JsonConvert.SerializeObject(data, Formatting.None));

GrowattProducer.cs

@@ -139,7 +139,9 @@ private async Task<bool> GetCookies(CancellationToken cancellationToken)
                 string url = Utility.GetUrl(GrowattSettings.BaseURI, Constants.Growatt.LOGIN_URI);
                 var req = new HttpRequestMessage(HttpMethod.Post, url) { Content = new FormUrlEncodedContent(nvc) };
                 var res = await _client.SendAsync(req);
-                if (res.StatusCode == HttpStatusCode.OK)
+                var jsonResponse = Utility.GetJsonResponse(res, cancellationToken);
+                var loginResponse = JsonConvert.DeserializeObject<LogonResponse>(jsonResponse);
+                if (res.StatusCode == HttpStatusCode.OK && loginResponse.result > 0)
                 {
                     return true;
                 }

Models/Growatt/LogonResponse.cs

@@ -3,5 +3,7 @@ namespace SolarUseOptimiser.Models.Growatt
     public class LogonResponse
     {
         public int result { get; set; }
+
+        public string msg { get; set; }
     }
 }

PeriodicPoller.cs

@@ -106,9 +106,19 @@ private void PollGenerationStatistics_Elapsed(object sender, ElapsedEventArgs e)
             {
                 if (!CancellationTokenSource.IsCancellationRequested)
                 {
+                    int retryCount = 3;
                     while (!DataSource.IsInitialised)
                     {
                         DataSource.Authenticate(CancellationTokenSource).GetAwaiter().GetResult();
+                        if (retryCount > 0) 
+                        {
+                            Thread.Sleep(5000);
+                            retryCount--;
+                        }
+                        else
+                        {
+                            return;
+                        }
                     }
 
                     SiteMeterPush pushData = DataSource.GetSiteMeterData(DataTarget.UserId, CancellationTokenSource);