1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-20 19:57:45 +00:00

Report sapphire login errors too

This commit is contained in:
Joshua Goins 2023-08-18 22:05:38 -04:00
parent 9243a699a8
commit e9f8580675

View file

@ -23,7 +23,12 @@ void SapphireLauncher::login(const QString &lobbyUrl, const LoginInformation &in
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
auto reply = window.mgr->post(request, QJsonDocument(data).toJson(QJsonDocument::JsonFormat::Compact)); auto reply = window.mgr->post(request, QJsonDocument(data).toJson(QJsonDocument::JsonFormat::Compact));
connect(reply, &QNetworkReply::finished, [&] { connect(reply, &QNetworkReply::finished, [this, reply, &info] {
if (reply->error() != QNetworkReply::NetworkError::NoError) {
Q_EMIT window.loginError(QStringLiteral("Could not contact lobby server.\n\n%1").arg(reply->errorString()));
return;
}
QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); QJsonDocument document = QJsonDocument::fromJson(reply->readAll());
if (!document.isEmpty()) { if (!document.isEmpty()) {
LoginAuth auth; LoginAuth auth;
@ -34,9 +39,7 @@ void SapphireLauncher::login(const QString &lobbyUrl, const LoginInformation &in
window.launchGame(*info.profile, auth); window.launchGame(*info.profile, auth);
} else { } else {
/*auto messageBox = Q_EMIT window.loginError("Invalid username or password.");
new QMessageBox(QMessageBox::Icon::Critical, "Failed to Login", "Invalid username/password.");
messageBox->show();*/
} }
}); });
} }