diff options
author | Petr Mrázek <peterix@gmail.com> | 2021-07-26 21:44:11 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2021-08-15 23:18:50 +0200 |
commit | 3a53349e332599221bc325f7fac9dc7927194bc2 (patch) | |
tree | 2ee40fa6044c241b3b7db27fe0b83931b453c2b2 /launcher/minecraft/MinecraftInstance.cpp | |
parent | fca2e9e44cb44004eec7f47c03b186bd5e44dc32 (diff) | |
download | PrismLauncher-3a53349e332599221bc325f7fac9dc7927194bc2.tar.gz PrismLauncher-3a53349e332599221bc325f7fac9dc7927194bc2.tar.bz2 PrismLauncher-3a53349e332599221bc325f7fac9dc7927194bc2.zip |
GH-3392 dirty initial MSA support that shares logic with Mojang flows
Both act as the first step of AuthContext.
Diffstat (limited to 'launcher/minecraft/MinecraftInstance.cpp')
-rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index dbf9f816..5f3c7244 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -423,7 +423,7 @@ QStringList MinecraftInstance::processMinecraftArgs( // yggdrasil! if(session) { - token_mapping["auth_username"] = session->username; + // token_mapping["auth_username"] = session->username; token_mapping["auth_session"] = session->session; token_mapping["auth_access_token"] = session->access_token; token_mapping["auth_player_name"] = session->player_name; @@ -691,19 +691,11 @@ QMap<QString, QString> MinecraftInstance::createCensorFilterFromSession(AuthSess addToFilter(sessionRef.session, tr("<SESSION ID>")); } addToFilter(sessionRef.access_token, tr("<ACCESS TOKEN>")); - addToFilter(sessionRef.client_token, tr("<CLIENT TOKEN>")); + if(sessionRef.client_token.size()) { + addToFilter(sessionRef.client_token, tr("<CLIENT TOKEN>")); + } addToFilter(sessionRef.uuid, tr("<PROFILE ID>")); - auto i = sessionRef.u.properties.begin(); - while (i != sessionRef.u.properties.end()) - { - if(i.value().length() <= 3) { - ++i; - continue; - } - addToFilter(i.value(), "<" + i.key().toUpper() + ">"); - ++i; - } return filter; } |