Implement auth task's response processing.

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

View file

@ -17,10 +17,15 @@
#include <logic/auth/AuthenticateTask.h>
#include <logic/auth/MojangAccount.h>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
#include <QVariant>
#include <QDebug>
#include "logger/QsLog.h"
AuthenticateTask::AuthenticateTask(MojangAccount* account, const QString& password, QObject* parent) :
YggdrasilTask(account, parent), m_password(password)
{
@ -53,15 +58,106 @@ QJsonObject AuthenticateTask::getRequestContent() const
req.insert("username", getMojangAccount()->username());
req.insert("password", m_password);
req.insert("clientToken", getMojangAccount()->clientToken());
// If we already have a client token, give it to the server.
// Otherwise, let the server give us one.
if (!getMojangAccount()->clientToken().isEmpty())
req.insert("clientToken", getMojangAccount()->clientToken());
return req;
}
bool AuthenticateTask::processResponse(QJsonObject responseData)
{
qDebug() << QJsonDocument(responseData).toVariant().toString();
return false;
// Read the response data. We need to get the client token, access token, and the selected profile.
QLOG_DEBUG() << "Processing authentication response.";
// If we already have a client token, make sure the one the server gave us matches our existing one.
QLOG_DEBUG() << "Getting client token.";
QString clientToken = responseData.value("clientToken").toString("");
if (clientToken.isEmpty())
{
// Fail if the server gave us an empty client token
// TODO: Set an error properly to display to the user.
QLOG_ERROR() << "Server didn't send a client token.";
return false;
}
if (!getMojangAccount()->clientToken().isEmpty() && clientToken != getMojangAccount()->clientToken())
{
// The server changed our client token! Obey its wishes, but complain. That's what I do for my parents, so...
QLOG_WARN() << "Server changed our client token to '" << clientToken
<< "'. This shouldn't happen, but it isn't really a big deal.";
}
// Set the client token.
getMojangAccount()->setClientToken(clientToken);
// Now, we set the access token.
QLOG_DEBUG() << "Getting access token.";
QString accessToken = responseData.value("accessToken").toString("");
if (accessToken.isEmpty())
{
// Fail if the server didn't give us an access token.
// TODO: Set an error properly to display to the user.
QLOG_ERROR() << "Server didn't send an access token.";
}
// Set the access token.
getMojangAccount()->setAccessToken(accessToken);
// Now we load the list of available profiles.
// Mojang hasn't yet implemented the profile system,
// but we might as well support what's there so we
// don't have trouble implementing it later.
QLOG_DEBUG() << "Loading profile list.";
QJsonArray availableProfiles = responseData.value("availableProfiles").toArray();
ProfileList loadedProfiles;
for (auto iter : availableProfiles)
{
QJsonObject profile = iter.toObject();
// Profiles are easy, we just need their ID and name.
QString id = profile.value("id").toString("");
QString name = profile.value("name").toString("");
if (id.isEmpty() || name.isEmpty())
{
// This should never happen, but we might as well
// warn about it if it does so we can debug it easily.
// You never know when Mojang might do something truly derpy.
QLOG_WARN() << "Found entry in available profiles list with missing ID or name field. Ignoring it.";
}
// Now, add a new AccountProfile entry to the list.
loadedProfiles.append(AccountProfile(id, name));
}
// Put the list of profiles we loaded into the MojangAccount object.
getMojangAccount()->loadProfiles(loadedProfiles);
// Finally, we set the current profile to the correct value. This is pretty simple.
// We do need to make sure that the current profile that the server gave us
// is actually in the available profiles list.
// If it isn't, we'll just fail horribly (*shouldn't* ever happen, but you never know).
QLOG_DEBUG() << "Setting current profile.";
QJsonObject currentProfile = responseData.value("selectedProfile").toObject();
QString currentProfileId = currentProfile.value("id").toString("");
if (currentProfileId.isEmpty())
{
// TODO: Set an error to display to the user.
QLOG_ERROR() << "Server didn't specify a currently selected profile.";
return false;
}
if (!getMojangAccount()->setProfile(currentProfileId))
{
// TODO: Set an error to display to the user.
QLOG_ERROR() << "Server specified a selected profile that wasn't in the available profiles list.";
return false;
}
// We've made it through the minefield of possible errors. Return true to indicate that we've succeeded.
QLOG_DEBUG() << "Finished reading authentication response.";
return true;
}
QString AuthenticateTask::getEndpoint() const
@ -69,3 +165,16 @@ QString AuthenticateTask::getEndpoint() const
return "authenticate";
}
QString AuthenticateTask::getStateMessage(const YggdrasilTask::State state) const
{
switch (state)
{
case STATE_SENDING_REQUEST:
return tr("Authenticating: Sending request.");
case STATE_PROCESSING_RESPONSE:
return tr("Authenticating: Processing response.");
default:
return YggdrasilTask::getStateMessage(state);
}
}