authlib-injector: Mark correct account as in use

Fixes a bug where the wrong account could be marked as "in use" when the game is launched if there are multiple accounts that share the same profile ID. This can lead to the launcher trying to refresh an account that's currently in use by the game, leading to "Invalid session" errors in-game. Signed-off-by: Evan Goode <[email protected]>
fn2006 · Nov 5, 2023 · 4957597 · 4957597
1 parent 712e2f0
commit 4957597
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/launcher/minecraft/auth/AccountList.cpp b/launcher/minecraft/auth/AccountList.cpp
@@ -79,6 +79,17 @@ int AccountList::findAccountByProfileId(const QString& profileId) const
     return -1;
 }
 
+MinecraftAccountPtr AccountList::getAccountByInternalId(const QString& accountId) const
+{
+    for (int i = 0; i < count(); i++) {
+        MinecraftAccountPtr account = at(i);
+        if (account->internalId() == accountId) {
+            return account;
+        }
+    }
+    return nullptr;
+}
+
 MinecraftAccountPtr AccountList::getAccountByProfileName(const QString& profileName) const
 {
     for (int i = 0; i < count(); i++) {

diff --git a/launcher/minecraft/auth/AccountList.h b/launcher/minecraft/auth/AccountList.h
@@ -79,6 +79,7 @@ class AccountList : public QAbstractListModel {
     void addAccount(const MinecraftAccountPtr account);
     void removeAccount(QModelIndex index);
     int findAccountByProfileId(const QString& profileId) const;
+    MinecraftAccountPtr getAccountByInternalId(const QString& accountId) const;
     MinecraftAccountPtr getAccountByProfileName(const QString& profileName) const;
     QStringList profileNames() const;
 

diff --git a/launcher/minecraft/auth/AuthSession.h b/launcher/minecraft/auth/AuthSession.h
@@ -33,6 +33,8 @@ struct AuthSession {
     bool uses_custom_api_servers = false;
     QString authlib_injector_metadata;
 
+    // account ID
+    QString account_id;
     // client token
     QString client_token;
     // account user name

diff --git a/launcher/minecraft/auth/MinecraftAccount.cpp b/launcher/minecraft/auth/MinecraftAccount.cpp
@@ -328,6 +328,8 @@ void MinecraftAccount::fillSession(AuthSessionPtr session)
         }
     }
 
+    // account ID
+    session->account_id = internalId();
     // the user name. you have to have an user name
     // FIXME: not with MSA
     session->username = data.userName();

diff --git a/launcher/minecraft/launch/ClaimAccount.cpp b/launcher/minecraft/launch/ClaimAccount.cpp
@@ -8,7 +8,7 @@ ClaimAccount::ClaimAccount(LaunchTask* parent, AuthSessionPtr session) : LaunchS
 {
     if (session->status == AuthSession::Status::PlayableOnline && !session->demo) {
         auto accounts = APPLICATION->accounts();
-        m_account = accounts->getAccountByProfileName(session->player_name);
+        m_account = accounts->getAccountByInternalId(session->account_id);
     }
 }