NOISSUE add setting capes, tweak missing profile message, fix cape IDs

3 files changed, 56 insertions, 44 deletions

diff --git a/launcher/minecraft/auth/AccountData.cpp b/launcher/minecraft/auth/AccountData.cpp
index 77c73c1b..5c6de9df 100644
--- a/launcher/minecraft/auth/AccountData.cpp
+++ b/launcher/minecraft/auth/AccountData.cpp
@@ -78,8 +78,8 @@ void profileToJSONV3(QJsonObject &parent, MinecraftProfile p, const char * token
     QJsonObject out;
     out["id"] = QJsonValue(p.id);
     out["name"] = QJsonValue(p.name);
-    if(p.currentCape != -1) {
-        out["cape"] = p.capes[p.currentCape].id;
+    if(!p.currentCape.isEmpty()) {
+        out["cape"] = p.currentCape;
     }
 
     {
@@ -155,41 +155,53 @@ MinecraftProfile profileFromJSONV3(const QJsonObject &parent, const char * token
         }
     }
 
-    auto capesV = tokenObject.value("capes");
-    if(!capesV.isArray()) {
-        qWarning() << "capes is not an array!";
-        return MinecraftProfile();
-    }
-    auto capesArray = capesV.toArray();
-    for(auto capeV: capesArray) {
-        if(!capeV.isObject()) {
-            qWarning() << "cape is not an object!";
-            return MinecraftProfile();
-        }
-        auto capeObj = capeV.toObject();
-        auto idV = capeObj.value("id");
-        auto urlV = capeObj.value("url");
-        auto aliasV = capeObj.value("alias");
-        if(!idV.isString() || !urlV.isString() || !aliasV.isString()) {
-            qWarning() << "mandatory skin attributes are missing or of unexpected type";
+    {
+        auto capesV = tokenObject.value("capes");
+        if(!capesV.isArray()) {
+            qWarning() << "capes is not an array!";
             return MinecraftProfile();
         }
-        Cape cape;
-        cape.id = idV.toString();
-        cape.url = urlV.toString();
-        cape.alias = aliasV.toString();
-
-        // data for cape is optional.
-        auto dataV = capeObj.value("data");
-        if(dataV.isString()) {
-            // TODO: validate base64
-            cape.data = QByteArray::fromBase64(dataV.toString().toLatin1());
+        auto capesArray = capesV.toArray();
+        for(auto capeV: capesArray) {
+            if(!capeV.isObject()) {
+                qWarning() << "cape is not an object!";
+                return MinecraftProfile();
+            }
+            auto capeObj = capeV.toObject();
+            auto idV = capeObj.value("id");
+            auto urlV = capeObj.value("url");
+            auto aliasV = capeObj.value("alias");
+            if(!idV.isString() || !urlV.isString() || !aliasV.isString()) {
+                qWarning() << "mandatory skin attributes are missing or of unexpected type";
+                return MinecraftProfile();
+            }
+            Cape cape;
+            cape.id = idV.toString();
+            cape.url = urlV.toString();
+            cape.alias = aliasV.toString();
+
+            // data for cape is optional.
+            auto dataV = capeObj.value("data");
+            if(dataV.isString()) {
+                // TODO: validate base64
+                cape.data = QByteArray::fromBase64(dataV.toString().toLatin1());
+            }
+            else if (!dataV.isUndefined()) {
+                qWarning() << "cape data is something unexpected";
+                return MinecraftProfile();
+            }
+            out.capes[cape.id] = cape;
         }
-        else if (!dataV.isUndefined()) {
-            qWarning() << "cape data is something unexpected";
-            return MinecraftProfile();
+    }
+    // current cape
+    {
+        auto capeV = tokenObject.value("cape");
+        if(capeV.isString()) {
+            auto currentCape = capeV.toString();
+            if(out.capes.contains(currentCape)) {
+                out.currentCape = currentCape;
+            }
         }
-        out.capes.push_back(cape);
     }
     out.validity = Katabasis::Validity::Assumed;
     return out;
diff --git a/launcher/minecraft/auth/AccountData.h b/launcher/minecraft/auth/AccountData.h
index b2d09cb0..cf58fb76 100644
--- a/launcher/minecraft/auth/AccountData.h
+++ b/launcher/minecraft/auth/AccountData.h
@@ -25,8 +25,8 @@ struct MinecraftProfile {
     QString id;
     QString name;
     Skin skin;
-    int currentCape = -1;
-    QVector<Cape> capes;
+    QString currentCape;
+    QMap<QString, Cape> capes;
     Katabasis::Validity validity = Katabasis::Validity::None;
 };
 
diff --git a/launcher/minecraft/auth/flows/AuthContext.cpp b/launcher/minecraft/auth/flows/AuthContext.cpp
index d6a72208..9754d1a9 100644
--- a/launcher/minecraft/auth/flows/AuthContext.cpp
+++ b/launcher/minecraft/auth/flows/AuthContext.cpp
@@ -576,7 +576,9 @@ void AuthContext::onXBoxProfileDone(
 }
 
 void AuthContext::checkResult() {
+    qDebug() << "AuthContext::checkResult called";
     if(m_requestsDone != 2) {
+        qDebug() << "Number of ready results:" << m_requestsDone;
         return;
     }
     if(m_mcAuthSucceeded && m_xboxProfileSucceeded) {
@@ -638,10 +640,9 @@ bool parseMinecraftProfile(QByteArray & data, MinecraftProfile &output) {
         break;
     }
     auto capesArray = obj.value("capes").toArray();
-    int i = -1;
-    int currentCape = -1;
+
+    QString currentCape;
     for(auto cape: capesArray) {
-        i++;
         auto capeObj = cape.toObject();
         Cape capeOut;
         if(!getString(capeObj.value("id"), capeOut.id)) {
@@ -652,7 +653,7 @@ bool parseMinecraftProfile(QByteArray & data, MinecraftProfile &output) {
             continue;
         }
         if(state == "ACTIVE") {
-            currentCape = i;
+            currentCape = capeOut.id;
         }
         if(!getString(capeObj.value("url"), capeOut.url)) {
             continue;
@@ -661,8 +662,7 @@ bool parseMinecraftProfile(QByteArray & data, MinecraftProfile &output) {
             continue;
         }
 
-        // we deal with only the active skin
-        output.capes.push_back(capeOut);
+        output.capes[capeOut.id] = capeOut;
     }
     output.currentCape = currentCape;
     output.validity = Katabasis::Validity::Certain;
@@ -692,18 +692,18 @@ void AuthContext::onMinecraftProfileDone(int, QNetworkReply::NetworkError error,
     if (error == QNetworkReply::ContentNotFoundError) {
         m_data->minecraftProfile = MinecraftProfile();
         finishActivity();
-        changeState(STATE_FAILED_HARD, tr("Account is missing a profile"));
+        changeState(STATE_FAILED_HARD, tr("Account is missing a Minecraft Java profile.\n\nWhile the Microsoft account is valid, it does not own the game.\n\nYou might own Bedrock on this account, but that does not give you access to Java currently."));
         return;
     }
     if (error != QNetworkReply::NoError) {
         finishActivity();
-        changeState(STATE_FAILED_HARD, tr("Profile acquisition failed"));
+        changeState(STATE_FAILED_HARD, tr("Minecraft Java profile acquisition failed."));
         return;
     }
     if(!parseMinecraftProfile(data, m_data->minecraftProfile)) {
         m_data->minecraftProfile = MinecraftProfile();
         finishActivity();
-        changeState(STATE_FAILED_HARD, tr("Profile response could not be parsed"));
+        changeState(STATE_FAILED_HARD, tr("Minecraft Java profile response could not be parsed"));
         return;
     }
     doGetSkin();