9d442a0348
* 'Custom Yggdrasil' AccountType Signed-off-by: Evan Goode <mail@evangoo.de> * Allow multiple accounts with the same player UUID Signed-off-by: Evan Goode <mail@evangoo.de> * Use correct services server URL for SkinDelete Signed-off-by: Evan Goode <mail@evangoo.de> * Correctly use CustomYggdrasilRefresh, add warning message Signed-off-by: Evan Goode <mail@evangoo.de> * Custom Yggdrasil: Readability fixes Also made the MinecraftEntitlement for Custom Yggdrasil accounts work just like offline accounts---instead of checking the reply from the auth server, Custom Yggdrasil accounts are granted canPlayMinecraft and ownsMinecraft when they are created, in MinecraftAccount.cpp. Signed-off-by: Evan Goode <mail@evangoo.de> * Custom Yggdrasil: Add extra confirmation dialog Signed-off-by: Evan Goode <mail@evangoo.de> * Add install authlib-injector button Signed-off-by: Evan Goode <mail@evangoo.de> * authlib-injector accounts Signed-off-by: Evan Goode <mail@evangoo.de> * Suggest installing authlib-injector when needed Signed-off-by: Evan Goode <mail@evangoo.de> * Use Unmojang metadata Signed-off-by: Evan Goode <mail@evangoo.de> * Use std::string for MANAGED_AGENTS, not QString --------- Signed-off-by: Evan Goode <mail@evangoo.de> Resolve X-Authlib-Injector-API-Location Signed-off-by: Evan Goode <mail@evangoo.de> Prefetch authlib-injector metadata Resolves https://github.com/unmojang/PrismLauncher/issues/4 See https://github-com.translate.goog/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83?_x_tr_sl=auto&_x_tr_tl=en&_x_tr_hl=en-US#%E9%85%8D%E7%BD%AE%E9%A2%84%E8%8E%B7%E5%8F%96 Signed-off-by: Evan Goode <mail@evangoo.de> drag-and-drop authlib-injector URL, clang-format Resolves https://github.com/unmojang/PrismLauncher/issues/2 Signed-off-by: Evan Goode <mail@evangoo.de>
83 lines
2.8 KiB
C++
83 lines
2.8 KiB
C++
// SPDX-License-Identifier: GPL-3.0-only
|
|
/*
|
|
* Prism Launcher - Minecraft Launcher
|
|
* Copyright (C) 2023 Evan Goode <mail@evangoo.de>
|
|
*
|
|
* 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 "CreateAuthlibInjectorAccount.h"
|
|
|
|
#include <QDebug>
|
|
#include <QJsonDocument>
|
|
#include <QJsonObject>
|
|
#include <QNetworkRequest>
|
|
#include <QStringList>
|
|
#include <QUrl>
|
|
|
|
#include "Application.h"
|
|
#include "BuildConfig.h"
|
|
|
|
CreateAuthlibInjectorAccount::CreateAuthlibInjectorAccount(QUrl url, MinecraftAccountPtr account, QString username)
|
|
: NetAction(), m_url(url), m_account(account), m_username(username)
|
|
{}
|
|
|
|
void CreateAuthlibInjectorAccount::executeTask()
|
|
{
|
|
m_state = State::Running;
|
|
QNetworkRequest request(m_url);
|
|
QNetworkReply* rep = APPLICATION->network()->get(request);
|
|
|
|
m_reply.reset(rep);
|
|
connect(rep, &QNetworkReply::finished, this, &CreateAuthlibInjectorAccount::downloadFinished);
|
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
|
|
connect(rep, &QNetworkReply::errorOccurred, this, &CreateAuthlibInjectorAccount::downloadError);
|
|
#else
|
|
connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &CreateAuthlibInjectorAccount::downloadError);
|
|
#endif
|
|
connect(rep, &QNetworkReply::sslErrors, this, &CreateAuthlibInjectorAccount::sslErrors);
|
|
}
|
|
|
|
void CreateAuthlibInjectorAccount::downloadError(QNetworkReply::NetworkError error)
|
|
{
|
|
qDebug() << m_reply->errorString();
|
|
m_state = State::Failed;
|
|
}
|
|
|
|
void CreateAuthlibInjectorAccount::downloadFinished()
|
|
{
|
|
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;
|
|
} else {
|
|
qDebug() << m_reply->readAll();
|
|
m_reply.reset();
|
|
emitFailed();
|
|
return;
|
|
}
|
|
}
|
|
|
|
MinecraftAccountPtr CreateAuthlibInjectorAccount::getAccount()
|
|
{
|
|
return m_account;
|
|
}
|