aboutsummaryrefslogtreecommitdiff
path: root/lib/identity
diff options
context:
space:
mode:
Diffstat (limited to 'lib/identity')
-rw-r--r--lib/identity/definitions/request_email_validation.cpp33
-rw-r--r--lib/identity/definitions/request_email_validation.h79
-rw-r--r--lib/identity/definitions/request_msisdn_validation.cpp36
-rw-r--r--lib/identity/definitions/request_msisdn_validation.h87
-rw-r--r--lib/identity/definitions/sid.cpp24
-rw-r--r--lib/identity/definitions/sid.h30
6 files changed, 95 insertions, 194 deletions
diff --git a/lib/identity/definitions/request_email_validation.cpp b/lib/identity/definitions/request_email_validation.cpp
deleted file mode 100644
index 95088bcb..00000000
--- a/lib/identity/definitions/request_email_validation.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "request_email_validation.h"
-
-using namespace QMatrixClient;
-
-QJsonObject QMatrixClient::toJson(const RequestEmailValidation& pod)
-{
- QJsonObject jo;
- addParam<>(jo, QStringLiteral("client_secret"), pod.clientSecret);
- addParam<>(jo, QStringLiteral("email"), pod.email);
- addParam<>(jo, QStringLiteral("send_attempt"), pod.sendAttempt);
- addParam<IfNotEmpty>(jo, QStringLiteral("next_link"), pod.nextLink);
- return jo;
-}
-
-RequestEmailValidation FromJsonObject<RequestEmailValidation>::operator()(const QJsonObject& jo) const
-{
- RequestEmailValidation result;
- result.clientSecret =
- fromJson<QString>(jo.value("client_secret"_ls));
- result.email =
- fromJson<QString>(jo.value("email"_ls));
- result.sendAttempt =
- fromJson<int>(jo.value("send_attempt"_ls));
- result.nextLink =
- fromJson<QString>(jo.value("next_link"_ls));
-
- return result;
-}
-
diff --git a/lib/identity/definitions/request_email_validation.h b/lib/identity/definitions/request_email_validation.h
index 3e72275f..87549505 100644
--- a/lib/identity/definitions/request_email_validation.h
+++ b/lib/identity/definitions/request_email_validation.h
@@ -6,39 +6,50 @@
#include "converters.h"
-#include "converters.h"
-
-namespace QMatrixClient
-{
- // Data structures
-
- struct RequestEmailValidation
+namespace Quotient {
+
+struct RequestEmailValidation {
+ /// A unique string generated by the client, and used to identify the
+ /// validation attempt. It must be a string consisting of the characters
+ /// `[0-9a-zA-Z.=_-]`. Its length must not exceed 255 characters and it
+ /// must not be empty.
+ QString clientSecret;
+
+ /// The email address to validate.
+ QString email;
+
+ /// The server will only send an email if the `send_attempt`
+ /// is a number greater than the most recent one which it has seen,
+ /// scoped to that `email` + `client_secret` pair. This is to
+ /// avoid repeatedly sending the same email in the case of request
+ /// retries between the POSTing user and the identity server.
+ /// The client should increment this value if they desire a new
+ /// email (e.g. a reminder) to be sent. If they do not, the server
+ /// should respond with success but not resend the email.
+ int sendAttempt;
+
+ /// 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<RequestEmailValidation> {
+ static void dumpTo(QJsonObject& jo, const RequestEmailValidation& pod)
{
- /// A unique string generated by the client, and used to identify the
- /// validation attempt. It must be a string consisting of the characters
- /// ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
- /// must not be empty.
- QString clientSecret;
- /// The email address to validate.
- QString email;
- /// The server will only send an email if the ``send_attempt``
- /// is a number greater than the most recent one which it has seen,
- /// scoped to that ``email`` + ``client_secret`` pair. This is to
- /// avoid repeatedly sending the same email in the case of request
- /// retries between the POSTing user and the identity server.
- /// The client should increment this value if they desire a new
- /// email (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.
- QString nextLink;
- };
-
- QJsonObject toJson(const RequestEmailValidation& pod);
-
- template <> struct FromJsonObject<RequestEmailValidation>
+ addParam<>(jo, QStringLiteral("client_secret"), pod.clientSecret);
+ addParam<>(jo, QStringLiteral("email"), pod.email);
+ addParam<>(jo, QStringLiteral("send_attempt"), pod.sendAttempt);
+ addParam<IfNotEmpty>(jo, QStringLiteral("next_link"), pod.nextLink);
+ }
+ static void fillFrom(const QJsonObject& jo, RequestEmailValidation& pod)
{
- RequestEmailValidation operator()(const QJsonObject& jo) const;
- };
-
-} // namespace QMatrixClient
+ fromJson(jo.value("client_secret"_ls), pod.clientSecret);
+ fromJson(jo.value("email"_ls), pod.email);
+ fromJson(jo.value("send_attempt"_ls), pod.sendAttempt);
+ fromJson(jo.value("next_link"_ls), pod.nextLink);
+ }
+};
+
+} // namespace Quotient
diff --git a/lib/identity/definitions/request_msisdn_validation.cpp b/lib/identity/definitions/request_msisdn_validation.cpp
deleted file mode 100644
index 125baa9c..00000000
--- a/lib/identity/definitions/request_msisdn_validation.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "request_msisdn_validation.h"
-
-using namespace QMatrixClient;
-
-QJsonObject QMatrixClient::toJson(const RequestMsisdnValidation& pod)
-{
- QJsonObject jo;
- 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);
- return jo;
-}
-
-RequestMsisdnValidation FromJsonObject<RequestMsisdnValidation>::operator()(const QJsonObject& jo) const
-{
- RequestMsisdnValidation result;
- result.clientSecret =
- fromJson<QString>(jo.value("client_secret"_ls));
- result.country =
- fromJson<QString>(jo.value("country"_ls));
- result.phoneNumber =
- fromJson<QString>(jo.value("phone_number"_ls));
- result.sendAttempt =
- fromJson<int>(jo.value("send_attempt"_ls));
- result.nextLink =
- fromJson<QString>(jo.value("next_link"_ls));
-
- return result;
-}
-
diff --git a/lib/identity/definitions/request_msisdn_validation.h b/lib/identity/definitions/request_msisdn_validation.h
index 77bea2bc..d2ea463f 100644
--- a/lib/identity/definitions/request_msisdn_validation.h
+++ b/lib/identity/definitions/request_msisdn_validation.h
@@ -6,42 +6,55 @@
#include "converters.h"
-#include "converters.h"
-
-namespace QMatrixClient
-{
- // Data structures
-
- struct RequestMsisdnValidation
+namespace Quotient {
+
+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
+ /// `[0-9a-zA-Z.=_-]`. Its length must not exceed 255 characters and it
+ /// must not be empty.
+ QString clientSecret;
+
+ /// 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.
+ QString phoneNumber;
+
+ /// The server will only send an SMS if the `send_attempt` is a
+ /// number greater than the most recent one which it has seen,
+ /// scoped to that `country` + `phone_number` + `client_secret`
+ /// triple. This is to avoid repeatedly sending the same SMS in
+ /// the case of request retries between the POSTing user and the
+ /// identity server. The client should increment this value if
+ /// 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. 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)
{
- /// A unique string generated by the client, and used to identify the
- /// validation attempt. It must be a string consisting of the characters
- /// ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
- /// 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.
- QString country;
- /// The phone number to validate.
- QString phoneNumber;
- /// The server will only send an SMS if the ``send_attempt`` is a
- /// number greater than the most recent one which it has seen,
- /// scoped to that ``country`` + ``phone_number`` + ``client_secret``
- /// triple. This is to avoid repeatedly sending the same SMS in
- /// the case of request retries between the POSTing user and the
- /// identity server. The client should increment this value if
- /// 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.
- QString nextLink;
- };
-
- QJsonObject toJson(const RequestMsisdnValidation& pod);
-
- template <> struct FromJsonObject<RequestMsisdnValidation>
+ 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)
{
- RequestMsisdnValidation operator()(const QJsonObject& jo) const;
- };
-
-} // namespace QMatrixClient
+ 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
diff --git a/lib/identity/definitions/sid.cpp b/lib/identity/definitions/sid.cpp
deleted file mode 100644
index 443dbedf..00000000
--- a/lib/identity/definitions/sid.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "sid.h"
-
-using namespace QMatrixClient;
-
-QJsonObject QMatrixClient::toJson(const Sid& pod)
-{
- QJsonObject jo;
- addParam<>(jo, QStringLiteral("sid"), pod.sid);
- return jo;
-}
-
-Sid FromJsonObject<Sid>::operator()(const QJsonObject& jo) const
-{
- Sid result;
- result.sid =
- fromJson<QString>(jo.value("sid"_ls));
-
- return result;
-}
-
diff --git a/lib/identity/definitions/sid.h b/lib/identity/definitions/sid.h
deleted file mode 100644
index eae60c47..00000000
--- a/lib/identity/definitions/sid.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#pragma once
-
-#include "converters.h"
-
-
-namespace QMatrixClient
-{
- // Data structures
-
- struct Sid
- {
- /// The session ID. Session IDs are opaque strings generated by the identity
- /// server. They must consist entirely of the characters
- /// ``[0-9a-zA-Z.=_-]``. Their length must not exceed 255 characters and they
- /// must not be empty.
- QString sid;
- };
-
- QJsonObject toJson(const Sid& pod);
-
- template <> struct FromJsonObject<Sid>
- {
- Sid operator()(const QJsonObject& jo) const;
- };
-
-} // namespace QMatrixClient