Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

1 files changed, 16 insertions, 25 deletions

diff --git a/launcher/minecraft/auth/steps/XboxUserStep.cpp b/launcher/minecraft/auth/steps/XboxUserStep.cpp
index 842eb60f..61c33a18 100644
--- a/launcher/minecraft/auth/steps/XboxUserStep.cpp
+++ b/launcher/minecraft/auth/steps/XboxUserStep.cpp
@@ -6,22 +6,22 @@
 #include "minecraft/auth/Parsers.h"
 #include "net/NetUtils.h"
 
-XboxUserStep::XboxUserStep(AccountData* data) : AuthStep(data) {
-
-}
+XboxUserStep::XboxUserStep(AccountData* data) : AuthStep(data) {}
 
 XboxUserStep::~XboxUserStep() noexcept = default;
 
-QString XboxUserStep::describe() {
+QString XboxUserStep::describe()
+{
     return tr("Logging in as an Xbox user.");
 }
 
-
-void XboxUserStep::rehydrate() {
+void XboxUserStep::rehydrate()
+{
     // NOOP, for now. We only save bools and there's nothing to check.
 }
 
-void XboxUserStep::perform() {
+void XboxUserStep::perform()
+{
     QString xbox_auth_template = R"XXX(
 {
     "Properties": {
@@ -40,40 +40,31 @@ void XboxUserStep::perform() {
     request.setRawHeader("Accept", "application/json");
     // set contract-verison header (prevent err 400 bad-request?)
     // https://learn.microsoft.com/en-us/gaming/gdk/_content/gc/reference/live/rest/additional/httpstandardheaders
-    request.setRawHeader("x-xbl-contract-version", "1"); 
+    request.setRawHeader("x-xbl-contract-version", "1");
 
-    auto *requestor = new AuthRequest(this);
+    auto* requestor = new AuthRequest(this);
     connect(requestor, &AuthRequest::finished, this, &XboxUserStep::onRequestDone);
     requestor->post(request, xbox_auth_data.toUtf8());
     qDebug() << "First layer of XBox auth ... commencing.";
 }
 
-void XboxUserStep::onRequestDone(
-    QNetworkReply::NetworkError error,
-    QByteArray data,
-    QList<QNetworkReply::RawHeaderPair> headers
-) {
-    auto requestor = qobject_cast<AuthRequest *>(QObject::sender());
+void XboxUserStep::onRequestDone(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers)
+{
+    auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
     requestor->deleteLater();
 
     if (error != QNetworkReply::NoError) {
         qWarning() << "Reply error:" << error;
         if (Net::isApplicationError(error)) {
-            emit finished(AccountTaskState::STATE_FAILED_SOFT,
-                tr("XBox user authentication failed: %1").arg(requestor->errorString_)
-            );
-        }
-        else {
-            emit finished(
-                AccountTaskState::STATE_OFFLINE,
-                tr("XBox user authentication failed: %1").arg(requestor->errorString_)
-            );
+            emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("XBox user authentication failed: %1").arg(requestor->errorString_));
+        } else {
+            emit finished(AccountTaskState::STATE_OFFLINE, tr("XBox user authentication failed: %1").arg(requestor->errorString_));
         }
         return;
     }
 
     Katabasis::Token temp;
-    if(!Parsers::parseXTokenResponse(data, temp, "UToken")) {
+    if (!Parsers::parseXTokenResponse(data, temp, "UToken")) {
         qWarning() << "Could not parse user authentication response...";
         emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("XBox user authentication response could not be understood."));
         return;