* '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>
89 lines
3.6 KiB
C++
89 lines
3.6 KiB
C++
#include "MinecraftProfileStepMojang.h"
|
|
|
|
#include <QNetworkRequest>
|
|
|
|
#include "BuildConfig.h"
|
|
#include "Logging.h"
|
|
#include "minecraft/auth/AuthRequest.h"
|
|
#include "minecraft/auth/Parsers.h"
|
|
#include "net/NetUtils.h"
|
|
|
|
MinecraftProfileStepMojang::MinecraftProfileStepMojang(AccountData* data) : AuthStep(data) {}
|
|
|
|
MinecraftProfileStepMojang::~MinecraftProfileStepMojang() noexcept = default;
|
|
|
|
QString MinecraftProfileStepMojang::describe()
|
|
{
|
|
return tr("Fetching the Minecraft profile.");
|
|
}
|
|
|
|
void MinecraftProfileStepMojang::perform()
|
|
{
|
|
if (m_data->minecraftProfile.id.isEmpty()) {
|
|
emit finished(AccountTaskState::STATE_FAILED_HARD, tr("A UUID is required to get the profile."));
|
|
return;
|
|
}
|
|
|
|
// use session server instead of profile due to profile endpoint being locked for locked Mojang accounts
|
|
QUrl url = QUrl(m_data->sessionServerUrl() + "/session/minecraft/profile/" + m_data->minecraftProfile.id);
|
|
QNetworkRequest req = QNetworkRequest(url);
|
|
AuthRequest* request = new AuthRequest(this);
|
|
connect(request, &AuthRequest::finished, this, &MinecraftProfileStepMojang::onRequestDone);
|
|
request->get(req);
|
|
}
|
|
|
|
void MinecraftProfileStepMojang::rehydrate()
|
|
{
|
|
// NOOP, for now. We only save bools and there's nothing to check.
|
|
}
|
|
|
|
void MinecraftProfileStepMojang::onRequestDone(QNetworkReply::NetworkError error,
|
|
QByteArray data,
|
|
QList<QNetworkReply::RawHeaderPair> headers)
|
|
{
|
|
auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
|
|
requestor->deleteLater();
|
|
|
|
qCDebug(authCredentials()) << data;
|
|
if (error == QNetworkReply::ContentNotFoundError) {
|
|
// NOTE: Succeed even if we do not have a profile. This is a valid account state.
|
|
if (m_data->type == AccountType::Mojang) {
|
|
m_data->minecraftEntitlement.canPlayMinecraft = false;
|
|
m_data->minecraftEntitlement.ownsMinecraft = false;
|
|
}
|
|
m_data->minecraftProfile = MinecraftProfile();
|
|
emit finished(AccountTaskState::STATE_SUCCEEDED, tr("Account has no Minecraft profile."));
|
|
return;
|
|
}
|
|
if (error != QNetworkReply::NoError) {
|
|
qWarning() << "Error getting profile:";
|
|
qWarning() << " HTTP Status: " << requestor->httpStatus_;
|
|
qWarning() << " Internal error no.: " << error;
|
|
qWarning() << " Error string: " << requestor->errorString_;
|
|
|
|
qWarning() << " Response:";
|
|
qWarning() << QString::fromUtf8(data);
|
|
|
|
if (Net::isApplicationError(error)) {
|
|
emit finished(AccountTaskState::STATE_FAILED_SOFT,
|
|
tr("Minecraft Java profile acquisition failed: %1").arg(requestor->errorString_));
|
|
} else {
|
|
emit finished(AccountTaskState::STATE_OFFLINE,
|
|
tr("Minecraft Java profile acquisition failed: %1").arg(requestor->errorString_));
|
|
}
|
|
return;
|
|
}
|
|
if (!Parsers::parseMinecraftProfileMojang(data, m_data->minecraftProfile)) {
|
|
m_data->minecraftProfile = MinecraftProfile();
|
|
emit finished(AccountTaskState::STATE_FAILED_SOFT, tr("Minecraft Java profile response could not be parsed"));
|
|
return;
|
|
}
|
|
|
|
if (m_data->type == AccountType::Mojang) {
|
|
auto validProfile = m_data->minecraftProfile.validity == Katabasis::Validity::Certain;
|
|
m_data->minecraftEntitlement.canPlayMinecraft = validProfile;
|
|
m_data->minecraftEntitlement.ownsMinecraft = validProfile;
|
|
}
|
|
emit finished(AccountTaskState::STATE_WORKING, tr("Minecraft Java profile acquisition succeeded."));
|
|
}
|