From 94b01a5f5c1b800cc68fad9f12be4c06cd6cb81a Mon Sep 17 00:00:00 2001 From: Lenny McLennington Date: Sat, 9 Dec 2023 13:38:46 +0000 Subject: [PATCH] Fix MSA profile fetching This reverts commit 290ccebc2988bc094c8be793237e3469c6018323 for launcher/minecraft/auth/steps/MinecraftProfileStep.cpp. Oops. Signed-off-by: Lenny McLennington --- .../auth/steps/MinecraftProfileStep.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp index e7651e46..b39b9326 100644 --- a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp +++ b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp @@ -7,21 +7,7 @@ #include "net/NetUtils.h" MinecraftProfileStep::MinecraftProfileStep(AccountData* data) : AuthStep(data) { - switch (m_data->type) - { - case AccountType::Mojang: { - baseUrl = "https://api.minecraftservices.com"; - break; - } - case AccountType::AuthlibInjector: { - baseUrl = m_data->authlibInjectorApiLocation + "/minecraftservices"; - break; - } - // Silence warnings about unhandled enum values for values we know shouldn't be handled. - case AccountType::MSA: - case AccountType::Offline: - break; - } + } MinecraftProfileStep::~MinecraftProfileStep() noexcept = default; @@ -32,7 +18,7 @@ QString MinecraftProfileStep::describe() { void MinecraftProfileStep::perform() { - QUrl url = baseUrl + "/minecraft/profile"; + auto url = QUrl("https://api.minecraftservices.com/minecraft/profile"); QNetworkRequest request = QNetworkRequest(url); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); request.setRawHeader("Authorization", QString("Bearer %1").arg(m_data->yggdrasilToken.token).toUtf8());