Merge branch 'dev' into device-verification

# Conflicts:
#	autotests/testfilecrypto.cpp
#	lib/connection.cpp
#	lib/connection.h
#	lib/database.cpp
#	lib/database.h
#	lib/e2ee/qolmoutboundsession.cpp
#	lib/e2ee/qolmoutboundsession.h
#	lib/eventitem.h
#	lib/events/encryptedevent.cpp
#	lib/events/encryptedevent.h
#	lib/events/encryptedfile.cpp
#	lib/events/encryptedfile.h
#	lib/events/keyverificationevent.cpp
#	lib/events/keyverificationevent.h
#	lib/events/roomkeyevent.h
#	lib/room.cpp
#	lib/room.h

1 files changed, 39 insertions, 32 deletions

diff --git a/lib/csapi/registration.cpp b/lib/csapi/registration.cpp
index 153abcee..04c0fe12 100644
--- a/lib/csapi/registration.cpp
+++ b/lib/csapi/registration.cpp
@@ -18,85 +18,91 @@ RegisterJob::RegisterJob(const QString& kind,
                          const QString& username, const QString& password,
                          const QString& deviceId,
                          const QString& initialDeviceDisplayName,
-                         Omittable<bool> inhibitLogin)
+                         Omittable<bool> inhibitLogin,
+                         Omittable<bool> refreshToken)
     : BaseJob(HttpVerb::Post, QStringLiteral("RegisterJob"),
-              makePath("/_matrix/client/r0", "/register"),
+              makePath("/_matrix/client/v3", "/register"),
               queryToRegister(kind), {}, false)
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
-    addParam<IfNotEmpty>(_data, QStringLiteral("username"), username);
-    addParam<IfNotEmpty>(_data, QStringLiteral("password"), password);
-    addParam<IfNotEmpty>(_data, QStringLiteral("device_id"), deviceId);
-    addParam<IfNotEmpty>(_data, QStringLiteral("initial_device_display_name"),
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("auth"), auth);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("username"), username);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("password"), password);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("device_id"), deviceId);
+    addParam<IfNotEmpty>(_dataJson,
+                         QStringLiteral("initial_device_display_name"),
                          initialDeviceDisplayName);
-    addParam<IfNotEmpty>(_data, QStringLiteral("inhibit_login"), inhibitLogin);
-    setRequestData(std::move(_data));
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("inhibit_login"),
+                         inhibitLogin);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("refresh_token"),
+                         refreshToken);
+    setRequestData({ _dataJson });
     addExpectedKey("user_id");
 }
 
 RequestTokenToRegisterEmailJob::RequestTokenToRegisterEmailJob(
     const EmailValidationData& body)
     : BaseJob(HttpVerb::Post, QStringLiteral("RequestTokenToRegisterEmailJob"),
-              makePath("/_matrix/client/r0", "/register/email/requestToken"),
+              makePath("/_matrix/client/v3", "/register/email/requestToken"),
               false)
 {
-    setRequestData(RequestData(toJson(body)));
+    setRequestData({ toJson(body) });
 }
 
 RequestTokenToRegisterMSISDNJob::RequestTokenToRegisterMSISDNJob(
     const MsisdnValidationData& body)
     : BaseJob(HttpVerb::Post, QStringLiteral("RequestTokenToRegisterMSISDNJob"),
-              makePath("/_matrix/client/r0", "/register/msisdn/requestToken"),
+              makePath("/_matrix/client/v3", "/register/msisdn/requestToken"),
               false)
 {
-    setRequestData(RequestData(toJson(body)));
+    setRequestData({ toJson(body) });
 }
 
 ChangePasswordJob::ChangePasswordJob(const QString& newPassword,
                                      bool logoutDevices,
                                      const Omittable<AuthenticationData>& auth)
     : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"),
-              makePath("/_matrix/client/r0", "/account/password"))
+              makePath("/_matrix/client/v3", "/account/password"))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("new_password"), newPassword);
-    addParam<IfNotEmpty>(_data, QStringLiteral("logout_devices"), logoutDevices);
-    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("new_password"), newPassword);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("logout_devices"),
+                         logoutDevices);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("auth"), auth);
+    setRequestData({ _dataJson });
 }
 
 RequestTokenToResetPasswordEmailJob::RequestTokenToResetPasswordEmailJob(
     const EmailValidationData& body)
     : BaseJob(HttpVerb::Post,
               QStringLiteral("RequestTokenToResetPasswordEmailJob"),
-              makePath("/_matrix/client/r0",
+              makePath("/_matrix/client/v3",
                        "/account/password/email/requestToken"),
               false)
 {
-    setRequestData(RequestData(toJson(body)));
+    setRequestData({ toJson(body) });
 }
 
 RequestTokenToResetPasswordMSISDNJob::RequestTokenToResetPasswordMSISDNJob(
     const MsisdnValidationData& body)
     : BaseJob(HttpVerb::Post,
               QStringLiteral("RequestTokenToResetPasswordMSISDNJob"),
-              makePath("/_matrix/client/r0",
+              makePath("/_matrix/client/v3",
                        "/account/password/msisdn/requestToken"),
               false)
 {
-    setRequestData(RequestData(toJson(body)));
+    setRequestData({ toJson(body) });
 }
 
 DeactivateAccountJob::DeactivateAccountJob(
     const Omittable<AuthenticationData>& auth, const QString& idServer)
     : BaseJob(HttpVerb::Post, QStringLiteral("DeactivateAccountJob"),
-              makePath("/_matrix/client/r0", "/account/deactivate"))
+              makePath("/_matrix/client/v3", "/account/deactivate"))
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
-    addParam<IfNotEmpty>(_data, QStringLiteral("id_server"), idServer);
-    setRequestData(std::move(_data));
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("auth"), auth);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("id_server"), idServer);
+    setRequestData({ _dataJson });
     addExpectedKey("id_server_unbind_result");
 }
 
@@ -111,13 +117,14 @@ QUrl CheckUsernameAvailabilityJob::makeRequestUrl(QUrl baseUrl,
                                                   const QString& username)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   makePath("/_matrix/client/r0",
+                                   makePath("/_matrix/client/v3",
                                             "/register/available"),
                                    queryToCheckUsernameAvailability(username));
 }
 
-CheckUsernameAvailabilityJob::CheckUsernameAvailabilityJob(const QString& username)
+CheckUsernameAvailabilityJob::CheckUsernameAvailabilityJob(
+    const QString& username)
     : BaseJob(HttpVerb::Get, QStringLiteral("CheckUsernameAvailabilityJob"),
-              makePath("/_matrix/client/r0", "/register/available"),
+              makePath("/_matrix/client/v3", "/register/available"),
               queryToCheckUsernameAvailability(username), {}, false)
 {}