1 files changed, 12 insertions, 12 deletions

diff --git a/lib/csapi/registration.cpp b/lib/csapi/registration.cpp
index 320ec796..5dc9c1e5 100644
--- a/lib/csapi/registration.cpp
+++ b/lib/csapi/registration.cpp
@@ -30,7 +30,7 @@ BaseJob::Query queryToRegister(const QString& kind)
 
 static const auto RegisterJobName = QStringLiteral("RegisterJob");
 
-RegisterJob::RegisterJob(const QString& kind, const Omittable<AuthenticationData>& auth, bool bindEmail, const QString& username, const QString& password, const QString& deviceId, const QString& initialDeviceDisplayName, bool inhibitLogin)
+RegisterJob::RegisterJob(const QString& kind, const Omittable<AuthenticationData>& auth, Omittable<bool> bindEmail, const QString& username, const QString& password, const QString& deviceId, const QString& initialDeviceDisplayName, Omittable<bool> inhibitLogin)
     : BaseJob(HttpVerb::Post, RegisterJobName,
         basePath % "/register",
         queryToRegister(kind),
@@ -76,10 +76,10 @@ BaseJob::Status RegisterJob::parseJson(const QJsonDocument& data)
     if (!json.contains("user_id"_ls))
         return { JsonParseError,
             "The key 'user_id' not found in the response" };
-    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));
+    fromJson(json.value("user_id"_ls), d->userId);
+    fromJson(json.value("access_token"_ls), d->accessToken);
+    fromJson(json.value("home_server"_ls), d->homeServer);
+    fromJson(json.value("device_id"_ls), d->deviceId);
     return Success;
 }
 
@@ -114,7 +114,7 @@ const Sid& RequestTokenToRegisterEmailJob::data() const
 
 BaseJob::Status RequestTokenToRegisterEmailJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<Sid>(data);
+    fromJson(data, d->data);
     return Success;
 }
 
@@ -150,7 +150,7 @@ const Sid& RequestTokenToRegisterMSISDNJob::data() const
 
 BaseJob::Status RequestTokenToRegisterMSISDNJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<Sid>(data);
+    fromJson(data, d->data);
     return Success;
 }
 
@@ -197,7 +197,7 @@ const Sid& RequestTokenToResetPasswordEmailJob::data() const
 
 BaseJob::Status RequestTokenToResetPasswordEmailJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<Sid>(data);
+    fromJson(data, d->data);
     return Success;
 }
 
@@ -233,7 +233,7 @@ const Sid& RequestTokenToResetPasswordMSISDNJob::data() const
 
 BaseJob::Status RequestTokenToResetPasswordMSISDNJob::parseJson(const QJsonDocument& data)
 {
-    d->data = fromJson<Sid>(data);
+    fromJson(data, d->data);
     return Success;
 }
 
@@ -251,7 +251,7 @@ DeactivateAccountJob::DeactivateAccountJob(const Omittable<AuthenticationData>&
 class CheckUsernameAvailabilityJob::Private
 {
     public:
-        bool available;
+        Omittable<bool> available;
 };
 
 BaseJob::Query queryToCheckUsernameAvailability(const QString& username)
@@ -281,7 +281,7 @@ CheckUsernameAvailabilityJob::CheckUsernameAvailabilityJob(const QString& userna
 
 CheckUsernameAvailabilityJob::~CheckUsernameAvailabilityJob() = default;
 
-bool CheckUsernameAvailabilityJob::available() const
+Omittable<bool> CheckUsernameAvailabilityJob::available() const
 {
     return d->available;
 }
@@ -289,7 +289,7 @@ bool CheckUsernameAvailabilityJob::available() const
 BaseJob::Status CheckUsernameAvailabilityJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
-    d->available = fromJson<bool>(json.value("available"_ls));
+    fromJson(json.value("available"_ls), d->available);
     return Success;
 }