Move header entries generation to base connection

Kicer86 · Nov 22, 2023 · 18ca5fe · 18ca5fe
1 parent 86d8f0e
commit 18ca5fe
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/src/base_connection.cpp b/src/base_connection.cpp
@@ -66,13 +66,18 @@ std::string GitHub::BaseConnection::get(const std::string& request)
 }
 
 
-const std::string & GitHub::BaseConnection::address() const
+std::map<std::string, std::string> GitHub::BaseConnection::getHeaderEntries() const
 {
-    return m_address;
+    std::map<std::string, std::string> entries;
+
+    if (m_token.empty() == false)
+        entries.emplace("Authorization", "token " + m_token);
+
+    return entries;
 }
 
 
-const std::string & GitHub::BaseConnection::token() const
+const std::string & GitHub::BaseConnection::address() const
 {
-    return m_token;
+    return m_address;
 }
diff --git a/src/base_connection.hpp b/src/base_connection.hpp
@@ -2,8 +2,11 @@
 #ifndef BASE_CONNECTION_HPP_INCLUDED
 #define BASE_CONNECTION_HPP_INCLUDED
 
+#include <map>
+
 #include <cpp_restapi/iconnection.hpp>
 
+
 namespace GitHub
 {
     class BaseConnection: public cpp_restapi::IConnection
@@ -15,8 +18,9 @@ namespace GitHub
         virtual std::pair<std::string, std::string> fetchPage(const std::string& request) = 0;
 
     protected:
+        std::map<std::string, std::string> getHeaderEntries() const;
+
         const std::string& address() const;
-        const std::string& token() const;
 
     private:
         const std::string m_address;

diff --git a/src/curl_backend/connection.cpp b/src/curl_backend/connection.cpp
@@ -74,15 +74,16 @@ std::pair<std::string, std::string> GitHub::CurlBackend::Connection::fetchPage(c
         curl_easy_setopt(curl, CURLOPT_HEADERDATA, &header_links);
         curl_easy_setopt(curl, CURLOPT_USERAGENT, "github_api/1.0");
 
-        const std::string& userToken = token();
-        if (userToken.empty() == false)
-        {
-            authorization = std::string("Authorization: token ") + userToken;
-            list = curl_slist_append(list, authorization.c_str());
+        const auto header_entries = getHeaderEntries();
 
-            curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
+        for(const auto& [k, v]: header_entries)
+        {
+            const std::string entry = k + ": " + v;
+            list = curl_slist_append(list, entry.c_str());
         }
 
+        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
+
         curl_easy_perform(curl);
 
         curl_slist_free_all(list);

diff --git a/src/qt_backend/connection.cpp b/src/qt_backend/connection.cpp
@@ -82,13 +82,10 @@ namespace GitHub { namespace QtBackend
     {
         QNetworkRequest request;
 
-        const std::string& userToken = token();
-        if (userToken.empty() == false)
-        {
-            const QByteArray key("Authorization");
-            const QByteArray value = QString("token %1").arg(userToken.c_str()).toLatin1();
-            request.setRawHeader(key, value);
-        }
+        const auto header_entries = getHeaderEntries();
+
+        for(const auto& [k, v]: header_entries)
+            request.setRawHeader(k.c_str(), v.c_str());
 
         request.setRawHeader("User-Agent", "github_api/1.0");