New upstream version 0.7.0

1 files changed, 7 insertions, 68 deletions

diff --git a/lib/csapi/openid.cpp b/lib/csapi/openid.cpp
index 2547f0c8..7e89b8a6 100644
--- a/lib/csapi/openid.cpp
+++ b/lib/csapi/openid.cpp
@@ -4,74 +4,13 @@
 
 #include "openid.h"
 
-#include "converters.h"
+using namespace Quotient;
 
-#include <QtCore/QStringBuilder>
-
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-class RequestOpenIdTokenJob::Private
-{
-    public:
-        QString accessToken;
-        QString tokenType;
-        QString matrixServerName;
-        int expiresIn;
-};
-
-static const auto RequestOpenIdTokenJobName = QStringLiteral("RequestOpenIdTokenJob");
-
-RequestOpenIdTokenJob::RequestOpenIdTokenJob(const QString& userId, const QJsonObject& body)
-    : BaseJob(HttpVerb::Post, RequestOpenIdTokenJobName,
-        basePath % "/user/" % userId % "/openid/request_token")
-    , d(new Private)
+RequestOpenIdTokenJob::RequestOpenIdTokenJob(const QString& userId,
+                                             const QJsonObject& body)
+    : BaseJob(HttpVerb::Post, QStringLiteral("RequestOpenIdTokenJob"),
+              makePath("/_matrix/client/v3", "/user/", userId,
+                       "/openid/request_token"))
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData({ 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 { JsonParseError,
-            "The key 'access_token' not found in the response" };
-    d->accessToken = fromJson<QString>(json.value("access_token"_ls));
-    if (!json.contains("token_type"_ls))
-        return { JsonParseError,
-            "The key 'token_type' not found in the response" };
-    d->tokenType = fromJson<QString>(json.value("token_type"_ls));
-    if (!json.contains("matrix_server_name"_ls))
-        return { JsonParseError,
-            "The key 'matrix_server_name' not found in the response" };
-    d->matrixServerName = fromJson<QString>(json.value("matrix_server_name"_ls));
-    if (!json.contains("expires_in"_ls))
-        return { JsonParseError,
-            "The key 'expires_in' not found in the response" };
-    d->expiresIn = fromJson<int>(json.value("expires_in"_ls));
-    return Success;
-}
-