rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace login request with the one from matrix-structs

This commit is contained in:
Konstantinos Sideris 2018-02-23 22:27:59 +02:00
parent fb850787d7
commit f525b7e6a9
6 changed files with 17 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -196,7 +196,6 @@ set(SRC_FILES
src/Deserializable.cc
src/InviteeItem.cc
src/InputValidator.cc
src/Login.cc
src/LoginPage.cc
src/MainWindow.cc
src/MatrixClient.cc

38
include/Login.h
View File

@ -1,38 +0,0 @@
/*
* nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <QJsonDocument>
#include "Deserializable.h"
class LoginRequest
{
public:
LoginRequest();
LoginRequest(QString username, QString password);
QByteArray serialize() noexcept;
void setPassword(QString password) { password_ = password; };
void setUser(QString username) { user_ = username; };
private:
QString user_;
QString password_;
};

3
include/Register.h
View File

@ -17,10 +17,9 @@
#pragma once
#include "Deserializable.h"
#include <QJsonDocument>
class Deserializable;
class RegisterRequest
{
public:

49
src/Login.cc
View File

@ -1,49 +0,0 @@
/*
* nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Login.h"
#include "Deserializable.h"
LoginRequest::LoginRequest() {}
LoginRequest::LoginRequest(QString username, QString password)
: user_(username)
, password_(password)
{}
QByteArray
LoginRequest::serialize() noexcept
{
#if defined(Q_OS_MAC)
QString initialDeviceName("nheko on Mac OS");
#elif defined(Q_OS_LINUX)
QString initialDeviceName("nheko on Linux");
#elif defined(Q_OS_WIN)
QString initialDeviceName("nheko on Windows");
#else
QString initialDeviceName("nheko");
#endif
QJsonObject body{
{"type", "m.login.password"},
{"user", user_},
{"password", password_},
{"initial_device_display_name", initialDeviceName},
};
return QJsonDocument(body).toJson(QJsonDocument::Compact);
}

19
src/MatrixClient.cc
View File

@ -28,7 +28,6 @@
#include <QSettings>
#include <QUrlQuery>
#include "Login.h"
#include "MatrixClient.h"
#include "Register.h"
@ -101,9 +100,23 @@ MatrixClient::login(const QString &username, const QString &password) noexcept
QNetworkRequest request(endpoint);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
LoginRequest body(username, password);
mtx::requests::Login login;
login.user = username.toStdString();
login.password = password.toStdString();
login.initial_device_display_name = "nheko";
auto reply = post(request, body.serialize());
#if defined(Q_OS_MAC)
login.initial_device_display_name = "nheko on Mac OS";
#elif defined(Q_OS_LINUX)
login.initial_device_display_name = "nheko on Linux";
#elif defined(Q_OS_WIN)
login.initial_device_display_name = "nheko on Windows";
#endif
json j = login;
auto data = QByteArray::fromStdString(j.dump());
auto reply = post(request, data);
connect(reply, &QNetworkReply::finished, this, [this, reply]() {
reply->deleteLater();

2
src/Register.cc
View File

@ -15,8 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Deserializable.h"
#include "Register.h"
RegisterRequest::RegisterRequest(const QString &username, const QString &password)