From 3a53349e332599221bc325f7fac9dc7927194bc2 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Mon, 26 Jul 2021 21:44:11 +0200
Subject: GH-3392 dirty initial MSA support that shares logic with Mojang flows

Both act as the first step of AuthContext.
---
 launcher/minecraft/MinecraftInstance.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'launcher/minecraft/MinecraftInstance.cpp')

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;
 }
 
-- 
cgit