1 files changed, 19 insertions, 15 deletions

diff --git a/lib/csapi/login.cpp b/lib/csapi/login.cpp
index a5bac9ea..7bb74e29 100644
--- a/lib/csapi/login.cpp
+++ b/lib/csapi/login.cpp
@@ -4,37 +4,41 @@
 
 #include "login.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetLoginFlowsJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/login");
+                                   makePath("/_matrix/client/v3", "/login"));
 }
 
 GetLoginFlowsJob::GetLoginFlowsJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetLoginFlowsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/login", false)
+              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)
+                   const QString& initialDeviceDisplayName,
+                   Omittable<bool> refreshToken)
     : BaseJob(HttpVerb::Post, QStringLiteral("LoginJob"),
-              QStringLiteral("/_matrix/client/r0") % "/login", false)
+              makePath("/_matrix/client/v3", "/login"), false)
 {
-    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"),
+    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);
-    setRequestData(std::move(_data));
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("refresh_token"),
+                         refreshToken);
+    setRequestData({ _dataJson });
+    addExpectedKey("user_id");
+    addExpectedKey("access_token");
+    addExpectedKey("device_id");
 }