From f525b7e6a99d97b73591de392878ea87ca2ab9fb Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Fri, 23 Feb 2018 22:27:59 +0200 Subject: Replace login request with the one from matrix-structs --- src/MatrixClient.cc | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'src/MatrixClient.cc') diff --git a/src/MatrixClient.cc b/src/MatrixClient.cc index 929a070f..af50e5b9 100644 --- a/src/MatrixClient.cc +++ b/src/MatrixClient.cc @@ -28,7 +28,6 @@ #include #include -#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(); -- cgit 1.5.1