It compiles, Yggdrasil login working except error handling

launcher/Application.cpp

@@ -109,6 +109,8 @@
 #include "icons/IconList.h"
 #include "net/HttpMetaCache.h"
 
+#include "ui/GuiUtil.h"
+
 #include "java/JavaInstallList.h"
 
 #include "updater/ExternalUpdater.h"

launcher/CMakeLists.txt

@@ -233,8 +233,6 @@ set(MINECRAFT_SOURCES
     minecraft/auth/MinecraftAccount.h
     minecraft/auth/Parsers.cpp
     minecraft/auth/Parsers.h
-    minecraft/auth/Yggdrasil.cpp
-    minecraft/auth/Yggdrasil.h
 
     minecraft/auth/AuthFlow.cpp
     minecraft/auth/AuthFlow.h
@@ -257,6 +255,8 @@ set(MINECRAFT_SOURCES
     minecraft/auth/steps/XboxProfileStep.h
     minecraft/auth/steps/XboxUserStep.cpp
     minecraft/auth/steps/XboxUserStep.h
+    minecraft/auth/steps/YggdrasilMinecraftProfileStep.cpp
+    minecraft/auth/steps/YggdrasilMinecraftProfileStep.h
     minecraft/auth/steps/YggdrasilStep.cpp
     minecraft/auth/steps/YggdrasilStep.h
 
@@ -1071,8 +1071,6 @@ SET(LAUNCHER_SOURCES
     ui/dialogs/IconPickerDialog.h
     ui/dialogs/ImportResourceDialog.cpp
     ui/dialogs/ImportResourceDialog.h
-    ui/dialogs/LoginDialog.cpp
-    ui/dialogs/LoginDialog.h
     ui/dialogs/AuthlibInjectorLoginDialog.cpp
     ui/dialogs/AuthlibInjectorLoginDialog.h
     ui/dialogs/MSALoginDialog.cpp

launcher/CreateAuthlibInjectorAccount.cpp

@@ -24,13 +24,16 @@
 #include <QNetworkRequest>
 #include <QStringList>
 #include <QUrl>
+#include "net/ByteArraySink.h"
 
 #include "Application.h"
-#include "BuildConfig.h"
 
 CreateAuthlibInjectorAccount::CreateAuthlibInjectorAccount(QUrl url, MinecraftAccountPtr account, QString username)
-    : NetRequest(), m_url(url), m_account(account), m_username(username)
-{}
+    : NetRequest(), m_account(account), m_username(username)
+{
+    m_url = url;
+    m_sink.reset(new Sink(*this));
+}
 
 QNetworkReply* CreateAuthlibInjectorAccount::getReply(QNetworkRequest& request)
 {
@@ -43,26 +46,34 @@ CreateAuthlibInjectorAccount::Ptr CreateAuthlibInjectorAccount::make(QUrl url, M
     return CreateAuthlibInjectorAccount::Ptr(new CreateAuthlibInjectorAccount(url, account, username));
 }
 
-void CreateAuthlibInjectorAccount::downloadFinished()
+auto CreateAuthlibInjectorAccount::Sink::init(QNetworkRequest& request) -> Task::State
+{
+    return Task::State::Running;
+}
+
+auto CreateAuthlibInjectorAccount::Sink::write(QByteArray& data) -> Task::State
+{
+    return Task::State::Running;
+}
+
+auto CreateAuthlibInjectorAccount::Sink::abort() -> Task::State
+{
+    return Task::State::Failed;
+}
+
+auto CreateAuthlibInjectorAccount::Sink::finalize(QNetworkReply& reply) -> Task::State
 {
-    if (m_state != State::Failed) {
-        QVariant header = m_reply->rawHeader("X-Authlib-Injector-API-Location");
-        if (header.isValid()) {
-            auto location = header.toString();
-            m_url = m_url.resolved(location);
-        } else {
-            qDebug() << "X-Authlib-Injector-API-Location header not found!";
-        }
-        m_account.reset(MinecraftAccount::createFromUsernameAuthlibInjector(m_username, m_url.toString()));
-        m_state = State::Succeeded;
-        emit succeeded();
-        return;
+    QVariant header = reply.rawHeader("X-Authlib-Injector-API-Location");
+    QUrl url = m_outer.m_url;
+    if (header.isValid()) {
+        auto location = header.toString();
+        url = url.resolved(location);
     } else {
-        qDebug() << m_reply->readAll();
-        m_reply.reset();
-        emitFailed();
-        return;
+        qDebug() << "X-Authlib-Injector-API-Location header not found!";
     }
+
+    m_outer.m_account.reset(MinecraftAccount::createFromUsernameAuthlibInjector(m_outer.m_username, url.toString()));
+    return Task::State::Succeeded;
 }
 
 MinecraftAccountPtr CreateAuthlibInjectorAccount::getAccount()

launcher/CreateAuthlibInjectorAccount.h

@@ -32,12 +32,26 @@ class CreateAuthlibInjectorAccount : public Net::NetRequest {
 
     MinecraftAccountPtr getAccount();
 
+    class Sink : public Net::Sink {
+       public:
+        Sink(CreateAuthlibInjectorAccount& outer) : m_outer(outer) {}
+        virtual ~Sink() = default;
+
+       public:
+        auto init(QNetworkRequest& request) -> Task::State override;
+        auto write(QByteArray& data) -> Task::State override;
+        auto abort() -> Task::State override;
+        auto finalize(QNetworkReply& reply) -> Task::State override;
+        auto hasLocalData() -> bool override { return false; }
+
+       private:
+        CreateAuthlibInjectorAccount& m_outer;
+    };
+
    protected slots:
     virtual QNetworkReply* getReply(QNetworkRequest&) override;
-    void downloadFinished();
 
    private:
-    QUrl m_url;
     MinecraftAccountPtr m_account;
     QString m_username;
 };

launcher/LaunchController.cpp

@@ -35,12 +35,12 @@
  */
 
 #include "LaunchController.h"
+#include <meta/Index.h>
 #include "Application.h"
 #include "launch/steps/PrintServers.h"
 #include "minecraft/auth/AccountData.h"
 #include "minecraft/auth/AccountList.h"
 #include "settings/MissingAuthlibInjectorBehavior.h"
-#include "ui/pages/instance/VersionPage.h"
 
 #include "ui/InstanceWindow.h"
 #include "ui/MainWindow.h"

launcher/main.cpp

@@ -72,7 +72,7 @@ int main(int argc, char* argv[])
             Q_INIT_RESOURCE(multimc);
             Q_INIT_RESOURCE(backgrounds);
             Q_INIT_RESOURCE(documents);
-            Q_INIT_RESOURCE(prismlauncher);
+            Q_INIT_RESOURCE(fjordlauncher);
 
             Q_INIT_RESOURCE(pe_dark);
             Q_INIT_RESOURCE(pe_light);

launcher/minecraft/auth/AuthFlow.cpp

@@ -13,14 +13,15 @@
 #include "minecraft/auth/steps/XboxAuthorizationStep.h"
 #include "minecraft/auth/steps/XboxProfileStep.h"
 #include "minecraft/auth/steps/XboxUserStep.h"
+#include "minecraft/auth/steps/YggdrasilMinecraftProfileStep.h"
 #include "minecraft/auth/steps/YggdrasilStep.h"
 #include "tasks/Task.h"
 
 #include "AuthFlow.h"
 
 #include <Application.h>
 
-AuthFlow::AuthFlow(AccountData* data, Action action, QObject* parent) : Task(parent), m_data(data)
+AuthFlow::AuthFlow(AccountData* data, Action action, QObject* parent, const std::optional<QString> password) : Task(parent), m_data(data)
 {
     if (data->type == AccountType::MSA) {
         if (action == Action::DeviceCode) {
@@ -43,8 +44,8 @@ AuthFlow::AuthFlow(AccountData* data, Action action, QObject* parent) : Task(par
         m_steps.append(makeShared<MinecraftProfileStep>(m_data));
         m_steps.append(makeShared<GetSkinStep>(m_data));
     } else if (data->type == AccountType::AuthlibInjector) {
-        m_steps.append(makeShared<YggdrasilStep>(m_data, QString()));
-        m_steps.append(makeShared<MinecraftProfileStepMojang>(m_data));
+        m_steps.append(makeShared<YggdrasilStep>(m_data, password));
+        m_steps.append(makeShared<YggdrasilMinecraftProfileStep>(m_data));
         m_steps.append(makeShared<GetSkinStep>(m_data));
     }
     changeState(AccountTaskState::STATE_CREATED);

launcher/minecraft/auth/AuthFlow.h

@@ -17,7 +17,10 @@ class AuthFlow : public Task {
    public:
     enum class Action { Refresh, Login, DeviceCode };
 
-    explicit AuthFlow(AccountData* data, Action action = Action::Refresh, QObject* parent = 0);
+    explicit AuthFlow(AccountData* data,
+                      Action action = Action::Refresh,
+                      QObject* parent = 0,
+                      std::optional<QString> password = std::nullopt);
     virtual ~AuthFlow() = default;
 
     void executeTask() override;

launcher/minecraft/auth/MinecraftAccount.cpp

@@ -67,15 +67,6 @@ MinecraftAccountPtr MinecraftAccount::loadFromJsonV3(const QJsonObject& json)
     return nullptr;
 }
 
-MinecraftAccountPtr MinecraftAccount::createFromUsername(const QString& username)
-{
-    auto account = makeShared<MinecraftAccount>();
-    account->data.type = AccountType::Mojang;
-    account->data.yggdrasilToken.extra["userName"] = username;
-    account->data.yggdrasilToken.extra["clientToken"] = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
-    return account;
-}
-
 MinecraftAccountPtr MinecraftAccount::createFromUsernameAuthlibInjector(const QString& username, const QString& authlibInjectorUrl)
 {
     auto account = makeShared<MinecraftAccount>();
@@ -143,11 +134,11 @@ QPixmap MinecraftAccount::getFace() const
     return skin.scaled(64, 64, Qt::KeepAspectRatio);
 }
 
-shared_qobject_ptr<AuthFlow> MinecraftAccount::login(bool useDeviceCode)
+shared_qobject_ptr<AuthFlow> MinecraftAccount::login(bool useDeviceCode, std::optional<QString> password)
 {
     Q_ASSERT(m_currentTask.get() == nullptr);
 
-    m_currentTask.reset(new AuthFlow(&data, useDeviceCode ? AuthFlow::Action::DeviceCode : AuthFlow::Action::Login, this));
+    m_currentTask.reset(new AuthFlow(&data, useDeviceCode ? AuthFlow::Action::DeviceCode : AuthFlow::Action::Login, this, password));
     connect(m_currentTask.get(), &Task::succeeded, this, &MinecraftAccount::authSucceeded);
     connect(m_currentTask.get(), &Task::failed, this, &MinecraftAccount::authFailed);
     connect(m_currentTask.get(), &Task::aborted, this, [this] { authFailed(tr("Aborted")); });

launcher/minecraft/auth/MinecraftAccount.h

@@ -83,7 +83,6 @@ class MinecraftAccount : public QObject, public Usable {
     //! Default constructor
     explicit MinecraftAccount(QObject* parent = 0);
 
-    static MinecraftAccountPtr createFromUsername(const QString& username);
     static MinecraftAccountPtr createFromUsernameAuthlibInjector(const QString& username, const QString& authlibInjectorUrl);
 
     static MinecraftAccountPtr createBlankMSA();
@@ -98,7 +97,7 @@ class MinecraftAccount : public QObject, public Usable {
     QJsonObject saveToJson() const;
 
    public: /* manipulation */
-    shared_qobject_ptr<AuthFlow> login(bool useDeviceCode = false);
+    shared_qobject_ptr<AuthFlow> login(bool useDeviceCode = false, std::optional<QString> password = std::nullopt);
 
     shared_qobject_ptr<AuthFlow> refresh();