mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

XboxAuthorizationStep: clang-tidy

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2026-05-04 20:27:47 +05:00
parent a021c86871
commit 0a3f7da7e7
No known key found for this signature in database
GPG key ID: B77C34313AEE1FFF
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
View file

@ -2,7 +2,7 @@
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonParseError> #include <QJsonParseError>
#include <QNetworkRequest> #include <utility>
#include "Application.h" #include "Application.h"
#include "Logging.h" #include "Logging.h"
@ -12,7 +12,7 @@
#include "net/Upload.h" #include "net/Upload.h"
XboxAuthorizationStep::XboxAuthorizationStep(AccountData* data, Token* token, QString relyingParty, QString authorizationKind) XboxAuthorizationStep::XboxAuthorizationStep(AccountData* data, Token* token, QString relyingParty, QString authorizationKind)
: AuthStep(data), m_token(token), m_relyingParty(relyingParty), m_authorizationKind(authorizationKind) : AuthStep(data), m_token(token), m_relyingParty(std::move(relyingParty)), m_authorizationKind(std::move(authorizationKind))
{} {}
QString XboxAuthorizationStep::describe() QString XboxAuthorizationStep::describe()
@ -22,7 +22,7 @@ QString XboxAuthorizationStep::describe()
void XboxAuthorizationStep::perform() void XboxAuthorizationStep::perform()
{ {
QString xbox_auth_template = R"XXX( const QString xboxAuthTemplate = R"XXX(
{ {
"Properties": { "Properties": {
"SandboxId": "RETAIL", "SandboxId": "RETAIL",
@ -34,15 +34,13 @@ void XboxAuthorizationStep::perform()
"TokenType": "JWT" "TokenType": "JWT"
} }
)XXX"; )XXX";
auto xbox_auth_data = xbox_auth_template.arg(m_data->userToken.token, m_relyingParty); const auto xboxAuthData = xboxAuthTemplate.arg(m_data->userToken.token, m_relyingParty);
// http://xboxlive.com // http://xboxlive.com
QUrl url("https://xsts.auth.xboxlive.com/xsts/authorize"); const QUrl url("https://xsts.auth.xboxlive.com/xsts/authorize");
auto headers = QList<Net::HeaderPair>{ auto headers = QList<Net::HeaderPair>{ { .headerName = "Content-Type", .headerValue = "application/json" },
{ "Content-Type", "application/json" }, { .headerName = "Accept", .headerValue = "application/json" },
{ "Accept", "application/json" }, { .headerName = "x-xbl-contract-version", .headerValue = "1" } };
{ "x-xbl-contract-version", "1" } auto [request, response] = Net::Upload::makeByteArray(url, xboxAuthData.toUtf8());
};
auto [request, response] = Net::Upload::makeByteArray(url, xbox_auth_data.toUtf8());
m_request = request; m_request = request;
m_request->addHeaderProxy(std::make_unique<Net::RawHeaderProxy>(headers)); m_request->addHeaderProxy(std::make_unique<Net::RawHeaderProxy>(headers));
m_request->enableAutoRetry(true); m_request->enableAutoRetry(true);
@ -97,8 +95,8 @@ bool XboxAuthorizationStep::processSTSError(const QByteArray& response)
{ {
if (m_request->error() == QNetworkReply::AuthenticationRequiredError) { if (m_request->error() == QNetworkReply::AuthenticationRequiredError) {
QJsonParseError jsonError; QJsonParseError jsonError;
QJsonDocument doc = QJsonDocument::fromJson(response, &jsonError); const QJsonDocument doc = QJsonDocument::fromJson(response, &jsonError);
if (jsonError.error) { if (jsonError.error != QJsonParseError::NoError) {
qWarning() << "Cannot parse error XSTS response as JSON:" << jsonError.errorString(); qWarning() << "Cannot parse error XSTS response as JSON:" << jsonError.errorString();
emit finished(AccountTaskState::STATE_FAILED_SOFT, emit finished(AccountTaskState::STATE_FAILED_SOFT,
tr("Cannot parse %1 authorization error response as JSON: %2").arg(m_authorizationKind, jsonError.errorString())); tr("Cannot parse %1 authorization error response as JSON: %2").arg(m_authorizationKind, jsonError.errorString()));