From 0d4315008374d9a4dfb11f934875b1a16670ec74 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Wed, 23 Jun 2021 19:12:38 +0200
Subject: Re-generate API files

---
 lib/csapi/cross_signing.h | 72 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 lib/csapi/cross_signing.h

(limited to 'lib/csapi/cross_signing.h')

diff --git a/lib/csapi/cross_signing.h b/lib/csapi/cross_signing.h
new file mode 100644
index 00000000..2ab65e06
--- /dev/null
+++ b/lib/csapi/cross_signing.h
@@ -0,0 +1,72 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#pragma once
+
+#include "csapi/definitions/cross_signing_key.h"
+
+#include "jobs/basejob.h"
+
+namespace Quotient {
+
+/*! \brief Upload cross-signing keys.
+ *
+ * Publishes cross-signing keys for the user.
+ *
+ * This API endpoint uses the [User-Interactive Authentication
+ * API](/client-server-api/#user-interactive-authentication-api).
+ */
+class UploadCrossSigningKeysJob : public BaseJob {
+public:
+    /*! \brief Upload cross-signing keys.
+     *
+     * \param masterKey
+     *   Optional. The user\'s master key.
+     *
+     * \param selfSigningKey
+     *   Optional. The user\'s self-signing key. Must be signed by
+     *   the accompanying master key, or by the user\'s most recently
+     *   uploaded master key if no master key is included in the
+     *   request.
+     *
+     * \param userSigningKey
+     *   Optional. The user\'s user-signing key. Must be signed by
+     *   the accompanying master key, or by the user\'s most recently
+     *   uploaded master key if no master key is included in the
+     *   request.
+     */
+    explicit UploadCrossSigningKeysJob(
+        const Omittable<CrossSigningKey>& masterKey = none,
+        const Omittable<CrossSigningKey>& selfSigningKey = none,
+        const Omittable<CrossSigningKey>& userSigningKey = none);
+};
+
+/*! \brief Upload cross-signing signatures.
+ *
+ * Publishes cross-signing signatures for the user.  The request body is a
+ * map from user ID to key ID to signed JSON object.
+ */
+class UploadCrossSigningSignaturesJob : public BaseJob {
+public:
+    /*! \brief Upload cross-signing signatures.
+     *
+     * \param signatures
+     *   The signatures to be published.
+     */
+    explicit UploadCrossSigningSignaturesJob(
+        const QHash<QString, QHash<QString, QJsonObject>>& signatures = {});
+
+    // Result properties
+
+    /// A map from user ID to key ID to an error for any signatures
+    /// that failed.  If a signature was invalid, the `errcode` will
+    /// be set to `M_INVALID_SIGNATURE`.
+    QHash<QString, QHash<QString, QJsonObject>> failures() const
+    {
+        return loadFromJson<QHash<QString, QHash<QString, QJsonObject>>>(
+            "failures"_ls);
+    }
+};
+
+} // namespace Quotient
-- 
cgit v1.2.3


From 952f8aa8ad19348b50a3b3545d98f7889bfdae76 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Wed, 29 Dec 2021 15:57:33 +0100
Subject: Regenerate CS API files

---
 lib/csapi/cross_signing.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/csapi/cross_signing.h')

diff --git a/lib/csapi/cross_signing.h b/lib/csapi/cross_signing.h
index 2ab65e06..617b61d1 100644
--- a/lib/csapi/cross_signing.h
+++ b/lib/csapi/cross_signing.h
@@ -17,7 +17,7 @@ namespace Quotient {
  * This API endpoint uses the [User-Interactive Authentication
  * API](/client-server-api/#user-interactive-authentication-api).
  */
-class UploadCrossSigningKeysJob : public BaseJob {
+class QUOTIENT_API UploadCrossSigningKeysJob : public BaseJob {
 public:
     /*! \brief Upload cross-signing keys.
      *
@@ -47,7 +47,7 @@ public:
  * Publishes cross-signing signatures for the user.  The request body is a
  * map from user ID to key ID to signed JSON object.
  */
-class UploadCrossSigningSignaturesJob : public BaseJob {
+class QUOTIENT_API UploadCrossSigningSignaturesJob : public BaseJob {
 public:
     /*! \brief Upload cross-signing signatures.
      *
-- 
cgit v1.2.3


From 42811660094c88a4a1bfa8bd8ace5f4b148c246a Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Tue, 31 May 2022 18:24:53 +0200
Subject: Regenerate API files (FTBFS; see the next commit)

---
 lib/csapi/cross_signing.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/csapi/cross_signing.h')

diff --git a/lib/csapi/cross_signing.h b/lib/csapi/cross_signing.h
index 617b61d1..6cea73e6 100644
--- a/lib/csapi/cross_signing.h
+++ b/lib/csapi/cross_signing.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "csapi/definitions/auth_data.h"
 #include "csapi/definitions/cross_signing_key.h"
 
 #include "jobs/basejob.h"
@@ -35,11 +36,16 @@ public:
      *   the accompanying master key, or by the user\'s most recently
      *   uploaded master key if no master key is included in the
      *   request.
+     *
+     * \param auth
+     *   Additional authentication information for the
+     *   user-interactive authentication API.
      */
     explicit UploadCrossSigningKeysJob(
         const Omittable<CrossSigningKey>& masterKey = none,
         const Omittable<CrossSigningKey>& selfSigningKey = none,
-        const Omittable<CrossSigningKey>& userSigningKey = none);
+        const Omittable<CrossSigningKey>& userSigningKey = none,
+        const Omittable<AuthenticationData>& auth = none);
 };
 
 /*! \brief Upload cross-signing signatures.
@@ -55,7 +61,7 @@ public:
      *   The signatures to be published.
      */
     explicit UploadCrossSigningSignaturesJob(
-        const QHash<QString, QHash<QString, QJsonObject>>& signatures = {});
+        const QHash<QString, QHash<QString, QJsonObject>>& signatures);
 
     // Result properties
 
-- 
cgit v1.2.3