refactor: Co_MessageProcessingTask uses HttpRequestParams

The token still needs to be set since it will be updated, when it expires. For the moment we still pass it as a reference.
wazuh · Aug 8, 2024 · 64f30bb · 64f30bb
1 parent 562ae99
commit 64f30bb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/src/agent/communicator/include/http_client.hpp b/src/agent/communicator/include/http_client.hpp
@@ -43,11 +43,8 @@ namespace http_client
                           boost::beast::http::request<boost::beast::http::string_body>& req,
                           boost::beast::error_code& ec);
 
-    boost::asio::awaitable<void> Co_MessageProcessingTask(const boost::beast::http::verb method,
-                                                          const std::string host,
-                                                          const std::string port,
-                                                          const std::string endpoint,
-                                                          const std::string& token,
+    boost::asio::awaitable<void> Co_MessageProcessingTask(const std::string& token,
+                                                          HttpRequestParams params,
                                                           std::function<std::string()> messageGetter);
 
     boost::beast::http::response<boost::beast::http::dynamic_body> SendHttpRequest(const HttpRequestParams& params);

diff --git a/src/agent/communicator/src/communicator.cpp b/src/agent/communicator/src/communicator.cpp
@@ -79,8 +79,9 @@ namespace communicator
 
     boost::asio::awaitable<void> Communicator::GetCommandsFromManager()
     {
-        co_await http_client::Co_MessageProcessingTask(
-            boost::beast::http::verb::get, m_managerIp, m_port, "/commands", m_token, {});
+        const auto reqParams =
+            http_client::HttpRequestParams(boost::beast::http::verb::get, m_managerIp, m_port, "/commands");
+        co_await http_client::Co_MessageProcessingTask(m_token, reqParams, {});
     }
 
     boost::asio::awaitable<void> Communicator::WaitForTokenExpirationAndAuthenticate()
@@ -118,13 +119,15 @@ namespace communicator
 
     boost::asio::awaitable<void> Communicator::StatefulMessageProcessingTask(std::queue<std::string>& messageQueue)
     {
-        co_await http_client::Co_MessageProcessingTask(
-            boost::beast::http::verb::post, m_managerIp, m_port, "/stateful", m_token, {});
+        const auto reqParams =
+            http_client::HttpRequestParams(boost::beast::http::verb::post, m_managerIp, m_port, "/stateful");
+        co_await http_client::Co_MessageProcessingTask(m_token, reqParams, {});
     }
 
     boost::asio::awaitable<void> Communicator::StatelessMessageProcessingTask(std::queue<std::string>& messageQueue)
     {
-        co_await http_client::Co_MessageProcessingTask(
-            boost::beast::http::verb::post, m_managerIp, m_port, "/stateless", m_token, {});
+        const auto reqParams =
+            http_client::HttpRequestParams(boost::beast::http::verb::post, m_managerIp, m_port, "/stateless");
+        co_await http_client::Co_MessageProcessingTask(m_token, reqParams, {});
     }
 } // namespace communicator
diff --git a/src/agent/communicator/src/http_client.cpp b/src/agent/communicator/src/http_client.cpp
@@ -61,11 +61,8 @@ namespace http_client
         std::cout << "Response body: " << boost::beast::buffers_to_string(res.body().data()) << std::endl;
     }
 
-    boost::asio::awaitable<void> Co_MessageProcessingTask(const boost::beast::http::verb method,
-                                                          const std::string host,
-                                                          const std::string port,
-                                                          const std::string endpoint,
-                                                          const std::string& token,
+    boost::asio::awaitable<void> Co_MessageProcessingTask(const std::string& token,
+                                                          HttpRequestParams reqParams,
                                                           std::function<std::string()> messageGetter)
     {
         using namespace std::chrono_literals;
@@ -78,7 +75,8 @@ namespace http_client
         {
             boost::asio::ip::tcp::socket socket(executor);
 
-            const auto results = co_await resolver.async_resolve(host, port, boost::asio::use_awaitable);
+            const auto results =
+                co_await resolver.async_resolve(reqParams.host, reqParams.port, boost::asio::use_awaitable);
 
             boost::system::error_code code;
             co_await boost::asio::async_connect(
@@ -92,8 +90,8 @@ namespace http_client
                 continue;
             }
 
-            const auto message = messageGetter ? messageGetter() : "";
-            const auto reqParams = HttpRequestParams(method, host, port, endpoint, token, "", message);
+            reqParams.body = messageGetter ? messageGetter() : "";
+            reqParams.token = token;
             auto req = CreateHttpRequest(reqParams);
 
             boost::beast::error_code ec;