diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-07-24 20:41:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-24 20:41:23 +0200 |
commit | 4f000122688a0967d9d7df95d7ebb9241b284d53 (patch) | |
tree | d8e23f17a7a9defeac201c27f6af560056264241 | |
parent | 684c2ec47a4b91c57461284f9a8bffa25ce6d05d (diff) | |
parent | f505d43fc0399d944cad9e51ab6cc7189052cba1 (diff) | |
download | PrismLauncher-4f000122688a0967d9d7df95d7ebb9241b284d53.tar.gz PrismLauncher-4f000122688a0967d9d7df95d7ebb9241b284d53.tar.bz2 PrismLauncher-4f000122688a0967d9d7df95d7ebb9241b284d53.zip |
Merge pull request #1426 from TheKodeToad/token-censor-fix
-rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 2 | ||||
-rw-r--r-- | launcher/minecraft/auth/AccountData.cpp | 4 | ||||
-rw-r--r-- | launcher/minecraft/auth/MinecraftAccount.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 342e634f..3bcd4df8 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -843,7 +843,7 @@ QMap<QString, QString> MinecraftInstance::createCensorFilterFromSession(AuthSess { addToFilter(sessionRef.session, tr("<SESSION ID>")); } - if (sessionRef.access_token != "offline") { + if (sessionRef.access_token != "0") { addToFilter(sessionRef.access_token, tr("<ACCESS TOKEN>")); } if(sessionRef.client_token.size()) { diff --git a/launcher/minecraft/auth/AccountData.cpp b/launcher/minecraft/auth/AccountData.cpp index 44f7e256..0b78cb0c 100644 --- a/launcher/minecraft/auth/AccountData.cpp +++ b/launcher/minecraft/auth/AccountData.cpp @@ -374,6 +374,10 @@ bool AccountData::resumeStateFromV3(QJsonObject data) { } yggdrasilToken = tokenFromJSONV3(data, "ygg"); + // versions before 7.2 used "offline" as the offline token + if (yggdrasilToken.token == "offline") + yggdrasilToken.token = "0"; + minecraftProfile = profileFromJSONV3(data, "profile"); if(!entitlementFromJSONV3(data, minecraftEntitlement)) { if(minecraftProfile.validity != Katabasis::Validity::None) { diff --git a/launcher/minecraft/auth/MinecraftAccount.cpp b/launcher/minecraft/auth/MinecraftAccount.cpp index d7b061e5..5d279af1 100644 --- a/launcher/minecraft/auth/MinecraftAccount.cpp +++ b/launcher/minecraft/auth/MinecraftAccount.cpp @@ -94,7 +94,7 @@ MinecraftAccountPtr MinecraftAccount::createOffline(const QString &username) { auto account = makeShared<MinecraftAccount>(); account->data.type = AccountType::Offline; - account->data.yggdrasilToken.token = "offline"; + account->data.yggdrasilToken.token = "0"; account->data.yggdrasilToken.validity = Katabasis::Validity::Certain; account->data.yggdrasilToken.issueInstant = QDateTime::currentDateTimeUtc(); account->data.yggdrasilToken.extra["userName"] = username; |