refactor: Enhance CurlException to include response body and update error handling in cURL classes

Author: GabrielEValenzuela

shared/curlException.hpp

@@ -18,58 +18,74 @@
 
 namespace Curl
 {
+/**
+ * @brief Custom exception for Curl wrapper.
+ *
+ */
+class CurlException : public std::exception
+{
+public:
+    /**
+     * @brief Returns HTTP response code ID.
+     *
+     * @return long HTTP response code ID.
+     */
+    long responseCode() const noexcept
+    {
+        return m_responseCode;
+    }
+
     /**
-     * @brief Custom exception for Curl wrapper.
+     * @brief Returns HTTP response body.
      *
+     * @return const std::string& HTTP response body.
      */
-    class CurlException : public std::exception
+    const std::string& responseBody() const noexcept
     {
-        public:
-            /**
-             * @brief Returns HTTP response code ID.
-             *
-             * @return long HTTP response code ID.
-             */
-            long responseCode() const noexcept
-            {
-                return m_responseCode;
-            }
+        return m_responseBody;
+    }
 
-            /**
-             * @brief Return error message.
-             *
-             * @return const char* Error message.
-             */
-            const char* what() const noexcept override
-            {
-                return m_error.what();
-            }
+    /**
+     * @brief Return error message.
+     *
+     * @return const char* Error message.
+     */
+    const char* what() const noexcept override
+    {
+        return m_error.what();
+    }
 
-            /**
-             * @brief Construct a new Curl Exception object
-             *
-             * @param errorMessage Error message to show.
-             * @param responseCode HTTP response code ID.
-             */
-            CurlException(const std::string& errorMessage, const long responseCode)
-                : m_error {errorMessage}
-                , m_responseCode {responseCode}
-            {}
+    /**
+     * @brief Construct a new Curl Exception object
+     *
+     * @param errorMessage Error message to show.
+     * @param responseCode HTTP response code ID.
+     * @param responseBody HTTP response body (optional).
+     */
+    CurlException(const std::string& errorMessage, const long responseCode, std::string responseBody = "")
+        : m_error {errorMessage}
+        , m_responseCode {responseCode}
+        , m_responseBody {std::move(responseBody)}
+    {
+    }
 
-            /**
-             * @brief Construct a new Curl Exception object
-             *
-             * @param curlException Pair object with an error message and a response code ID.
-             */
-            explicit CurlException(const std::pair<const std::string&, const long>& curlException)
-                : m_error {curlException.first}
-                , m_responseCode {curlException.second}
-            {}
+    /**
+     * @brief Construct a new Curl Exception object
+     *
+     * @param curlException Pair object with an error message and a response code ID.
+     */
+    explicit CurlException(const std::pair<const std::string&, const long>& curlException)
+        : m_error {curlException.first}
+        , m_responseCode {curlException.second}
+        , m_responseBody {}
+    {
+    }
 
-        private:
-            std::runtime_error m_error;
-            const long m_responseCode;
-    };
-}
+private:
+    std::runtime_error m_error;
+    const long m_responseCode;
+    const std::string m_responseBody;
+};
+} // namespace Curl
 
 #endif // _CURL_EXCEPTION_HPP

src/curlSingleHandler.hpp

@@ -53,7 +53,8 @@ class cURLSingleHandler final : public ICURLHandler
         long responseCode;
         const auto resGetInfo {curl_easy_getinfo(m_curlHandler.get(), CURLINFO_RESPONSE_CODE, &responseCode)};
 
-        curl_easy_reset(m_curlHandler.get());
+        // DON'T reset here anymore
+        // curl_easy_reset(m_curlHandler.get());
 
         if (resPerform != CURLE_OK)
         {
@@ -63,10 +64,14 @@ class cURLSingleHandler final : public ICURLHandler
                 {
                     throw std::runtime_error("cURLSingleHandler::execute() failed: Couldn't get HTTP response code");
                 }
+                // Throw exception WITHOUT resetting - response data is still available
                 throw Curl::CurlException(curl_easy_strerror(resPerform), responseCode);
             }
             throw std::runtime_error(curl_easy_strerror(resPerform));
         }
+
+        // Only reset on success
+        curl_easy_reset(m_curlHandler.get());
     }
 };
 

src/curlWrapper.hpp

@@ -117,7 +117,11 @@ class cURLWrapper final : public IRequestImplementator
 
         this->setOptionPtr(OPT_WRITEDATA, &m_response);
 
-        this->setOptionLong(OPT_FAILONERROR, 1l);
+        // this->setOptionLong(OPT_FAILONERROR, 1l);
+
+        // Note: The OPT_FAILONERROR option makes cURL fail on HTTP response codes >= 400.
+        // However, in such cases we want to capture the response body, so we don't set it.
+        // Instead, we handle HTTP errors in the execute() method.
 
         this->setOptionLong(OPT_FOLLOW_REDIRECT, 1l);
 
@@ -216,7 +220,15 @@ class cURLWrapper final : public IRequestImplementator
             throw std::runtime_error("cURLWrapper::execute() failed: Couldn't set HTTP headers");
         }
 
-        m_curlHandler->execute();
+        try
+        {
+            m_curlHandler->execute();
+        }
+        catch (Curl::CurlException& ex)
+        {
+            // Note: m_returnValue contains the response body, even for errors
+            throw Curl::CurlException(ex.what(), ex.responseCode(), m_returnValue);
+        }
     }
 };