Merge branch 'unmojang' into unmojang-8.0

unmojang · Nov 16, 2023 · cdb2f09 · cdb2f09
2 parents 9430026 + 18db32d
commit cdb2f09
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/launcher/minecraft/auth/AccountData.cpp b/launcher/minecraft/auth/AccountData.cpp
@@ -287,12 +287,17 @@ bool AccountData::resumeStateFromV3(QJsonObject data)
         return false;
     }
     auto typeS = typeV.toString();
+    bool needsElyByMigration = false;
     if (typeS == "MSA") {
         type = AccountType::MSA;
     } else if (typeS == "Mojang") {
         type = AccountType::Mojang;
     } else if (typeS == "AuthlibInjector") {
         type = AccountType::AuthlibInjector;
+    } else if (typeS == "Elyby") {
+        // Migrate legacy Ely.by accounts to authlib-injector accounts
+        type = AccountType::AuthlibInjector;
+        needsElyByMigration = true;
     } else if (typeS == "Offline") {
         type = AccountType::Offline;
     } else {
@@ -306,12 +311,21 @@ bool AccountData::resumeStateFromV3(QJsonObject data)
     }
 
     if (type == AccountType::AuthlibInjector) {
-        customAuthServerUrl = data.value("customAuthServerUrl").toString();
-        customAccountServerUrl = data.value("customAccountServerUrl").toString();
-        customSessionServerUrl = data.value("customSessionServerUrl").toString();
-        customServicesServerUrl = data.value("customServicesServerUrl").toString();
-        authlibInjectorUrl = data.value("authlibInjectorUrl").toString();
-        authlibInjectorMetadata = data.value("authlibInjectorMetadata").toString();
+        if (needsElyByMigration) {
+            customAuthServerUrl = "https://authserver.ely.by/api/authlib-injector/authserver";
+            customAccountServerUrl = "https://authserver.ely.by/api/authlib-injector/api";
+            customSessionServerUrl = "https://authserver.ely.by/api/authlib-injector/sessionserver";
+            customServicesServerUrl = "https://authserver.ely.by/api/authlib-injector/minecraftservices";
+            authlibInjectorUrl = "https://authserver.ely.by/api/authlib-injector";
+            authlibInjectorMetadata = "";
+        } else {
+            customAuthServerUrl = data.value("customAuthServerUrl").toString();
+            customAccountServerUrl = data.value("customAccountServerUrl").toString();
+            customSessionServerUrl = data.value("customSessionServerUrl").toString();
+            customServicesServerUrl = data.value("customServicesServerUrl").toString();
+            authlibInjectorUrl = data.value("authlibInjectorUrl").toString();
+            authlibInjectorMetadata = data.value("authlibInjectorMetadata").toString();
+        }
     }
 
     if (type == AccountType::MSA) {

diff --git a/launcher/minecraft/auth/MinecraftAccount.cpp b/launcher/minecraft/auth/MinecraftAccount.cpp
@@ -283,6 +283,9 @@ bool MinecraftAccount::shouldRefresh() const
     if (isInUse()) {
         return false;
     }
+    if (data.type == AccountType::AuthlibInjector && data.authlibInjectorMetadata == "") {
+        return true;
+    }
     switch (data.validity_) {
         case Katabasis::Validity::Certain: {
             break;