Dehardcode account providers (#38)

* Dehardcode account providers

* Fix crash on creation

* Add dynamic 'add account dialog' provider selector

* Fix typo and add newlines

* Rename loginType to provider

* Rename MojangAccount to Account and MojangAccountList to AccountList

* Fix json save error
This commit is contained in:
Max
2021-06-14 12:51:25 +03:00
committed by GitHub
parent 396400b60d
commit 167b6bd405
39 changed files with 398 additions and 261 deletions

View File

@@ -14,7 +14,7 @@
*/
#include "YggdrasilTask.h"
#include "MojangAccount.h"
#include "Account.h"
#include <QObject>
#include <QString>
@@ -27,7 +27,7 @@
#include <QDebug>
YggdrasilTask::YggdrasilTask(MojangAccount *account, QObject *parent)
YggdrasilTask::YggdrasilTask(Account *account, QObject *parent)
: Task(parent), m_account(account)
{
changeState(STATE_CREATED);
@@ -40,9 +40,8 @@ void YggdrasilTask::executeTask()
// Get the content of the request we're going to send to the server.
QJsonDocument doc(getRequestContent());
QUrl reqUrl(m_account->authEndpoint() + getEndpoint());
qDebug() << m_account->authEndpoint() + getEndpoint();
QNetworkRequest netRequest(reqUrl);
QUrl reqUrl(m_account->provider()->authEndpoint() + getEndpoint());
QNetworkRequest netRequest(reqUrl);
netRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QByteArray requestData = doc.toJson();