修复重复读取 responseMessage.Content 引发的错误

Xcube-Studio · Dec 13, 2024 · 517850a · 517850a
1 parent e3d43a6
commit 517850a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Natsurainko.FluentCore/Authentication/Microsoft/MicrosoftAuthenticator.cs b/Natsurainko.FluentCore/Authentication/Microsoft/MicrosoftAuthenticator.cs
@@ -279,7 +279,7 @@ private async Task<string> AuthXstsAsync(string xblToken, CancellationToken canc
                 throw new FormatException("Response is null");
             if (xstsResponse.Token is null)
                 throw new FormatException("Token is null");
-}
+        }
         catch (Exception e) when (e is JsonException || e is FormatException)
         {
             throw new AuthException("Error in XSTS authentication\n" + xstsResponseMessage.Content.ReadAsString());

diff --git a/Natsurainko.FluentCore/Authentication/Yggdrasil/YggdrasilAuthenticator.cs b/Natsurainko.FluentCore/Authentication/Yggdrasil/YggdrasilAuthenticator.cs
@@ -98,6 +98,10 @@ private async Task<YggdrasilAccount[]> ParseResponseAsync(HttpResponseMessage re
 
             if (response?.AvailableProfiles is null && response?.SelectedProfile is null)
                 throw new FormatException("Response does not contain any profile");
+        } 
+        catch (FormatException ex)
+        {
+            throw new YggdrasilAuthenticationException(ex.Message);
         }
         catch (Exception)
         {