1 files changed, 30 insertions, 113 deletions
diff --git a/lib/csapi/login.cpp b/lib/csapi/login.cpp
index 4d15a30b..7bb74e29 100644
--- a/lib/csapi/login.cpp
+++ b/lib/csapi/login.cpp
@@ -4,124 +4,41 @@
 
 #include "login.h"
 
-#include "converters.h"
-
-#include <QtCore/QStringBuilder>
-
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-namespace QMatrixClient
-{
-    // Converters
-
-    template <> struct FromJsonObject<GetLoginFlowsJob::LoginFlow>
-    {
-        GetLoginFlowsJob::LoginFlow operator()(const QJsonObject& jo) const
-        {
-            GetLoginFlowsJob::LoginFlow result;
-            result.type =
-                fromJson<QString>(jo.value("type"_ls));
-
-            return result;
-        }
-    };
-} // namespace QMatrixClient
-
-class GetLoginFlowsJob::Private
-{
-    public:
-        QVector<LoginFlow> flows;
-};
+using namespace Quotient;
 
 QUrl GetLoginFlowsJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/login");
+                                   makePath("/_matrix/client/v3", "/login"));
 }
 
-static const auto GetLoginFlowsJobName = QStringLiteral("GetLoginFlowsJob");
-
 GetLoginFlowsJob::GetLoginFlowsJob()
-    : BaseJob(HttpVerb::Get, GetLoginFlowsJobName,
-        basePath % "/login", false)
-    , d(new Private)
-{
+    : BaseJob(HttpVerb::Get, QStringLiteral("GetLoginFlowsJob"),
+              makePath("/_matrix/client/v3", "/login"), false)
+{}
+
+LoginJob::LoginJob(const QString& type,
+                   const Omittable<UserIdentifier>& identifier,
+                   const QString& password, const QString& token,
+                   const QString& deviceId,
+                   const QString& initialDeviceDisplayName,
+                   Omittable<bool> refreshToken)
+    : BaseJob(HttpVerb::Post, QStringLiteral("LoginJob"),
+              makePath("/_matrix/client/v3", "/login"), false)
+{
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("type"), type);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("identifier"), identifier);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("password"), password);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("token"), token);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("device_id"), deviceId);
+    addParam<IfNotEmpty>(_dataJson,
+                         QStringLiteral("initial_device_display_name"),
+                         initialDeviceDisplayName);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("refresh_token"),
+                         refreshToken);
+    setRequestData({ _dataJson });
+    addExpectedKey("user_id");
+    addExpectedKey("access_token");
+    addExpectedKey("device_id");
 }
-
-GetLoginFlowsJob::~GetLoginFlowsJob() = default;
-
-const QVector<GetLoginFlowsJob::LoginFlow>& GetLoginFlowsJob::flows() const
-{
-    return d->flows;
-}
-
-BaseJob::Status GetLoginFlowsJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    d->flows = fromJson<QVector<LoginFlow>>(json.value("flows"_ls));
-    return Success;
-}
-
-class LoginJob::Private
-{
-    public:
-        QString userId;
-        QString accessToken;
-        QString homeServer;
-        QString deviceId;
-};
-
-static const auto LoginJobName = QStringLiteral("LoginJob");
-
-LoginJob::LoginJob(const QString& type, const Omittable<UserIdentifier>& identifier, const QString& password, const QString& token, const QString& deviceId, const QString& initialDeviceDisplayName, const QString& user, const QString& medium, const QString& address)
-    : BaseJob(HttpVerb::Post, LoginJobName,
-        basePath % "/login", false)
-    , d(new Private)
-{
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("type"), type);
-    addParam<IfNotEmpty>(_data, QStringLiteral("identifier"), identifier);
-    addParam<IfNotEmpty>(_data, QStringLiteral("password"), password);
-    addParam<IfNotEmpty>(_data, QStringLiteral("token"), token);
-    addParam<IfNotEmpty>(_data, QStringLiteral("device_id"), deviceId);
-    addParam<IfNotEmpty>(_data, QStringLiteral("initial_device_display_name"), initialDeviceDisplayName);
-    addParam<IfNotEmpty>(_data, QStringLiteral("user"), user);
-    addParam<IfNotEmpty>(_data, QStringLiteral("medium"), medium);
-    addParam<IfNotEmpty>(_data, QStringLiteral("address"), address);
-    setRequestData(_data);
-}
-
-LoginJob::~LoginJob() = default;
-
-const QString& LoginJob::userId() const
-{
-    return d->userId;
-}
-
-const QString& LoginJob::accessToken() const
-{
-    return d->accessToken;
-}
-
-const QString& LoginJob::homeServer() const
-{
-    return d->homeServer;
-}
-
-const QString& LoginJob::deviceId() const
-{
-    return d->deviceId;
-}
-
-BaseJob::Status LoginJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    d->userId = fromJson<QString>(json.value("user_id"_ls));
-    d->accessToken = fromJson<QString>(json.value("access_token"_ls));
-    d->homeServer = fromJson<QString>(json.value("home_server"_ls));
-    d->deviceId = fromJson<QString>(json.value("device_id"_ls));
-    return Success;
-}
-