Merge remote-tracking branch 'origin/develop' into download-all-blocked

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>

1 files changed, 18 insertions, 3 deletions

diff --git a/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp b/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
index 589768e3..14bde47e 100644
--- a/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
+++ b/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
@@ -6,6 +6,7 @@
 
 #include "minecraft/auth/AuthRequest.h"
 #include "minecraft/auth/Parsers.h"
+#include "net/NetUtils.h"
 
 XboxAuthorizationStep::XboxAuthorizationStep(AccountData* data, Katabasis::Token *token, QString relyingParty, QString authorizationKind):
     AuthStep(data),
@@ -62,10 +63,24 @@ void XboxAuthorizationStep::onRequestDone(
 #endif
     if (error != QNetworkReply::NoError) {
         qWarning() << "Reply error:" << error;
-        if(!processSTSError(error, data, headers)) {
+        if (Net::isApplicationError(error)) {
+            if(!processSTSError(error, data, headers)) {
+                emit finished(
+                    AccountTaskState::STATE_FAILED_SOFT,
+                    tr("Failed to get authorization for %1 services. Error %2.").arg(m_authorizationKind, error)
+                );
+            }
+            else {
+                emit finished(
+                    AccountTaskState::STATE_FAILED_SOFT,
+                    tr("Unknown STS error for %1 services: %2").arg(m_authorizationKind, requestor->errorString_)
+                );
+            }
+        }
+        else {
             emit finished(
-                AccountTaskState::STATE_FAILED_SOFT,
-                tr("Failed to get authorization for %1 services. Error %2.").arg(m_authorizationKind, error)
+                AccountTaskState::STATE_OFFLINE,
+                tr("Failed to get authorization for %1 services: %2").arg(m_authorizationKind, requestor->errorString_)
             );
         }
         return;