Nuke dead code
This commit is contained in:
Andrew
@ -1,293 +0,0 @@
|
||||
/* 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 "LoginTask.h"
|
||||
#include "MultiMC.h"
|
||||
#include <settingsobject.h>
|
||||
|
||||
#include <QStringList>
|
||||
|
||||
#include <QNetworkReply>
|
||||
#include <QNetworkRequest>
|
||||
|
||||
#include <QUrl>
|
||||
#include <QUrlQuery>
|
||||
#include <QJsonParseError>
|
||||
#include <QJsonObject>
|
||||
|
||||
LoginTask::LoginTask(const PasswordLogin &loginInfo, QObject *parent)
|
||||
: Task(parent), loginInfo(loginInfo)
|
||||
{
|
||||
}
|
||||
|
||||
void LoginTask::executeTask()
|
||||
{
|
||||
yggdrasilLogin();
|
||||
}
|
||||
|
||||
void LoginTask::legacyLogin()
|
||||
{
|
||||
setStatus(tr("Logging in..."));
|
||||
auto worker = MMC->qnam();
|
||||
connect(worker.get(), SIGNAL(finished(QNetworkReply *)), this,
|
||||
SLOT(processLegacyReply(QNetworkReply *)));
|
||||
|
||||
QUrl loginURL("https://login.minecraft.net/");
|
||||
QNetworkRequest netRequest(loginURL);
|
||||
netRequest.setHeader(QNetworkRequest::ContentTypeHeader,
|
||||
"application/x-www-form-urlencoded");
|
||||
|
||||
QUrlQuery params;
|
||||
params.addQueryItem("user", loginInfo.username);
|
||||
params.addQueryItem("password", loginInfo.password);
|
||||
params.addQueryItem("version", "13");
|
||||
|
||||
netReply = worker->post(netRequest, params.query(QUrl::EncodeSpaces).toUtf8());
|
||||
}
|
||||
|
||||
void LoginTask::parseLegacyReply(QByteArray data)
|
||||
{
|
||||
QString responseStr = QString::fromUtf8(data);
|
||||
|
||||
QStringList strings = responseStr.split(":");
|
||||
if (strings.count() >= 4)
|
||||
{
|
||||
// strings[1] is the download ticket. It isn't used anymore.
|
||||
QString username = strings[2];
|
||||
QString sessionID = strings[3];
|
||||
/*
|
||||
struct LoginResponse
|
||||
{
|
||||
QString username;
|
||||
QString session_id;
|
||||
QString player_name;
|
||||
QString player_id;
|
||||
QString client_id;
|
||||
};
|
||||
*/
|
||||
result = {username, sessionID, username, QString()};
|
||||
emitSucceeded();
|
||||
}
|
||||
else
|
||||
{
|
||||
if (responseStr.toLower() == "bad login")
|
||||
emitFailed(tr("Invalid username or password."));
|
||||
else if (responseStr.toLower() == "old version")
|
||||
emitFailed(tr("Launcher outdated, please update."));
|
||||
else
|
||||
emitFailed(tr("Login failed: %1").arg(responseStr));
|
||||
}
|
||||
}
|
||||
|
||||
void LoginTask::processLegacyReply(QNetworkReply *reply)
|
||||
{
|
||||
processReply(reply, &LoginTask::parseLegacyReply, &LoginTask::parseLegacyError);
|
||||
}
|
||||
|
||||
void LoginTask::processYggdrasilReply(QNetworkReply *reply)
|
||||
{
|
||||
processReply(reply, &LoginTask::parseYggdrasilReply, &LoginTask::parseYggdrasilError);
|
||||
}
|
||||
|
||||
void LoginTask::processReply(QNetworkReply *reply,
|
||||
std::function<void(LoginTask *, QByteArray)> parser,
|
||||
std::function<QString(LoginTask *, QNetworkReply *)> errorHandler)
|
||||
{
|
||||
if (netReply != reply)
|
||||
return;
|
||||
// Check for errors.
|
||||
switch (reply->error())
|
||||
{
|
||||
case QNetworkReply::NoError:
|
||||
{
|
||||
// Check the response code.
|
||||
int responseCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
|
||||
switch (responseCode)
|
||||
{
|
||||
case 200:
|
||||
parser(this, reply->readAll());
|
||||
break;
|
||||
|
||||
default:
|
||||
emitFailed(tr("Login failed: Unknown HTTP code %1 encountered.").arg(responseCode));
|
||||
break;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case QNetworkReply::OperationCanceledError:
|
||||
emitFailed(tr("Login canceled."));
|
||||
break;
|
||||
|
||||
default:
|
||||
emitFailed(errorHandler(this, reply));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
QString LoginTask::parseLegacyError(QNetworkReply *reply)
|
||||
{
|
||||
int responseCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
|
||||
switch (responseCode)
|
||||
{
|
||||
case 403:
|
||||
return tr("Invalid username or password.");
|
||||
|
||||
case 503:
|
||||
return tr("The login servers are currently unavailable. Check "
|
||||
"http://help.mojang.com/ for more info.");
|
||||
|
||||
default:
|
||||
QLOG_DEBUG() << "Login failed with QNetworkReply code:" << reply->error();
|
||||
return tr("Login failed: %1").arg(reply->errorString());
|
||||
}
|
||||
}
|
||||
|
||||
QString LoginTask::parseYggdrasilError(QNetworkReply *reply)
|
||||
{
|
||||
QByteArray data = reply->readAll();
|
||||
QJsonParseError jsonError;
|
||||
QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
|
||||
|
||||
// If there are JSON errors fall back to using the legacy error handling using HTTP status
|
||||
// codes
|
||||
if (jsonError.error != QJsonParseError::NoError)
|
||||
{
|
||||
return parseLegacyError(reply);
|
||||
}
|
||||
|
||||
if (!jsonDoc.isObject())
|
||||
{
|
||||
return parseLegacyError(reply);
|
||||
}
|
||||
|
||||
QJsonObject root = jsonDoc.object();
|
||||
|
||||
// QString error = root.value("error").toString();
|
||||
QString errorMessage = root.value("errorMessage").toString();
|
||||
|
||||
if (errorMessage.isEmpty())
|
||||
{
|
||||
return parseLegacyError(reply);
|
||||
}
|
||||
|
||||
return tr("Login failed: ") + errorMessage;
|
||||
}
|
||||
|
||||
void LoginTask::yggdrasilLogin()
|
||||
{
|
||||
setStatus(tr("Logging in..."));
|
||||
auto worker = MMC->qnam();
|
||||
connect(worker.get(), SIGNAL(finished(QNetworkReply *)), this,
|
||||
SLOT(processYggdrasilReply(QNetworkReply *)));
|
||||
|
||||
/*
|
||||
{
|
||||
// agent def. version might be incremented at some point
|
||||
"agent":{"name":"Minecraft","version":1},
|
||||
"username": "mojang account name",
|
||||
"password": "mojang account password",
|
||||
// client token is optional. but we supply one anyway
|
||||
"clientToken": "client identifier"
|
||||
}
|
||||
*/
|
||||
|
||||
QUrl loginURL("https://authserver.mojang.com/authenticate");
|
||||
QNetworkRequest netRequest(loginURL);
|
||||
netRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
|
||||
|
||||
auto settings = MMC->settings();
|
||||
QString clientToken = settings->get("YggdrasilClientToken").toString();
|
||||
// escape the {}
|
||||
clientToken.remove('{');
|
||||
clientToken.remove('}');
|
||||
// create the request
|
||||
QJsonObject root;
|
||||
QJsonObject agent;
|
||||
agent.insert("name", QString("Minecraft"));
|
||||
agent.insert("version", QJsonValue(1));
|
||||
root.insert("agent", agent);
|
||||
root.insert("username", loginInfo.username);
|
||||
root.insert("password", loginInfo.password);
|
||||
root.insert("clientToken", clientToken);
|
||||
QJsonDocument requestDoc(root);
|
||||
netReply = worker->post(netRequest, requestDoc.toJson());
|
||||
}
|
||||
|
||||
/*
|
||||
{
|
||||
"accessToken": "random access token", // hexadecimal
|
||||
"clientToken": "client identifier", // identical to the one received
|
||||
"availableProfiles": [ // only present if the agent field was received
|
||||
{
|
||||
"id": "profile identifier", // hexadecimal
|
||||
"name": "player name"
|
||||
}
|
||||
],
|
||||
"selectedProfile": { // only present if the agent field was received
|
||||
"id": "profile identifier",
|
||||
"name": "player name"
|
||||
}
|
||||
}
|
||||
*/
|
||||
void LoginTask::parseYggdrasilReply(QByteArray data)
|
||||
{
|
||||
QJsonParseError jsonError;
|
||||
QLOG_DEBUG() << data;
|
||||
QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
|
||||
if (jsonError.error != QJsonParseError::NoError)
|
||||
{
|
||||
emitFailed(tr("Login failed: %1").arg(jsonError.errorString()));
|
||||
return;
|
||||
}
|
||||
|
||||
if (!jsonDoc.isObject())
|
||||
{
|
||||
emitFailed(tr("Login failed: BAD FORMAT #1"));
|
||||
return;
|
||||
}
|
||||
|
||||
QJsonObject root = jsonDoc.object();
|
||||
|
||||
QString accessToken = root.value("accessToken").toString();
|
||||
QString clientToken = root.value("clientToken").toString();
|
||||
QString playerID;
|
||||
QString playerName;
|
||||
auto selectedProfile = root.value("selectedProfile");
|
||||
if (selectedProfile.isObject())
|
||||
{
|
||||
auto selectedProfileO = selectedProfile.toObject();
|
||||
playerID = selectedProfileO.value("id").toString();
|
||||
playerName = selectedProfileO.value("name").toString();
|
||||
}
|
||||
|
||||
QString sessionID = "token:" + accessToken + ":" + playerID;
|
||||
/*
|
||||
struct LoginResponse
|
||||
{
|
||||
QString username;
|
||||
QString session_id;
|
||||
QString player_name;
|
||||
QString player_id;
|
||||
QString client_id;
|
||||
};
|
||||
*/
|
||||
|
||||
result = {loginInfo.username, sessionID, playerName, playerID, accessToken};
|
||||
emitSucceeded();
|
||||
}
|
||||
@ -1,76 +0,0 @@
|
||||
/* 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.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "logic/tasks/Task.h"
|
||||
#include <QMap>
|
||||
|
||||
struct PasswordLogin
|
||||
{
|
||||
QString username;
|
||||
QString password;
|
||||
};
|
||||
|
||||
struct User
|
||||
{
|
||||
QString id;
|
||||
QMap<QString, QString> properties;
|
||||
};
|
||||
|
||||
struct LoginResponse
|
||||
{
|
||||
QString username;
|
||||
QString session_id; // session id is a combination of player id and the access token
|
||||
QString player_name;
|
||||
QString player_id;
|
||||
QString access_token;
|
||||
User user; // FIXME: no idea what this really is yet. anything relevant?
|
||||
};
|
||||
|
||||
class QNetworkReply;
|
||||
|
||||
class LoginTask : public Task
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit LoginTask(const PasswordLogin &loginInfo, QObject *parent = 0);
|
||||
LoginResponse getResult()
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
||||
protected
|
||||
slots:
|
||||
void legacyLogin();
|
||||
void processLegacyReply(QNetworkReply *reply);
|
||||
void parseLegacyReply(QByteArray data);
|
||||
QString parseLegacyError(QNetworkReply *reply);
|
||||
|
||||
void yggdrasilLogin();
|
||||
void processYggdrasilReply(QNetworkReply *reply);
|
||||
void parseYggdrasilReply(QByteArray data);
|
||||
QString parseYggdrasilError(QNetworkReply *reply);
|
||||
|
||||
void processReply(QNetworkReply *reply, std::function<void(LoginTask *, QByteArray)>,
|
||||
std::function<QString(LoginTask *, QNetworkReply *)>);
|
||||
|
||||
protected:
|
||||
void executeTask();
|
||||
|
||||
LoginResponse result;
|
||||
QNetworkReply *netReply;
|
||||
PasswordLogin loginInfo;
|
||||
};
|
||||
Reference in New Issue
Block a user