Merge pull request #413 from WildernessLabs/bug/cloud-send

check result of Auth on Send
WildernessLabs · Dec 14, 2023 · 53175af · 53175af
2 parents ed67931 + 83bb0ea
commit 53175af
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/source/Meadow.Core/MeadowCloudService.cs b/source/Meadow.Core/MeadowCloudService.cs
@@ -177,7 +177,14 @@ private async Task<bool> Send<T>(T item, string endpoint)
 
         if (CurrentJwt == null)
         {
-            await Authenticate();
+            if (!await Authenticate())
+            {
+                errorMessage = $"Cloud auth failed before sending";
+                ServiceError?.Invoke(this, errorMessage);
+                Resolver.Log.Warn(errorMessage);
+                // TODO: should we retry after this?
+                return false;
+            }
         }
 
         using (HttpClient client = new HttpClient())
@@ -208,7 +215,7 @@ private async Task<bool> Send<T>(T item, string endpoint)
 
             if (response.IsSuccessStatusCode)
             {
-                Resolver.Log.Debug("cloud log success");
+                Resolver.Log.Debug("cloud send success");
                 result = true;
             }
             else if (response.StatusCode == HttpStatusCode.Unauthorized)
@@ -217,6 +224,7 @@ private async Task<bool> Send<T>(T item, string endpoint)
                 {
                     attempt++;
                     Resolver.Log.Debug($"Unauthorized, re-authenticating");
+                    // by setting this to null and retrying, Authenticate will get called
                     CurrentJwt = null;
                     goto retry;
                 }
@@ -276,7 +284,7 @@ private async Task<bool> Send<T>(T item, string endpoint)
                 return pkFileContent;
             }
         }
-        else if(SRI.RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        else if (SRI.RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
         {
             var sshFolder = new DirectoryInfo(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".ssh"));