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, 2 insertions, 53 deletions

diff --git a/lib/csapi/openid.cpp b/lib/csapi/openid.cpp
index 9def2377..3941e9c0 100644
--- a/lib/csapi/openid.cpp
+++ b/lib/csapi/openid.cpp
@@ -4,66 +4,15 @@
 
 #include "openid.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
 using namespace Quotient;
 
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-class RequestOpenIdTokenJob::Private {
-public:
-    QString accessToken;
-    QString tokenType;
-    QString matrixServerName;
-    int expiresIn;
-};
-
 RequestOpenIdTokenJob::RequestOpenIdTokenJob(const QString& userId,
                                              const QJsonObject& body)
     : BaseJob(HttpVerb::Post, QStringLiteral("RequestOpenIdTokenJob"),
-              basePath % "/user/" % userId % "/openid/request_token")
-    , d(new Private)
+              QStringLiteral("/_matrix/client/r0") % "/user/" % userId
+                  % "/openid/request_token")
 {
     setRequestData(Data(toJson(body)));
 }
-
-RequestOpenIdTokenJob::~RequestOpenIdTokenJob() = default;
-
-const QString& RequestOpenIdTokenJob::accessToken() const
-{
-    return d->accessToken;
-}
-
-const QString& RequestOpenIdTokenJob::tokenType() const { return d->tokenType; }
-
-const QString& RequestOpenIdTokenJob::matrixServerName() const
-{
-    return d->matrixServerName;
-}
-
-int RequestOpenIdTokenJob::expiresIn() const { return d->expiresIn; }
-
-BaseJob::Status RequestOpenIdTokenJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    if (!json.contains("access_token"_ls))
-        return { IncorrectResponse,
-                 "The key 'access_token' not found in the response" };
-    fromJson(json.value("access_token"_ls), d->accessToken);
-    if (!json.contains("token_type"_ls))
-        return { IncorrectResponse,
-                 "The key 'token_type' not found in the response" };
-    fromJson(json.value("token_type"_ls), d->tokenType);
-    if (!json.contains("matrix_server_name"_ls))
-        return { IncorrectResponse,
-                 "The key 'matrix_server_name' not found in the response" };
-    fromJson(json.value("matrix_server_name"_ls), d->matrixServerName);
-    if (!json.contains("expires_in"_ls))
-        return { IncorrectResponse,
-                 "The key 'expires_in' not found in the response" };
-    fromJson(json.value("expires_in"_ls), d->expiresIn);
-
-    return Success;
-}