1 files changed, 26 insertions, 19 deletions
diff --git a/lib/csapi/definitions/auth_data.h b/lib/csapi/definitions/auth_data.h
index 26eb205c..e92596d0 100644
--- a/lib/csapi/definitions/auth_data.h
+++ b/lib/csapi/definitions/auth_data.h
@@ -6,27 +6,34 @@
 
 #include "converters.h"
 
-#include <QtCore/QJsonObject>
-#include <QtCore/QHash>
+namespace Quotient {
+/// 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;
 
-namespace QMatrixClient
-{
-    // Data structures
+    /// The value of the session key given by the homeserver.
+    QString session;
 
-    /// Used by clients to submit authentication information to the interactive-authentication API
-    struct AuthenticationData
+    /// Keys dependent on the login type
+    QHash<QString, QJsonObject> authInfo;
+};
+
+template <>
+struct JsonObjectConverter<AuthenticationData> {
+    static void dumpTo(QJsonObject& jo, const AuthenticationData& pod)
     {
-        /// 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;
-    };
-    template <> struct JsonObjectConverter<AuthenticationData>
+        fillJson(jo, pod.authInfo);
+        addParam<>(jo, QStringLiteral("type"), pod.type);
+        addParam<IfNotEmpty>(jo, QStringLiteral("session"), pod.session);
+    }
+    static void fillFrom(QJsonObject jo, AuthenticationData& pod)
     {
-        static void dumpTo(QJsonObject& jo, const AuthenticationData& pod);
-        static void fillFrom(QJsonObject jo, AuthenticationData& pod);
-    };
+        fromJson(jo.take("type"_ls), pod.type);
+        fromJson(jo.take("session"_ls), pod.session);
+        fromJson(jo, pod.authInfo);
+    }
+};
 
-} // namespace QMatrixClient
+} // namespace Quotient