1 files changed, 17 insertions, 20 deletions

diff --git a/logic/auth/flows/AuthenticateTask.cpp b/logic/auth/flows/AuthenticateTask.cpp
index ec2004d6..f60be35d 100644
--- a/logic/auth/flows/AuthenticateTask.cpp
+++ b/logic/auth/flows/AuthenticateTask.cpp
@@ -26,7 +26,7 @@
 
 #include "logger/QsLog.h"
 
-AuthenticateTask::AuthenticateTask(MojangAccountPtr account, const QString &password,
+AuthenticateTask::AuthenticateTask(MojangAccount * account, const QString &password,
 								   QObject *parent)
 	: YggdrasilTask(account, parent), m_password(password)
 {
@@ -59,14 +59,14 @@ QJsonObject AuthenticateTask::getRequestContent() const
 		req.insert("agent", agent);
 	}
 
-	req.insert("username", getMojangAccount()->username());
+	req.insert("username", m_account->username());
 	req.insert("password", m_password);
 	req.insert("requestUser", true);
 
 	// 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());
+	if (!m_account->m_clientToken.isEmpty())
+		req.insert("clientToken", m_account->m_clientToken);
 
 	return req;
 }
@@ -76,7 +76,7 @@ bool AuthenticateTask::processResponse(QJsonObject responseData)
 	// Read the response data. We need to get the client token, access token, and the selected
 	// profile.
 	QLOG_DEBUG() << "Processing authentication response.";
-
+	// QLOG_DEBUG() << responseData;
 	// If we already have a client token, make sure the one the server gave us matches our
 	// existing one.
 	QLOG_DEBUG() << "Getting client token.";
@@ -88,8 +88,7 @@ bool AuthenticateTask::processResponse(QJsonObject responseData)
 		QLOG_ERROR() << "Server didn't send a client token.";
 		return false;
 	}
-	if (!getMojangAccount()->clientToken().isEmpty() &&
-		clientToken != getMojangAccount()->clientToken())
+	if (!m_account->m_clientToken.isEmpty() && clientToken != m_account->m_clientToken)
 	{
 		// The server changed our client token! Obey its wishes, but complain. That's what I do
 		// for my parents, so...
@@ -97,7 +96,7 @@ bool AuthenticateTask::processResponse(QJsonObject responseData)
 					<< "'. This shouldn't happen, but it isn't really a big deal.";
 	}
 	// Set the client token.
-	getMojangAccount()->setClientToken(clientToken);
+	m_account->m_clientToken = clientToken;
 
 	// Now, we set the access token.
 	QLOG_DEBUG() << "Getting access token.";
@@ -109,7 +108,7 @@ bool AuthenticateTask::processResponse(QJsonObject responseData)
 		QLOG_ERROR() << "Server didn't send an access token.";
 	}
 	// Set the access token.
-	getMojangAccount()->setAccessToken(accessToken);
+	m_account->m_accessToken = accessToken;
 
 	// Now we load the list of available profiles.
 	// Mojang hasn't yet implemented the profile system,
@@ -117,13 +116,14 @@ bool AuthenticateTask::processResponse(QJsonObject responseData)
 	// don't have trouble implementing it later.
 	QLOG_DEBUG() << "Loading profile list.";
 	QJsonArray availableProfiles = responseData.value("availableProfiles").toArray();
-	ProfileList loadedProfiles;
+	QList<AccountProfile> 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("");
+		bool legacy = profile.value("legacy").toBool(false);
 
 		if (id.isEmpty() || name.isEmpty())
 		{
@@ -135,10 +135,10 @@ bool AuthenticateTask::processResponse(QJsonObject responseData)
 		}
 
 		// Now, add a new AccountProfile entry to the list.
-		loadedProfiles.append(AccountProfile(id, name));
+		loadedProfiles.append({id, name, legacy});
 	}
 	// Put the list of profiles we loaded into the MojangAccount object.
-	getMojangAccount()->loadProfiles(loadedProfiles);
+	m_account->m_profiles = 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
@@ -153,7 +153,7 @@ bool AuthenticateTask::processResponse(QJsonObject responseData)
 		QLOG_ERROR() << "Server didn't specify a currently selected profile.";
 		return false;
 	}
-	if (!getMojangAccount()->setProfile(currentProfileId))
+	if (!m_account->setCurrentProfile(currentProfileId))
 	{
 		// TODO: Set an error to display to the user.
 		QLOG_ERROR() << "Server specified a selected profile that wasn't in the available "
@@ -162,23 +162,20 @@ bool AuthenticateTask::processResponse(QJsonObject responseData)
 	}
 
 	// this is what the vanilla launcher passes to the userProperties launch param
-	// doesn't seem to be used for anything so far? I don't get any of this data on my account
-	// (peterixxx)
-	// is it a good idea to log this?
 	if (responseData.contains("user"))
 	{
+		User u;
 		auto obj = responseData.value("user").toObject();
-		auto userId = obj.value("id").toString();
+		u.id = obj.value("id").toString();
 		auto propArray = obj.value("properties").toArray();
-		QLOG_DEBUG() << "User ID: " << userId;
-		QLOG_DEBUG() << "User Properties: ";
 		for (auto prop : propArray)
 		{
 			auto propTuple = prop.toObject();
 			auto name = propTuple.value("name").toString();
 			auto value = propTuple.value("value").toString();
-			QLOG_DEBUG() << name << " : " << value;
+			u.properties.insert(name, value);
 		}
+		m_account->m_user = u;
 	}
 
 	// We've made it through the minefield of possible errors. Return true to indicate that