Merge branch 'feature_yggdrasil' into develop

Conflicts:
	gui/MainWindow.cpp
	logic/OneSixInstance.h

Fix missing session id functionality for legacy and old onesix.

logic/auth/MojangAccount.cpp

@@ -0,0 +1,220 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Authors: Orochimarufan <orochimarufan.x3@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "MojangAccount.h"
+
+#include <QUuid>
+#include <QJsonObject>
+#include <QJsonArray>
+
+#include <logger/QsLog.h>
+
+MojangAccount::MojangAccount(const QString& username, QObject* parent) :
+	QObject(parent)
+{
+	// Generate a client token.
+	m_clientToken = QUuid::createUuid().toString();
+
+	m_username = username;
+
+	m_currentProfile = -1;
+}
+
+MojangAccount::MojangAccount(const QString& username, const QString& clientToken, 
+							 const QString& accessToken, QObject* parent) :
+	QObject(parent)
+{
+	m_username = username;
+	m_clientToken = clientToken;
+	m_accessToken = accessToken;
+
+	m_currentProfile = -1;
+}
+
+MojangAccount::MojangAccount(const MojangAccount& other, QObject* parent)
+{
+	m_username = other.username();
+	m_clientToken = other.clientToken();
+	m_accessToken = other.accessToken();
+
+	m_profiles = other.m_profiles;
+	m_currentProfile = other.m_currentProfile;
+}
+
+
+QString MojangAccount::username() const
+{
+	return m_username;
+}
+
+QString MojangAccount::clientToken() const
+{
+	return m_clientToken;
+}
+
+void MojangAccount::setClientToken(const QString& clientToken)
+{
+	m_clientToken = clientToken;
+}
+
+
+QString MojangAccount::accessToken() const
+{
+	return m_accessToken;
+}
+
+void MojangAccount::setAccessToken(const QString& accessToken)
+{
+	m_accessToken = accessToken;
+}
+
+QString MojangAccount::sessionId() const
+{
+	return "token:" + m_accessToken + ":" + currentProfile()->id();
+}
+
+const QList<AccountProfile> MojangAccount::profiles() const
+{
+	return m_profiles;
+}
+
+const AccountProfile* MojangAccount::currentProfile() const
+{
+	if (m_currentProfile < 0)
+	{
+		if (m_profiles.length() > 0)
+			return &m_profiles.at(0);
+		else
+			return nullptr;
+	}
+	else
+		return &m_profiles.at(m_currentProfile);
+}
+
+bool MojangAccount::setProfile(const QString& profileId)
+{
+	const QList<AccountProfile>& profiles = this->profiles();
+	for (int i = 0; i < profiles.length(); i++)
+	{
+		if (profiles.at(i).id() == profileId)
+		{
+			m_currentProfile = i;
+			return true;
+		}
+	}
+	return false;
+}
+
+void MojangAccount::loadProfiles(const ProfileList& profiles)
+{
+	m_profiles.clear();
+	for (auto profile : profiles)
+		m_profiles.append(profile);
+}
+
+MojangAccountPtr MojangAccount::loadFromJson(const QJsonObject& object)
+{
+	// The JSON object must at least have a username for it to be valid.
+	if (!object.value("username").isString())
+	{
+		QLOG_ERROR() << "Can't load Mojang account info from JSON object. Username field is missing or of the wrong type.";
+		return nullptr;
+	}
+	
+	QString username = object.value("username").toString("");
+	QString clientToken = object.value("clientToken").toString("");
+	QString accessToken = object.value("accessToken").toString("");
+
+	QJsonArray profileArray = object.value("profiles").toArray();
+	if (profileArray.size() < 1)
+	{
+		QLOG_ERROR() << "Can't load Mojang account with username \"" << username << "\". No profiles found.";
+		return nullptr;
+	}
+
+	ProfileList profiles;
+	for (QJsonValue profileVal : profileArray)
+	{
+		QJsonObject profileObject = profileVal.toObject();
+		QString id = profileObject.value("id").toString("");
+		QString name = profileObject.value("name").toString("");
+		if (id.isEmpty() || name.isEmpty())
+		{
+			QLOG_WARN() << "Unable to load a profile because it was missing an ID or a name.";
+			continue;
+		}
+		profiles.append(AccountProfile(id, name));
+	}
+
+	MojangAccountPtr account(new MojangAccount(username, clientToken, accessToken));
+	account->loadProfiles(profiles);
+
+	// Get the currently selected profile.
+	QString currentProfile = object.value("activeProfile").toString("");
+	if (!currentProfile.isEmpty())
+		account->setProfile(currentProfile);
+
+	return account;
+}
+
+QJsonObject MojangAccount::saveToJson()
+{
+	QJsonObject json;
+	json.insert("username", username());
+	json.insert("clientToken", clientToken());
+	json.insert("accessToken", accessToken());
+
+	QJsonArray profileArray;
+	for (AccountProfile profile : m_profiles)
+	{
+		QJsonObject profileObj;
+		profileObj.insert("id", profile.id());
+		profileObj.insert("name", profile.name());
+		profileArray.append(profileObj);
+	}
+	json.insert("profiles", profileArray);
+
+	if (currentProfile() != nullptr)
+		json.insert("activeProfile", currentProfile()->id());
+
+	return json;
+}
+
+
+AccountProfile::AccountProfile(const QString& id, const QString& name)
+{
+	m_id = id;
+	m_name = name;
+}
+
+AccountProfile::AccountProfile(const AccountProfile& other)
+{
+	m_id = other.m_id;
+	m_name = other.m_name;
+}
+
+QString AccountProfile::id() const
+{
+	return m_id;
+}
+
+QString AccountProfile::name() const
+{
+	return m_name;
+}
+
+