diff options
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | lib/jobs/checkauthmethods.cpp | 53 | ||||
-rw-r--r-- | lib/jobs/checkauthmethods.h | 40 | ||||
-rw-r--r-- | lib/jobs/passwordlogin.cpp | 74 | ||||
-rw-r--r-- | lib/jobs/passwordlogin.h | 42 | ||||
-rw-r--r-- | libqmatrixclient.pri | 4 |
6 files changed, 0 insertions, 214 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e77105b..a539c1d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,6 @@ set(libqmatrixclient_SRCS lib/events/directchatevent.cpp lib/jobs/requestdata.cpp lib/jobs/basejob.cpp - lib/jobs/checkauthmethods.cpp lib/jobs/sendeventjob.cpp lib/jobs/syncjob.cpp lib/jobs/mediathumbnailjob.cpp diff --git a/lib/jobs/checkauthmethods.cpp b/lib/jobs/checkauthmethods.cpp deleted file mode 100644 index 117def89..00000000 --- a/lib/jobs/checkauthmethods.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "checkauthmethods.h" - -#include <QtCore/QJsonDocument> -#include <QtCore/QJsonObject> - -using namespace QMatrixClient; - -class CheckAuthMethods::Private -{ - public: - QString session; -}; - -CheckAuthMethods::CheckAuthMethods() - : BaseJob(HttpVerb::Get, "CheckAuthMethods", - QStringLiteral("_matrix/client/r0/login"), Query(), Data(), false) - , d(new Private) -{ -} - -CheckAuthMethods::~CheckAuthMethods() -{ - delete d; -} - -QString CheckAuthMethods::session() -{ - return d->session; -} - -BaseJob::Status CheckAuthMethods::parseJson(const QJsonDocument& data) -{ - // TODO - return { BaseJob::StatusCode::UserDefinedError, "Not implemented" }; -} diff --git a/lib/jobs/checkauthmethods.h b/lib/jobs/checkauthmethods.h deleted file mode 100644 index 647f3db6..00000000 --- a/lib/jobs/checkauthmethods.h +++ /dev/null @@ -1,40 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#pragma once - -#include "basejob.h" - -namespace QMatrixClient -{ - class CheckAuthMethods : public BaseJob - { - public: - CheckAuthMethods(); - virtual ~CheckAuthMethods(); - - QString session(); - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - Private* d; - }; -} diff --git a/lib/jobs/passwordlogin.cpp b/lib/jobs/passwordlogin.cpp deleted file mode 100644 index 8abfe66a..00000000 --- a/lib/jobs/passwordlogin.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "passwordlogin.h" - -using namespace QMatrixClient; - -class PasswordLogin::Private -{ - public: - QString returned_id; - QString returned_server; - QString returned_token; -}; - -PasswordLogin::PasswordLogin(QString user, QString password) - : BaseJob(HttpVerb::Post, "PasswordLogin", - "_matrix/client/r0/login", Query(), Data(), false) - , d(new Private) -{ - QJsonObject _data; - _data.insert("type", QStringLiteral("m.login.password")); - _data.insert("user", user); - _data.insert("password", password); - setRequestData(_data); -} - -PasswordLogin::~PasswordLogin() -{ - delete d; -} - -QString PasswordLogin::token() const -{ - return d->returned_token; -} - -QString PasswordLogin::id() const -{ - return d->returned_id; -} - -QString PasswordLogin::server() const -{ - return d->returned_server; -} - -BaseJob::Status PasswordLogin::parseJson(const QJsonDocument& data) -{ - QJsonObject json = data.object(); - if( !json.contains("access_token") || !json.contains("home_server") || !json.contains("user_id") ) - { - return { UserDefinedError, "No expected data" }; - } - d->returned_token = json.value("access_token").toString(); - d->returned_server = json.value("home_server").toString(); - d->returned_id = json.value("user_id").toString(); - return Success; -} diff --git a/lib/jobs/passwordlogin.h b/lib/jobs/passwordlogin.h deleted file mode 100644 index fb8777a3..00000000 --- a/lib/jobs/passwordlogin.h +++ /dev/null @@ -1,42 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2015 Felix Rohrbach <kde@fxrh.de> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#pragma once - -#include "basejob.h" - -namespace QMatrixClient -{ - class PasswordLogin : public BaseJob - { - public: - PasswordLogin(QString user, QString password); - virtual ~PasswordLogin(); - - QString token() const; - QString id() const; - QString server() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - Private* d; - }; -} // namespace QMatrixClient diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri index bbf8eb14..1e2e21a5 100644 --- a/libqmatrixclient.pri +++ b/libqmatrixclient.pri @@ -30,8 +30,6 @@ HEADERS += \ $$SRCPATH/events/redactionevent.h \ $$SRCPATH/jobs/requestdata.h \ $$SRCPATH/jobs/basejob.h \ - $$SRCPATH/jobs/checkauthmethods.h \ - $$SRCPATH/jobs/passwordlogin.h \ $$SRCPATH/jobs/sendeventjob.h \ $$SRCPATH/jobs/postreceiptjob.h \ $$SRCPATH/jobs/syncjob.h \ @@ -61,8 +59,6 @@ SOURCES += \ $$SRCPATH/events/directchatevent.cpp \ $$SRCPATH/jobs/requestdata.cpp \ $$SRCPATH/jobs/basejob.cpp \ - $$SRCPATH/jobs/checkauthmethods.cpp \ - $$SRCPATH/jobs/passwordlogin.cpp \ $$SRCPATH/jobs/sendeventjob.cpp \ $$SRCPATH/jobs/postreceiptjob.cpp \ $$SRCPATH/jobs/syncjob.cpp \ |