Headers for all requests

Author: RomanPodymov

BackendlessUserAPI.cpp

@@ -172,7 +172,7 @@ void BackendlessUserAPI::logout() {
 
         },
         BERequestMethod::get,
-        {{"token", this->userTokenValue}},
+        {{"user-token", this->userTokenValue}},
         [&](auto replyValue){
             qDebug() << replyValue;
 

BasicAPI.cpp

@@ -25,16 +25,16 @@ void BasicAPI::request(
 ) {
     switch (method) {
     case BERequestMethod::get:
-        networkAccessManager->get(urlString, context, headers, handleRequest);
+        networkAccessManager->get(urlString, headers, context, handleRequest);
         break;
     case BERequestMethod::post:
-        networkAccessManager->post(urlString, customParams, context, headers, handleRequest);
+        networkAccessManager->post(urlString, headers, customParams, context, handleRequest);
         break;
     case BERequestMethod::deleteResource:
-        networkAccessManager->deleteResource(urlString, context, headers, handleRequest);
+        networkAccessManager->deleteResource(urlString, headers, context, handleRequest);
         break;
     case BERequestMethod::put:
-        networkAccessManager->put(urlString, customParams, context, headers, handleRequest);
+        networkAccessManager->put(urlString, headers, customParams, context, handleRequest);
         break;
     }
 }

BasicAPI.hpp

@@ -113,10 +113,10 @@ enum class BERequestMethod {
 
 class AnyNetworkAccessManager {
 public:
-    virtual void get(QString, const QObject*, QMap<QString, QString>, std::function<void(QByteArray)> const&) = 0;
-    virtual void post(QString, PostParams, const QObject*, QMap<QString, QString>, std::function<void(QByteArray)> const&) = 0;
-    virtual void put(QString, PostParams, const QObject*, QMap<QString, QString>, std::function<void(QByteArray)> const&) = 0;
-    virtual void deleteResource(QString, const QObject*, QMap<QString, QString>, std::function<void(QByteArray)> const&) = 0;
+    virtual void get(QString, QMap<QString, QString>, const QObject*, std::function<void(QByteArray)> const&) = 0;
+    virtual void post(QString, QMap<QString, QString>, PostParams, const QObject*, std::function<void(QByteArray)> const&) = 0;
+    virtual void put(QString, QMap<QString, QString>, PostParams, const QObject*, std::function<void(QByteArray)> const&) = 0;
+    virtual void deleteResource(QString, QMap<QString, QString>, const QObject*, std::function<void(QByteArray)> const&) = 0;
 };
 
 class BasicAPI {

StandardNetworkManager.cpp

@@ -10,25 +10,32 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 
-void StandardNetworkManager::get(QString urlString, const QObject* context, QMap<QString, QString>, std::function<void(QByteArray)> const& handleRequest) {
+void StandardNetworkManager::get(QString urlString, QMap<QString, QString> headers, const QObject* context, std::function<void(QByteArray)> const& handleRequest) {
     QUrl url(urlString);
     QNetworkRequest request(url);
 
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("user-token", "");
+
+    for (auto [key, value] : headers.asKeyValueRange()) {
+        request.setRawHeader(key.toUtf8(), value.toUtf8());
+    }
 
     QObject::connect(&manager, &QNetworkAccessManager::finished, context, [handleRequest](auto reply) {
         handleRequest(reply->readAll());
     }, Qt::SingleShotConnection);
     manager.get(request);
 }
 
-void StandardNetworkManager::post(QString urlString, PostParams customParams, const QObject* context, QMap<QString, QString>, std::function<void(QByteArray)> const& handleRequest) {
+void StandardNetworkManager::post(QString urlString, QMap<QString, QString> headers, PostParams customParams, const QObject* context, std::function<void(QByteArray)> const& handleRequest) {
     QUrl url(urlString);
     QNetworkRequest request(url);
 
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 
+    for (auto [key, value] : headers.asKeyValueRange()) {
+        request.setRawHeader(key.toUtf8(), value.toUtf8());
+    }
+
     QString params = "{";
 
     for (auto [key, value] : customParams.asKeyValueRange()) {
@@ -49,12 +56,16 @@ void StandardNetworkManager::post(QString urlString, PostParams customParams, co
     manager.post(request, params.toUtf8());
 }
 
-void StandardNetworkManager::put(QString urlString, PostParams customParams, const QObject* context, QMap<QString, QString>, std::function<void(QByteArray)> const& handleRequest) {
+void StandardNetworkManager::put(QString urlString, QMap<QString, QString> headers, PostParams customParams, const QObject* context, std::function<void(QByteArray)> const& handleRequest) {
     QUrl url(urlString);
     QNetworkRequest request(url);
 
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 
+    for (auto [key, value] : headers.asKeyValueRange()) {
+        request.setRawHeader(key.toUtf8(), value.toUtf8());
+    }
+
     QString params = "{";
 
     for (auto [key, value] : customParams.asKeyValueRange()) {
@@ -75,12 +86,16 @@ void StandardNetworkManager::put(QString urlString, PostParams customParams, con
     manager.put(request, params.toUtf8());
 }
 
-void StandardNetworkManager::deleteResource(QString urlString, const QObject* context, QMap<QString, QString>, std::function<void(QByteArray)> const& handleRequest) {
+void StandardNetworkManager::deleteResource(QString urlString, QMap<QString, QString> headers, const QObject* context, std::function<void(QByteArray)> const& handleRequest) {
     QUrl url(urlString);
     QNetworkRequest request(url);
 
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 
+    for (auto [key, value] : headers.asKeyValueRange()) {
+        request.setRawHeader(key.toUtf8(), value.toUtf8());
+    }
+
     QObject::connect(&manager, &QNetworkAccessManager::finished, context, [handleRequest](auto reply) {
         handleRequest(reply->readAll());
     }, Qt::SingleShotConnection);

StandardNetworkManager.hpp

@@ -16,10 +16,10 @@
 
 class StandardNetworkManager: public AnyNetworkAccessManager {
 public:
-    void get(QString, const QObject*, QMap<QString, QString>, std::function<void(QByteArray)> const&) override;
-    void post(QString, PostParams, const QObject*, QMap<QString, QString>, std::function<void(QByteArray)> const&) override;
-    void put(QString, PostParams, const QObject* context, QMap<QString, QString>, std::function<void(QByteArray)> const&) override;
-    void deleteResource(QString, const QObject* context, QMap<QString, QString>, std::function<void(QByteArray)> const&) override;
+    void get(QString, QMap<QString, QString>, const QObject*, std::function<void(QByteArray)> const&) override;
+    void post(QString, QMap<QString, QString>, PostParams, const QObject*, std::function<void(QByteArray)> const&) override;
+    void put(QString, QMap<QString, QString>, PostParams, const QObject* context, std::function<void(QByteArray)> const&) override;
+    void deleteResource(QString, QMap<QString, QString>, const QObject* context, std::function<void(QByteArray)> const&) override;
 
 private:
     QNetworkAccessManager manager;