Merge branch 'feature_yggdrasil' into develop

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

Fix missing session id functionality for legacy and old onesix.

1 files changed, 182 insertions, 0 deletions

diff --git a/logic/auth/YggdrasilTask.cpp b/logic/auth/YggdrasilTask.cpp
new file mode 100644
index 00000000..39dfb749
--- /dev/null
+++ b/logic/auth/YggdrasilTask.cpp
@@ -0,0 +1,182 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * 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 <logic/auth/YggdrasilTask.h>
+
+#include <QObject>
+#include <QString>
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QNetworkReply>
+#include <QByteArray>
+
+#include <MultiMC.h>
+#include <logic/auth/MojangAccount.h>
+
+YggdrasilTask::YggdrasilTask(MojangAccountPtr account, QObject* parent) : Task(parent)
+{
+	m_error = nullptr;
+	m_account = account;
+}
+
+
+YggdrasilTask::~YggdrasilTask()
+{
+	if (m_error)
+		delete m_error;
+}
+
+void YggdrasilTask::executeTask()
+{
+	setStatus(getStateMessage(STATE_SENDING_REQUEST));
+
+	// Get the content of the request we're going to send to the server.
+	QJsonDocument doc(getRequestContent());
+
+	auto worker = MMC->qnam();
+	connect(worker.get(), SIGNAL(finished(QNetworkReply*)), this,
+			SLOT(processReply(QNetworkReply*)));
+
+	QUrl reqUrl("https://authserver.mojang.com/" + getEndpoint());
+	QNetworkRequest netRequest(reqUrl);
+	netRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+	
+	m_netReply = worker->post(netRequest, doc.toJson());
+}
+
+void YggdrasilTask::processReply(QNetworkReply* reply)
+{
+	setStatus(getStateMessage(STATE_PROCESSING_RESPONSE));
+
+	if (m_netReply != reply)
+		// Wrong reply for some reason...
+		return;
+
+	// Check for errors.
+	switch (reply->error())
+	{
+		case QNetworkReply::NoError:
+		{
+			// Try to parse the response regardless of the response code.
+			// Sometimes the auth server will give more information and an error code.
+			QJsonParseError jsonError;
+			QByteArray replyData = reply->readAll();
+			QJsonDocument doc = QJsonDocument::fromJson(replyData, &jsonError);
+
+			// Check the response code.
+			int responseCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+
+			switch (responseCode)
+			{
+				case 200:
+				{
+					// If the response code was 200, then there shouldn't be an error. Make sure anyways.
+					switch (jsonError.error)
+					{
+						case QJsonParseError::NoError:
+							if (!processResponse(doc.object()))
+							{
+								YggdrasilTask::Error* err = getError();
+								if (err)
+									emitFailed(err->getErrorMessage());
+								else
+									emitFailed(tr("An unknown error occurred when processing the response from the authentication server."));
+							}
+							else
+							{
+								emitSucceeded();
+							}
+						break;
+
+						default:
+						emitFailed(tr("Failed to parse Yggdrasil JSON response: \"%1\".").arg(jsonError.errorString()));
+						break;
+					}
+					break;
+				}
+
+				default:
+					// If the response code was something else, then Yggdrasil may have given us information about the error.
+					// If we can parse the response, then get information from it. Otherwise just say there was an unknown error.
+					switch (jsonError.error)
+					{
+						case QJsonParseError::NoError:
+							// We were able to parse the server's response. Woo!
+							// Call processError. If a subclass has overridden it then they'll handle their stuff there.
+							processError(doc.object());
+							break;
+
+						default:
+							// The server didn't say anything regarding the error. Give the user an unknown error.
+							emitFailed(tr("Login failed: Unknown HTTP code %1 encountered.").arg(responseCode));
+							break;
+					}
+					break;
+			}
+
+			break;
+		}
+
+		case QNetworkReply::OperationCanceledError:
+			emitFailed(tr("Login canceled."));
+			break;
+
+		default:
+			emitFailed(tr("An unknown error occurred when trying to communicate with the authentication server."));
+			break;
+	}
+}
+
+QString YggdrasilTask::processError(QJsonObject responseData)
+{
+	QJsonValue errorVal = responseData.value("error");
+	QJsonValue msgVal = responseData.value("errorMessage");
+	QJsonValue causeVal = responseData.value("cause");
+
+	if (errorVal.isString() && msgVal.isString() && causeVal.isString())
+	{
+		m_error = new Error(errorVal.toString(""), msgVal.toString(""), causeVal.toString(""));
+		return m_error->getDisplayMessage();
+	}
+	else
+	{
+		// Error is not in standard format. Don't set m_error and return unknown error.
+		return tr("An unknown Yggdrasil error occurred.");
+	}
+}
+
+QString YggdrasilTask::getStateMessage(const YggdrasilTask::State state) const
+{
+	switch (state)
+	{
+	case STATE_SENDING_REQUEST:
+		return tr("Sending request to auth servers.");
+	case STATE_PROCESSING_RESPONSE:
+		return tr("Processing response from servers.");
+	default:
+		return tr("Processing. Please wait.");
+	}
+}
+
+YggdrasilTask::Error *YggdrasilTask::getError() const
+{
+	return this->m_error;
+}
+
+MojangAccountPtr YggdrasilTask::getMojangAccount() const
+{
+	return this->m_account;
+}
+