Implemented login system.
This commit is contained in:
parent
a416c58a93
commit
e475f5d512
@ -17,6 +17,7 @@ include_directories(hacks)
|
|||||||
|
|
||||||
#### Find the required Qt parts ####
|
#### Find the required Qt parts ####
|
||||||
find_package(Qt5Widgets)
|
find_package(Qt5Widgets)
|
||||||
|
find_package(Qt5Network)
|
||||||
#find_package(Qt5Declarative)
|
#find_package(Qt5Declarative)
|
||||||
|
|
||||||
include_directories(${Qt5Widgets_INCLUDE_DIRS})
|
include_directories(${Qt5Widgets_INCLUDE_DIRS})
|
||||||
@ -171,7 +172,7 @@ QT5_WRAP_UI(MULTIMC_UI ${MULTIMC5_UIS})
|
|||||||
QT5_ADD_RESOURCES(MULTIMC_QRC multimc.qrc)
|
QT5_ADD_RESOURCES(MULTIMC_QRC multimc.qrc)
|
||||||
|
|
||||||
add_executable(MultiMC ${MULTIMC_SOURCES} ${MULTIMC_HEADERS} ${MULTIMC_UI} ${MULTIMC_QRC})
|
add_executable(MultiMC ${MULTIMC_SOURCES} ${MULTIMC_HEADERS} ${MULTIMC_UI} ${MULTIMC_QRC})
|
||||||
qt5_use_modules(MultiMC Widgets)
|
qt5_use_modules(MultiMC Widgets Network)
|
||||||
target_link_libraries(MultiMC quazip patchlib ${MultiMC_LINK_ADDITIONAL_LIBS})
|
target_link_libraries(MultiMC quazip patchlib ${MultiMC_LINK_ADDITIONAL_LIBS})
|
||||||
add_dependencies(MultiMC MultiMCLauncher)
|
add_dependencies(MultiMC MultiMCLauncher)
|
||||||
install(TARGETS MultiMC RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
|
install(TARGETS MultiMC RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
|
||||||
|
@ -15,17 +15,27 @@
|
|||||||
|
|
||||||
#include "loginresponse.h"
|
#include "loginresponse.h"
|
||||||
|
|
||||||
LoginResponse::LoginResponse(const QString& username, const QString& sessionID, QObject *parent) :
|
LoginResponse::LoginResponse(const QString& username, const QString& sessionID,
|
||||||
|
qint64 latestVersion, QObject *parent) :
|
||||||
QObject(parent)
|
QObject(parent)
|
||||||
{
|
{
|
||||||
this->username = username;
|
this->username = username;
|
||||||
this->sessionID = sessionID;
|
this->sessionID = sessionID;
|
||||||
|
this->latestVersion = latestVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
LoginResponse::LoginResponse()
|
||||||
|
{
|
||||||
|
this->username = "";
|
||||||
|
this->sessionID = "";
|
||||||
|
this->latestVersion = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
LoginResponse::LoginResponse(const LoginResponse &other)
|
LoginResponse::LoginResponse(const LoginResponse &other)
|
||||||
{
|
{
|
||||||
this->username = other.username;
|
this->username = other.getUsername();
|
||||||
this->sessionID = other.sessionID;
|
this->sessionID = other.getSessionID();
|
||||||
|
this->latestVersion = other.getLatestVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString LoginResponse::getUsername() const
|
QString LoginResponse::getUsername() const
|
||||||
@ -47,3 +57,13 @@ void LoginResponse::setSessionID(const QString& sessionID)
|
|||||||
{
|
{
|
||||||
this->sessionID = sessionID;
|
this->sessionID = sessionID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qint64 LoginResponse::getLatestVersion() const
|
||||||
|
{
|
||||||
|
return latestVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
void LoginResponse::setLatestVersion(qint64 v)
|
||||||
|
{
|
||||||
|
this->latestVersion = v;
|
||||||
|
}
|
||||||
|
@ -22,7 +22,9 @@ class LoginResponse : public QObject
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit LoginResponse(const QString &username, const QString &sessionID, QObject *parent = 0);
|
explicit LoginResponse(const QString &username, const QString &sessionID,
|
||||||
|
qint64 latestVersion, QObject *parent = 0);
|
||||||
|
LoginResponse();
|
||||||
LoginResponse(const LoginResponse& other);
|
LoginResponse(const LoginResponse& other);
|
||||||
|
|
||||||
QString getUsername() const;
|
QString getUsername() const;
|
||||||
@ -31,9 +33,15 @@ public:
|
|||||||
QString getSessionID() const;
|
QString getSessionID() const;
|
||||||
void setSessionID(const QString& sessionID);
|
void setSessionID(const QString& sessionID);
|
||||||
|
|
||||||
|
qint64 getLatestVersion() const;
|
||||||
|
void setLatestVersion(qint64 v);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString username;
|
QString username;
|
||||||
QString sessionID;
|
QString sessionID;
|
||||||
|
qint64 latestVersion;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_METATYPE(LoginResponse)
|
||||||
|
|
||||||
#endif // LOGINRESPONSE_H
|
#endif // LOGINRESPONSE_H
|
||||||
|
@ -142,14 +142,16 @@ void MainWindow::doLogin(const QString &errorMsg)
|
|||||||
TaskDialog* tDialog = new TaskDialog(this);
|
TaskDialog* tDialog = new TaskDialog(this);
|
||||||
LoginTask* loginTask = new LoginTask(uInfo, tDialog);
|
LoginTask* loginTask = new LoginTask(uInfo, tDialog);
|
||||||
connect(loginTask, SIGNAL(loginComplete(LoginResponse)),
|
connect(loginTask, SIGNAL(loginComplete(LoginResponse)),
|
||||||
SLOT(onLoginComplete(LoginResponse)));
|
SLOT(onLoginComplete(LoginResponse)), Qt::QueuedConnection);
|
||||||
connect(loginTask, SIGNAL(loginFailed(QString)),
|
connect(loginTask, SIGNAL(loginFailed(QString)),
|
||||||
SLOT(doLogin(QString)));
|
SLOT(doLogin(QString)), Qt::QueuedConnection);
|
||||||
tDialog->exec(loginTask);
|
tDialog->exec(loginTask);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::onLoginComplete(LoginResponse response)
|
void MainWindow::onLoginComplete(LoginResponse response)
|
||||||
{
|
{
|
||||||
|
QMessageBox::information(this, "Login Successful",
|
||||||
|
QString("Logged in as %1 with session ID %2.").
|
||||||
|
arg(response.getUsername(), response.getSessionID()));
|
||||||
}
|
}
|
||||||
|
4
main.cpp
4
main.cpp
@ -19,6 +19,7 @@
|
|||||||
|
|
||||||
#include "data/appsettings.h"
|
#include "data/appsettings.h"
|
||||||
|
|
||||||
|
#include "data/loginresponse.h"
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
@ -28,6 +29,9 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
settings = new AppSettings(&app);
|
settings = new AppSettings(&app);
|
||||||
|
|
||||||
|
// Register meta types.
|
||||||
|
qRegisterMetaType<LoginResponse>("LoginResponse");
|
||||||
|
|
||||||
MainWindow mainWin;
|
MainWindow mainWin;
|
||||||
mainWin.show();
|
mainWin.show();
|
||||||
|
|
||||||
|
@ -15,6 +15,15 @@
|
|||||||
|
|
||||||
#include "logintask.h"
|
#include "logintask.h"
|
||||||
|
|
||||||
|
#include <QStringList>
|
||||||
|
|
||||||
|
#include <QtNetwork/QNetworkAccessManager>
|
||||||
|
#include <QtNetwork/QNetworkReply>
|
||||||
|
#include <QtNetwork/QNetworkRequest>
|
||||||
|
|
||||||
|
#include <QUrl>
|
||||||
|
#include <QUrlQuery>
|
||||||
|
|
||||||
LoginTask::LoginTask(const UserInfo &uInfo, QObject *parent) :
|
LoginTask::LoginTask(const UserInfo &uInfo, QObject *parent) :
|
||||||
Task(parent), uInfo(uInfo)
|
Task(parent), uInfo(uInfo)
|
||||||
{
|
{
|
||||||
@ -25,20 +34,88 @@ void LoginTask::executeTask()
|
|||||||
{
|
{
|
||||||
setStatus("Logging in...");
|
setStatus("Logging in...");
|
||||||
|
|
||||||
// TODO: PLACEHOLDER
|
QNetworkAccessManager netMgr;
|
||||||
for (int p = 0; p < 100; p++)
|
connect(&netMgr, SIGNAL(finished(QNetworkReply*)),
|
||||||
|
SLOT(processNetReply(QNetworkReply*)));
|
||||||
|
|
||||||
|
QUrl loginURL("https://login.minecraft.net/");
|
||||||
|
QNetworkRequest netRequest(loginURL);
|
||||||
|
netRequest.setHeader(QNetworkRequest::ContentTypeHeader,
|
||||||
|
"application/x-www-form-urlencoded");
|
||||||
|
|
||||||
|
QUrlQuery params;
|
||||||
|
params.addQueryItem("user", uInfo.getUsername());
|
||||||
|
params.addQueryItem("password", uInfo.getPassword());
|
||||||
|
params.addQueryItem("version", "13");
|
||||||
|
|
||||||
|
netReply = netMgr.post(netRequest, params.query(QUrl::EncodeSpaces).toUtf8());
|
||||||
|
exec();
|
||||||
|
}
|
||||||
|
|
||||||
|
void LoginTask::processNetReply(QNetworkReply *reply)
|
||||||
|
{
|
||||||
|
// Check for errors.
|
||||||
|
switch (reply->error())
|
||||||
{
|
{
|
||||||
msleep(25);
|
case QNetworkReply::NoError:
|
||||||
setProgress(p);
|
{
|
||||||
|
// Check the response code.
|
||||||
|
int responseCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||||
|
|
||||||
|
if (responseCode == 200)
|
||||||
|
{
|
||||||
|
QString responseStr(reply->readAll());
|
||||||
|
|
||||||
|
QStringList strings = responseStr.split(":");
|
||||||
|
if (strings.count() >= 4)
|
||||||
|
{
|
||||||
|
bool parseSuccess;
|
||||||
|
qint64 latestVersion = strings[0].toLongLong(&parseSuccess);
|
||||||
|
if (parseSuccess)
|
||||||
|
{
|
||||||
|
// strings[1] is the download ticket. It isn't used anymore.
|
||||||
|
QString username = strings[2];
|
||||||
|
QString sessionID = strings[3];
|
||||||
|
|
||||||
|
LoginResponse response(username, sessionID, latestVersion);
|
||||||
|
emit loginComplete(response);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
emit loginFailed("Failed to parse Minecraft version string.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (responseStr.toLower() == "bad login")
|
||||||
|
emit loginFailed("Invalid username or password.");
|
||||||
|
else if (responseStr.toLower() == "old version")
|
||||||
|
emit loginFailed("Launcher outdated, please update.");
|
||||||
|
else
|
||||||
|
emit loginFailed("Login failed: " + responseStr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (responseCode == 503)
|
||||||
|
{
|
||||||
|
emit loginFailed("The login servers are currently unavailable. "
|
||||||
|
"Check http://help.mojang.com/ for more info.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
emit loginFailed(QString("Login failed: Unknown HTTP error %1 occurred.").
|
||||||
|
arg(QString::number(responseCode)));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case QNetworkReply::OperationCanceledError:
|
||||||
|
emit loginFailed("Login canceled.");
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
emit loginFailed("Login failed: " + reply->errorString());
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (uInfo.getUsername() == "test")
|
quit();
|
||||||
{
|
|
||||||
LoginResponse response("test", "Fake Session ID");
|
|
||||||
emit loginComplete(response);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
emit loginFailed("Testing");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -21,19 +21,27 @@
|
|||||||
#include "data/userinfo.h"
|
#include "data/userinfo.h"
|
||||||
#include "data/loginresponse.h"
|
#include "data/loginresponse.h"
|
||||||
|
|
||||||
|
//class QNetworkAccessManager;
|
||||||
|
class QNetworkReply;
|
||||||
|
|
||||||
class LoginTask : public Task
|
class LoginTask : public Task
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit LoginTask(const UserInfo& uInfo, QObject *parent = 0);
|
explicit LoginTask(const UserInfo& uInfo, QObject *parent = 0);
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void processNetReply(QNetworkReply* reply);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void loginComplete(const LoginResponse& loginResponse);
|
void loginComplete(LoginResponse loginResponse);
|
||||||
void loginFailed(const QString& errorMsg);
|
void loginFailed(const QString& errorMsg);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void executeTask();
|
void executeTask();
|
||||||
|
|
||||||
|
QNetworkReply* netReply;
|
||||||
|
|
||||||
UserInfo uInfo;
|
UserInfo uInfo;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user