aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-08-25 21:27:51 +0200
committerPetr Mrázek <peterix@gmail.com>2021-08-25 21:27:51 +0200
commit34a5459dcef1adb7eb355bb0f940eb212173857f (patch)
tree78fd16b1e6cb3c9baa6ce3b275f1cd194efc756c /launcher/minecraft
parent5c0e70e2376ec64e4ebf3c485decc2aa3d228527 (diff)
downloadPrismLauncher-34a5459dcef1adb7eb355bb0f940eb212173857f.tar.gz
PrismLauncher-34a5459dcef1adb7eb355bb0f940eb212173857f.tar.bz2
PrismLauncher-34a5459dcef1adb7eb355bb0f940eb212173857f.zip
NOISSUE cut down Requestor
Diffstat (limited to 'launcher/minecraft')
-rw-r--r--launcher/minecraft/auth/flows/AuthContext.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/launcher/minecraft/auth/flows/AuthContext.cpp b/launcher/minecraft/auth/flows/AuthContext.cpp
index ecd7e310..ed8acd40 100644
--- a/launcher/minecraft/auth/flows/AuthContext.cpp
+++ b/launcher/minecraft/auth/flows/AuthContext.cpp
@@ -156,9 +156,7 @@ void AuthContext::doUserAuth() {
QNetworkRequest request = QNetworkRequest(QUrl("https://user.auth.xboxlive.com/user/authenticate"));
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
request.setRawHeader("Accept", "application/json");
- auto *requestor = new Katabasis::Requestor(mgr, m_oauth2, this);
- requestor->setAddAccessTokenInQuery(false);
-
+ auto *requestor = new Requestor(mgr, m_oauth2, this);
connect(requestor, &Requestor::finished, this, &AuthContext::onUserAuthDone);
requestor->post(request, xbox_auth_data.toUtf8());
qDebug() << "First layer of XBox auth ... commencing.";
@@ -338,8 +336,6 @@ void AuthContext::doSTSAuthMinecraft() {
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
request.setRawHeader("Accept", "application/json");
Requestor *requestor = new Requestor(mgr, m_oauth2, this);
- requestor->setAddAccessTokenInQuery(false);
-
connect(requestor, &Requestor::finished, this, &AuthContext::onSTSAuthMinecraftDone);
requestor->post(request, xbox_auth_data.toUtf8());
qDebug() << "Getting Minecraft services STS token...";
@@ -394,8 +390,6 @@ void AuthContext::doSTSAuthGeneric() {
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
request.setRawHeader("Accept", "application/json");
Requestor *requestor = new Requestor(mgr, m_oauth2, this);
- requestor->setAddAccessTokenInQuery(false);
-
connect(requestor, &Requestor::finished, this, &AuthContext::onSTSAuthGenericDone);
requestor->post(request, xbox_auth_data.toUtf8());
qDebug() << "Getting generic STS token...";
@@ -444,8 +438,6 @@ void AuthContext::doMinecraftAuth() {
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
request.setRawHeader("Accept", "application/json");
Requestor *requestor = new Requestor(mgr, m_oauth2, this);
- requestor->setAddAccessTokenInQuery(false);
-
connect(requestor, &Requestor::finished, this, &AuthContext::onMinecraftAuthDone);
requestor->post(request, data.toUtf8());
qDebug() << "Getting Minecraft access token...";
@@ -538,8 +530,6 @@ void AuthContext::doXBoxProfile() {
request.setRawHeader("x-xbl-contract-version", "3");
request.setRawHeader("Authorization", QString("XBL3.0 x=%1;%2").arg(m_data->userToken.extra["uhs"].toString(), m_data->xboxApiToken.token).toUtf8());
Requestor *requestor = new Requestor(mgr, m_oauth2, this);
- requestor->setAddAccessTokenInQuery(false);
-
connect(requestor, &Requestor::finished, this, &AuthContext::onXBoxProfileDone);
requestor->get(request);
qDebug() << "Getting Xbox profile...";
@@ -675,8 +665,6 @@ void AuthContext::doMinecraftProfile() {
request.setRawHeader("Authorization", QString("Bearer %1").arg(m_data->yggdrasilToken.token).toUtf8());
Requestor *requestor = new Requestor(mgr, m_oauth2, this);
- requestor->setAddAccessTokenInQuery(false);
-
connect(requestor, &Requestor::finished, this, &AuthContext::onMinecraftProfileDone);
requestor->get(request);
}
@@ -710,7 +698,6 @@ void AuthContext::doGetSkin() {
auto url = QUrl(m_data->minecraftProfile.skin.url);
QNetworkRequest request = QNetworkRequest(url);
Requestor *requestor = new Requestor(mgr, m_oauth2, this);
- requestor->setAddAccessTokenInQuery(false);
connect(requestor, &Requestor::finished, this, &AuthContext::onSkinDone);
requestor->get(request);
}