Merge pull request #405 from quotient-im/kitsune-basejob-store-json-response

Store JSON response in BaseJob + tweaks to the generated code

1 files changed, 21 insertions, 8 deletions

diff --git a/lib/identity/definitions/request_msisdn_validation.h b/lib/identity/definitions/request_msisdn_validation.h
index 90aed7b8..a29fd0de 100644
--- a/lib/identity/definitions/request_msisdn_validation.h
+++ b/lib/identity/definitions/request_msisdn_validation.h
@@ -8,8 +8,6 @@
 
 namespace Quotient {
 
-// Data structures
-
 struct RequestMsisdnValidation {
     /// A unique string generated by the client, and used to identify the
     /// validation attempt. It must be a string consisting of the characters
@@ -17,8 +15,8 @@ struct RequestMsisdnValidation {
     /// must not be empty.
     QString clientSecret;
 
-    /// The two-letter uppercase ISO country code that the number in
-    /// ``phone_number`` should be parsed as if it were dialled from.
+    /// The two-letter uppercase ISO-3166-1 alpha-2 country code that the
+    /// number in ``phone_number`` should be parsed as if it were dialled from.
     QString country;
 
     /// The phone number to validate.
@@ -33,15 +31,30 @@ struct RequestMsisdnValidation {
     /// they desire a new SMS (e.g. a reminder) to be sent.
     int sendAttempt;
 
-    /// Optional. When the validation is completed, the identity
-    /// server will redirect the user to this URL.
+    /// Optional. When the validation is completed, the identity server will
+    /// redirect the user to this URL. This option is ignored when submitting
+    /// 3PID validation information through a POST request.
     QString nextLink;
 };
 
 template <>
 struct JsonObjectConverter<RequestMsisdnValidation> {
-    static void dumpTo(QJsonObject& jo, const RequestMsisdnValidation& pod);
-    static void fillFrom(const QJsonObject& jo, RequestMsisdnValidation& pod);
+    static void dumpTo(QJsonObject& jo, const RequestMsisdnValidation& pod)
+    {
+        addParam<>(jo, QStringLiteral("client_secret"), pod.clientSecret);
+        addParam<>(jo, QStringLiteral("country"), pod.country);
+        addParam<>(jo, QStringLiteral("phone_number"), pod.phoneNumber);
+        addParam<>(jo, QStringLiteral("send_attempt"), pod.sendAttempt);
+        addParam<IfNotEmpty>(jo, QStringLiteral("next_link"), pod.nextLink);
+    }
+    static void fillFrom(const QJsonObject& jo, RequestMsisdnValidation& pod)
+    {
+        fromJson(jo.value("client_secret"_ls), pod.clientSecret);
+        fromJson(jo.value("country"_ls), pod.country);
+        fromJson(jo.value("phone_number"_ls), pod.phoneNumber);
+        fromJson(jo.value("send_attempt"_ls), pod.sendAttempt);
+        fromJson(jo.value("next_link"_ls), pod.nextLink);
+    }
 };
 
 } // namespace Quotient