feat(auth): improve custom auth flow (#138)

so5iso4ka · web-flow · commit 4b3e531429ad · 2025-12-31T13:52:12.000+03:00
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
@@ -269,6 +269,8 @@ set(MINECRAFT_SOURCES
 
     minecraft/auth/custom/steps/CustomAuthStep.cpp
     minecraft/auth/custom/steps/CustomAuthStep.h
+        minecraft/auth/custom/steps/CustomGetSkinStep.cpp
+        minecraft/auth/custom/steps/CustomGetSkinStep.h
 
     minecraft/gameoptions/GameOptions.h
     minecraft/gameoptions/GameOptions.cpp
diff --git a/launcher/minecraft/auth/AuthFlow.cpp b/launcher/minecraft/auth/AuthFlow.cpp
@@ -23,6 +23,7 @@
 
 // Custom
 #include "custom/steps/CustomAuthStep.h"
+#include "custom/steps/CustomGetSkinStep.h"
 
 #include "tasks/Task.h"
 
@@ -70,6 +71,7 @@ AuthFlow::AuthFlow(AccountData* data, Action action, QString password) : Task(),
         } break;
         case AccountType::Custom: {
             m_steps.append(makeShared<CustomAuthStep>(m_data, action, std::move(password)));
+            m_steps.append(makeShared<CustomGetSkinStep>(m_data));
         } break;
         default:
             break;
diff --git a/launcher/minecraft/auth/custom/steps/CustomAuthStep.cpp b/launcher/minecraft/auth/custom/steps/CustomAuthStep.cpp
@@ -21,6 +21,7 @@
 #include "Application.h"
 #include "Logging.h"
 #include "net/NetUtils.h"
+#include "net/RawHeaderProxy.h"
 
 #include <utility>
 
@@ -36,6 +37,11 @@ void CustomAuthStep::perform()
     m_response.reset(new QByteArray());
     m_request = Net::Upload::makeByteArray(url, m_response, requestData.toUtf8());
 
+    const auto headerProxy =
+        new Net::RawHeaderProxy(QList<Net::HeaderPair>{ { "Content-Type", "application/json" }, { "Accept", "application/json" } });
+    m_request->addHeaderProxy(headerProxy);
+    // RawHeaderProxy::addHeaderProxy takes ownership of the proxy, so no cleanup is required
+
     m_task.reset(new NetJob(authType() + "AuthStep", APPLICATION->network()));
     m_task->setAskRetry(false);
     m_task->addNetAction(m_request);
@@ -59,7 +65,11 @@ QString CustomAuthStep::requestTemplate()
     "username": "%1",
     "password": "%2",
     "clientToken": "%3",
-    "requestUser": false
+    "requestUser": false,
+    "agent": {
+	"name":"Minecraft",
+	"version":1
+    }
 }
 )XXX";
     } else {
diff --git a/launcher/minecraft/auth/custom/steps/CustomGetSkinStep.cpp b/launcher/minecraft/auth/custom/steps/CustomGetSkinStep.cpp
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Freesm Launcher - Minecraft Launcher
+ *  Copyright (C) 2025 so5iso4ka <so5iso4ka@icloud.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonParseError>
+#include <QUrl>
+
+#include "Application.h"
+#include "QObjectPtr.h"
+#include "net/Download.h"
+#include "net/RawHeaderProxy.h"
+
+#include "CustomGetSkinStep.h"
+
+namespace {
+QString getSkinUrlFromProperties(const QString& encodedProps)
+{
+    QJsonParseError err;
+    QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromBase64(encodedProps.toUtf8()), &err);
+    if (err.error != QJsonParseError::NoError) {
+        return {};
+    }
+
+    auto json = doc.object();
+    auto url = json["textures"].toObject()["SKIN"].toObject()["url"].toString();
+
+    return { url };
+}
+}  // namespace
+
+CustomGetSkinStep::CustomGetSkinStep(AccountData* data) : GetSkinStep(data) {}
+
+CustomGetSkinStep::~CustomGetSkinStep() = default;
+
+void CustomGetSkinStep::perform()
+{
+    const QUrl url(m_data->authUrl + QString("/sessionserver/session/minecraft/profile/%1").arg(m_data->minecraftProfile.id));
+
+    m_response = std::make_shared<QByteArray>();
+    m_request = Net::Download::makeByteArray(url, m_response);
+
+    const auto headerProxy =
+        new Net::RawHeaderProxy(QList<Net::HeaderPair>{ { "Content-Type", "application/json" }, { "Accept", "application/json" } });
+    m_request->addHeaderProxy(headerProxy);
+    // RawHeaderProxy::addHeaderProxy takes ownership of the proxy, so no cleanup is required
+
+    m_task = makeShared<NetJob>("CustomGetSkinStep", APPLICATION->network());
+    m_task->setAskRetry(false);
+    m_task->addNetAction(m_request);
+
+    connect(m_task.get(), &Task::finished, this, &CustomGetSkinStep::onPropertiesFetchDone);
+
+    m_task->start();
+}
+
+QString CustomGetSkinStep::describe()
+{
+    return tr("Getting custom account skin");
+}
+
+void CustomGetSkinStep::onPropertiesFetchDone()
+{
+    if (m_request->error() != QNetworkReply::NoError) {
+        qWarning() << "Reply error:" << m_request->error();
+        emit finished(AccountTaskState::STATE_WORKING, tr("Failed to get skin for account: %1").arg(m_request->errorString()));
+        return;
+    }
+
+    QJsonParseError err;
+    auto jsonResponse = QJsonDocument::fromJson(*m_response, &err);
+    if (err.error != QJsonParseError::NoError) {
+        emit finished(AccountTaskState::STATE_WORKING, tr("Failed to get skin for account: %1").arg(err.error));
+        return;
+    }
+
+    auto props = jsonResponse["properties"].toArray();
+
+    for (auto prop : props) {
+        auto obj = prop.toObject();
+        if (obj["name"].toString() == "textures") {
+            QString url = getSkinUrlFromProperties(obj["value"].toString());
+            if (url.isEmpty()) {
+                break;
+            }
+            m_data->minecraftProfile.skin.url = url;
+            return GetSkinStep::perform();
+        }
+    }
+
+    emit finished(AccountTaskState::STATE_WORKING, tr("Failed to get skin for account: %1").arg(err.error));
+}
diff --git a/launcher/minecraft/auth/custom/steps/CustomGetSkinStep.h b/launcher/minecraft/auth/custom/steps/CustomGetSkinStep.h
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Freesm Launcher - Minecraft Launcher
+ *  Copyright (C) 2025 so5iso4ka <so5iso4ka@icloud.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QString>
+#include <memory>
+
+#include "minecraft/auth/msa/steps/GetSkinStep.h"
+#include "net/Download.h"
+#include "net/NetJob.h"
+
+class CustomGetSkinStep : public GetSkinStep {
+    Q_OBJECT
+
+   public:
+    explicit CustomGetSkinStep(AccountData* data);
+    ~CustomGetSkinStep() override;
+
+    void perform() override;
+
+    QString describe() override;
+
+   private slots:
+    void onPropertiesFetchDone();
+
+   private:
+    std::shared_ptr<QByteArray> m_response;
+    Net::Download::Ptr m_request;
+    NetJob::Ptr m_task;
+};
diff --git a/launcher/net/NetRequest.cpp b/launcher/net/NetRequest.cpp
@@ -343,6 +343,14 @@ QNetworkReply::NetworkError NetRequest::error() const
     return m_reply ? m_reply->error() : QNetworkReply::NoError;
 }
 
