CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement auth task's response processing.

Browse Source 
The authenticate task can now successfully log a user in.
This commit is contained in:
Andrew
2013-11-14 14:32:43 -06:00
parent 9cfd5ae465
commit ad8aeb0b2b
6 changed files with 256 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
logic/auth/YggdrasilTask.cpp
View File

@ -20,12 +20,14 @@
#include <QJsonObject>
#include <QJsonDocument>
#include <QNetworkReply>
#include <QByteArray>
#include <MultiMC.h>
#include <logic/auth/MojangAccount.h>
YggdrasilTask::YggdrasilTask(MojangAccount* account, QObject* parent) : Task(parent)
{
m_error = nullptr;
m_account = account;
}
@ -45,7 +47,7 @@ void YggdrasilTask::executeTask()
auto worker = MMC->qnam();
connect(worker.get(), SIGNAL(finished(QNetworkReply*)), this,
SLOT(processResponse(QNetworkReply*)));
SLOT(processReply(QNetworkReply*)));
QUrl reqUrl("https://authserver.mojang.com/" + getEndpoint());
QNetworkRequest netRequest(reqUrl);
@ -70,7 +72,8 @@ void YggdrasilTask::processReply(QNetworkReply* reply)
// Try to parse the response regardless of the response code.
// Sometimes the auth server will give more information and an error code.
QJsonParseError jsonError;
QJsonDocument doc = QJsonDocument::fromJson(reply->readAll(), &jsonError);
QByteArray replyData = reply->readAll();
QJsonDocument doc = QJsonDocument::fromJson(replyData, &jsonError);
// Check the response code.
int responseCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
@ -91,6 +94,10 @@ void YggdrasilTask::processReply(QNetworkReply* reply)
else
emitFailed(tr("An unknown error occurred when processing the response from the authentication server."));
}
else
{
emitSucceeded();
}
break;
default:
@ -150,7 +157,7 @@ QString YggdrasilTask::processError(QJsonObject responseData)
}
}
QString YggdrasilTask::getStateMessage(const YggdrasilTask::State state)
QString YggdrasilTask::getStateMessage(const YggdrasilTask::State state) const
{
switch (state)
{