diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/MainWindow.cc | 11 | ||||
| -rw-r--r-- | src/MatrixClient.cc | 68 | ||||
| -rw-r--r-- | src/Profile.cc | 6 | ||||
| -rw-r--r-- | src/Register.cc | 63 |
4 files changed, 130 insertions, 18 deletions
diff --git a/src/MainWindow.cc b/src/MainWindow.cc index 3989e096..2b4103ff 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cc @@ -57,6 +57,11 @@ MainWindow::MainWindow(QWidget *parent) this, SLOT(matrixRegister(const QString &, const QString &, const QString &))); + connect(matrix_client_, + SIGNAL(registerError(const QString &)), + register_page_, + SLOT(registerError(const QString &))); + connect(matrix_client_, SIGNAL(loginError(QString)), login_page_, SLOT(loginError(QString))); connect(matrix_client_, SIGNAL(loginSuccess(QString, QString, QString)), @@ -66,8 +71,7 @@ MainWindow::MainWindow(QWidget *parent) void MainWindow::matrixLogin(const QString &username, const QString &password, const QString &home_server) { - qDebug() << "About to login into Matrix"; - qDebug() << "Userame: " << username; + qDebug() << "Logging in..." << username; matrix_client_->setServer(home_server); matrix_client_->login(username, password); @@ -88,9 +92,8 @@ void MainWindow::showChatPage(QString userid, QString homeserver, QString token) void MainWindow::matrixRegister(const QString &username, const QString &password, const QString &server) { - Q_UNUSED(password); - qDebug() << "Registering" << username << "at" << server; + matrix_client_->registerUser(username, password, server); } void MainWindow::showWelcomePage() diff --git a/src/MatrixClient.cc b/src/MatrixClient.cc index 725aede6..c376a53f 100644 --- a/src/MatrixClient.cc +++ b/src/MatrixClient.cc @@ -27,6 +27,7 @@ #include "Login.h" #include "MatrixClient.h" #include "Profile.h" +#include "Register.h" MatrixClient::MatrixClient(QString server, QObject *parent) : QNetworkAccessManager(parent) @@ -70,14 +71,10 @@ void MatrixClient::onLoginResponse(QNetworkReply *reply) return; } - if (status_code != 200) { - qDebug() << "Login response: status code " << status_code; - - if (status_code >= 400) { - qWarning() << "Login error: " << reply->errorString(); - emit loginError("An unknown error occured. Please try again."); - return; - } + if (status_code >= 400) { + qWarning() << "Login error: " << reply->errorString(); + emit loginError("An unknown error occured. Please try again."); + return; } auto data = reply->readAll(); @@ -100,7 +97,31 @@ void MatrixClient::onRegisterResponse(QNetworkReply *reply) { reply->deleteLater(); - qDebug() << "Handling the register response"; + int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); + + auto data = reply->readAll(); + auto json = QJsonDocument::fromJson(data); + + if (status == 0 || status >= 400) { + if (json.isObject() && json.object().contains("error")) + emit registerError(json.object().value("error").toString()); + else + emit registerError(reply->errorString()); + + return; + } + + RegisterResponse response; + + try { + response.deserialize(json); + emit registerSuccess(response.getUserId(), + response.getHomeServer(), + response.getAccessToken()); + } catch (DeserializationException &e) { + qWarning() << "Register" << e.what(); + emit registerError("Received malformed response."); + } } void MatrixClient::onGetOwnProfileResponse(QNetworkReply *reply) @@ -123,7 +144,7 @@ void MatrixClient::onGetOwnProfileResponse(QNetworkReply *reply) response.deserialize(json); emit getOwnProfileResponse(response.getAvatarUrl(), response.getDisplayName()); } catch (DeserializationException &e) { - qWarning() << "Profile malformed response" << e.what(); + qWarning() << "Profile:" << e.what(); } } @@ -209,7 +230,7 @@ void MatrixClient::onSendTextMessageResponse(QNetworkReply *reply) auto object = json.object(); if (!object.contains("event_id")) { - qDebug() << "SendTextMessage: missnig event_id from response"; + qDebug() << "SendTextMessage: missing event_id from response"; return; } @@ -230,14 +251,19 @@ void MatrixClient::onResponse(QNetworkReply *reply) break; case Endpoint::Register: onRegisterResponse(reply); + break; case Endpoint::GetOwnProfile: onGetOwnProfileResponse(reply); + break; case Endpoint::InitialSync: onInitialSyncResponse(reply); + break; case Endpoint::Sync: onSyncResponse(reply); + break; case Endpoint::SendTextMessage: onSendTextMessageResponse(reply); + break; default: break; } @@ -257,6 +283,26 @@ void MatrixClient::login(const QString &username, const QString &password) reply->setProperty("endpoint", Endpoint::Login); } +void MatrixClient::registerUser(const QString &user, const QString &pass, const QString &server) +{ + setServer(server); + + QUrlQuery query; + query.addQueryItem("kind", "user"); + + QUrl endpoint(server_); + endpoint.setPath(api_url_ + "/register"); + endpoint.setQuery(query); + + QNetworkRequest request(QString(endpoint.toEncoded())); + request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); + + RegisterRequest body(user, pass); + + QNetworkReply *reply = post(request, body.serialize()); + reply->setProperty("endpoint", Endpoint::Register); +} + void MatrixClient::sync() { QJsonObject filter{{"room", diff --git a/src/Profile.cc b/src/Profile.cc index 2322834a..40b1b074 100644 --- a/src/Profile.cc +++ b/src/Profile.cc @@ -25,15 +25,15 @@ void ProfileResponse::deserialize(const QJsonDocument &data) throw(DeserializationException) { if (!data.isObject()) - throw DeserializationException("Profile response is not a JSON object"); + throw DeserializationException("Response is not a JSON object"); QJsonObject object = data.object(); if (object.value("avatar_url") == QJsonValue::Undefined) - throw DeserializationException("Profile: missing avatar_url param"); + throw DeserializationException("Missing avatar_url param"); if (object.value("displayname") == QJsonValue::Undefined) - throw DeserializationException("Profile: missing displayname param"); + throw DeserializationException("Missing displayname param"); avatar_url_ = QUrl(object.value("avatar_url").toString()); display_name_ = object.value("displayname").toString(); diff --git a/src/Register.cc b/src/Register.cc new file mode 100644 index 00000000..4c14b400 --- /dev/null +++ b/src/Register.cc @@ -0,0 +1,63 @@ +/* + * 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 <QJsonDocument> +#include <QJsonObject> +#include <QJsonValue> + +#include "Deserializable.h" +#include "Register.h" + +RegisterRequest::RegisterRequest() +{ +} + +RegisterRequest::RegisterRequest(const QString &username, const QString &password) + : user_(username) + , password_(password) +{ +} + +QByteArray RegisterRequest::serialize() +{ + QJsonObject body{ + {"username", user_}, + {"password", password_}}; + + return QJsonDocument(body).toJson(QJsonDocument::Compact); +} + +void RegisterResponse::deserialize(const QJsonDocument &data) throw(DeserializationException) +{ + if (!data.isObject()) + throw DeserializationException("Response is not a JSON object"); + + QJsonObject object = data.object(); + + if (!object.contains("access_token")) + throw DeserializationException("Missing access_token param"); + + if (!object.contains("home_server")) + throw DeserializationException("Missing home_server param"); + + if (!object.contains("user_id")) + throw DeserializationException("Missing user_id param"); + + access_token_ = object.value("access_token").toString(); + home_server_ = object.value("home_server").toString(); + user_id_ = object.value("user_id").toString(); +} |