+QList<QNetworkReply::RawHeaderPair> NetRequest::getRawHeaders() const
+{
+    if (!m_reply.isNull()) {
+        return m_reply->rawHeaderPairs();
+    }
+    return {};
+}
+
 QUrl NetRequest::url() const
 {
     return m_url;
diff --git a/launcher/net/NetRequest.h b/launcher/net/NetRequest.h
@@ -72,6 +72,8 @@ class NetRequest : public Task {
     void setNetwork(shared_qobject_ptr<QNetworkAccessManager> network) { m_network = network; }
     void addHeaderProxy(Net::HeaderProxy* proxy) { m_headerProxies.push_back(std::shared_ptr<Net::HeaderProxy>(proxy)); }
 
+    QList<QNetworkReply::RawHeaderPair> getRawHeaders() const;
+
     QUrl url() const;
     void setUrl(QUrl url) { m_url = url; }
     int replyStatusCode() const;
diff --git a/launcher/ui/dialogs/CustomLoginDialog.cpp b/launcher/ui/dialogs/CustomLoginDialog.cpp
@@ -19,6 +19,9 @@
 #include <QPushButton>
 #include <QUrl>
 
+#include "Application.h"
+#include "net/Download.h"
+
 CustomLoginDialog::CustomLoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::CustomLoginDialog)
 {
     ui->setupUi(this);
@@ -45,7 +48,7 @@ CustomLoginDialog::~CustomLoginDialog()
 // Stage 1: User interaction
 void CustomLoginDialog::accept()
 {
-    QUrl url = ui->authUrlTextBox->text();
+    const QUrl url = ui->authUrlTextBox->text();
     if (!url.isValid()) {
         emit onTaskFailed(tr("Provided URL isn't valid"));
         return;
@@ -58,6 +61,42 @@ void CustomLoginDialog::accept()
     setUserInputsEnabled(false);
     ui->progressBar->setVisible(true);
 
+    m_response = std::make_shared<QByteArray>();
+
+    m_requestTask = Net::Download::makeByteArray(url, m_response);
+    m_requestTask->setNetwork(APPLICATION->network());
+
+    connect(m_requestTask.get(), &Task::finished, this, &CustomLoginDialog::onUrlResolving);
+
+    m_requestTask->start();
+}
+
+void CustomLoginDialog::onUrlResolving()
+{
+    disconnect(m_requestTask.get(), &Task::finished, this, &CustomLoginDialog::onUrlResolving);
+
+    if (m_requestTask->error() != QNetworkReply::NoError) {
+        emit onTaskFailed(m_requestTask->errorString());
+        return;
+    }
+
+    // modify url if header say so
+    QUrl url;
+    auto headers = m_requestTask->getRawHeaders();
+    if (const auto it =
+            std::find_if(headers.begin(), headers.end(),
+                         [](const auto& pair) { return QString::fromUtf8(pair.first).toLower() == "x-authlib-injector-api-location"; });
+        it != headers.end()) {
+        const QUrl location = QString::fromUtf8(it->second);
+        if (location.isRelative()) {
+            url = m_requestTask->url().resolved(location);
+        } else {
+            url = location;
+        }
+    } else {
+        url = m_requestTask->url();
+    }
+
     // Setup the login task and start it
     m_account = CustomAccount::createCustom(ui->userTextBox->text(), url.toString(QUrl::StripTrailingSlash), ui->loginUrlTextBox->text(),
                                             ui->refreshUrlTextBox->text());
diff --git a/launcher/ui/dialogs/CustomLoginDialog.h b/launcher/ui/dialogs/CustomLoginDialog.h
@@ -18,6 +18,7 @@
 #include <QDialog>
 
 #include "minecraft/auth/custom/CustomAccount.h"
+#include "net/Download.h"
 #include "tasks/Task.h"
 
 namespace Ui {
@@ -40,6 +41,8 @@ class CustomLoginDialog : public QDialog {
    protected slots:
     void accept();
 
+    void onUrlResolving();
+
     void onTaskFailed(const QString& reason);
     void onTaskSucceeded();
     void onTaskStatus(const QString& status);
@@ -53,4 +56,6 @@ class CustomLoginDialog : public QDialog {
     Ui::CustomLoginDialog* ui;
     CustomAccountPtr m_account;
     Task::Ptr m_loginTask;
+    Net::Download::Ptr m_requestTask;
+    std::shared_ptr<QByteArray> m_response;
 };

Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,14 @@ QNetworkReply::NetworkError NetRequest::error() const`
`343`	`343`	`return m_reply ? m_reply->error() : QNetworkReply::NoError;`
`344`	`344`	`}`
`345`	`345`
	`346`	`+QList<QNetworkReply::RawHeaderPair> NetRequest::getRawHeaders() const`
	`347`	`+{`
	`348`	`+ if (!m_reply.isNull()) {`
	`349`	`+ return m_reply->rawHeaderPairs();`
	`350`	`+ }`
	`351`	`+ return {};`
	`352`	`+}`
	`353`	`+`
`346`	`354`	`QUrl NetRequest::url() const`
`347`	`355`	`{`
`348`	`356`	`return m_url;`