10 files changed, 67 insertions, 14 deletions
diff --git a/lib/csapi/definitions/auth_data.cpp b/lib/csapi/definitions/auth_data.cpp
new file mode 100644
index 00000000..94e3c05c
--- /dev/null
+++ b/lib/csapi/definitions/auth_data.cpp
@@ -0,0 +1,29 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#include "auth_data.h"
+
+using namespace QMatrixClient;
+
+QJsonObject QMatrixClient::toJson(const AuthenticationData& pod)
+{
+    QJsonObject _json = toJson(pod.authInfo);
+    addParam<>(_json, QStringLiteral("type"), pod.type);
+    addParam<IfNotEmpty>(_json, QStringLiteral("session"), pod.session);
+    return _json;
+}
+
+AuthenticationData FromJson<AuthenticationData>::operator()(const QJsonValue& jv)
+{
+    auto _json = jv.toObject();
+    AuthenticationData result;
+    result.type =
+        fromJson<QString>(_json.take("type"_ls));
+    result.session =
+        fromJson<QString>(_json.take("session"_ls));
+    
+    result.authInfo = fromJson<QHash<QString, QJsonObject>>(_json);
+    return result;
+}
+
diff --git a/lib/csapi/definitions/auth_data.h b/lib/csapi/definitions/auth_data.h
new file mode 100644
index 00000000..0ad72b87
--- /dev/null
+++ b/lib/csapi/definitions/auth_data.h
@@ -0,0 +1,32 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#pragma once
+
+#include "converters.h"
+
+
+namespace QMatrixClient
+{
+    // Data structures
+
+    /// Used by clients to submit authentication information to the interactive-authentication API
+    struct AuthenticationData
+    {
+        /// The login type that the client is attempting to complete.
+        QString type;
+        /// The value of the session key given by the homeserver.
+        QString session;
+        /// Keys dependent on the login type
+        QHash<QString, QJsonObject> authInfo;
+    };
+
+    QJsonObject toJson(const AuthenticationData& pod);
+
+    template <> struct FromJson<AuthenticationData>
+    {
+        AuthenticationData operator()(const QJsonValue& jv);
+    };
+
+} // namespace QMatrixClient
diff --git a/lib/csapi/definitions/client_device.h b/lib/csapi/definitions/client_device.h
index 4ed46a52..ba65483d 100644
--- a/lib/csapi/definitions/client_device.h
+++ b/lib/csapi/definitions/client_device.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-
 #include "converters.h"
 
 #include "converters.h"
diff --git a/lib/csapi/definitions/device_keys.h b/lib/csapi/definitions/device_keys.h
index d74c9259..4b223609 100644
--- a/lib/csapi/definitions/device_keys.h
+++ b/lib/csapi/definitions/device_keys.h
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "converters.h"
 
 #include <QtCore/QHash>
 
-#include "converters.h"
-
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/csapi/definitions/event_filter.h b/lib/csapi/definitions/event_filter.h
index 4f5b00f9..76f08319 100644
--- a/lib/csapi/definitions/event_filter.h
+++ b/lib/csapi/definitions/event_filter.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-
 #include "converters.h"
 
 #include "converters.h"
diff --git a/lib/csapi/definitions/push_condition.h b/lib/csapi/definitions/push_condition.h
index 83f63183..99d7083c 100644
--- a/lib/csapi/definitions/push_condition.h
+++ b/lib/csapi/definitions/push_condition.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
-
-
 #include "converters.h"
 
+
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h
index d7f93e41..c6542aa6 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/lib/csapi/definitions/push_rule.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "converters.h"
 
 #include "csapi/definitions/push_condition.h"
 #include "converters.h"
@@ -11,8 +12,6 @@
 #include <QtCore/QVariant>
 #include <QtCore/QJsonObject>
 
-#include "converters.h"
-
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/csapi/definitions/push_ruleset.h b/lib/csapi/definitions/push_ruleset.h
index 5e8bc02d..a5e9ff2c 100644
--- a/lib/csapi/definitions/push_ruleset.h
+++ b/lib/csapi/definitions/push_ruleset.h
@@ -4,13 +4,12 @@
 
 #pragma once
 
+#include "converters.h"
 
 #include <QtCore/QVector>
 #include "converters.h"
 #include "csapi/definitions/push_rule.h"
 
-#include "converters.h"
-
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/csapi/definitions/room_event_filter.h b/lib/csapi/definitions/room_event_filter.h
index 38b3e50f..3252af30 100644
--- a/lib/csapi/definitions/room_event_filter.h
+++ b/lib/csapi/definitions/room_event_filter.h
@@ -4,10 +4,9 @@
 
 #pragma once
 
-
-#include "csapi/definitions/event_filter.h"
 #include "converters.h"
 
+#include "csapi/definitions/event_filter.h"
 #include "converters.h"
 
 namespace QMatrixClient
diff --git a/lib/csapi/definitions/sync_filter.h b/lib/csapi/definitions/sync_filter.h
index c4393596..7f48f02c 100644
--- a/lib/csapi/definitions/sync_filter.h
+++ b/lib/csapi/definitions/sync_filter.h
@@ -4,13 +4,12 @@
 
 #pragma once
 
+#include "converters.h"
 
 #include "csapi/definitions/room_event_filter.h"
 #include "converters.h"
 #include "csapi/definitions/event_filter.h"
 
-#include "converters.h"
-
 namespace QMatrixClient
 {
     // Data structures