Added a way to disable URL encoding for payload and parameters

Closes #324
libcpr · Mar 1, 2021 · 04f06b8 · 04f06b8
1 parent 8c0600c
commit 04f06b8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/cpr/curl_container.cpp b/cpr/curl_container.cpp
@@ -26,11 +26,11 @@ const std::string CurlContainer<Parameter>::GetContent(const CurlHolder& holder)
             content += "&";
         }
 
-        std::string escapedKey = holder.urlEncode(parameter.key);
+        std::string escapedKey = encode ? holder.urlEncode(parameter.key) : parameter.key;
         if (parameter.value.empty()) {
             content += escapedKey;
         } else {
-            std::string escapedValue = holder.urlEncode(parameter.value);
+            std::string escapedValue = encode ? holder.urlEncode(parameter.value) : parameter.value;
             content += escapedKey + "=";
             content += escapedValue;
         }
@@ -46,7 +46,7 @@ const std::string CurlContainer<Pair>::GetContent(const CurlHolder& holder) cons
         if (!content.empty()) {
             content += "&";
         }
-        std::string escaped = holder.urlEncode(element.value);
+        std::string escaped = encode ? holder.urlEncode(element.value) : element.value;
         content += element.key + "=" + escaped;
     }
 

diff --git a/include/cpr/curl_container.h b/include/cpr/curl_container.h
@@ -33,6 +33,11 @@ struct Pair {
 template <class T>
 class CurlContainer {
   public:
+    /**
+     * Enables or disables URL encoding for keys and values when calling GetContent(...).
+     **/
+    bool encode = true;
+
     CurlContainer() = default;
     CurlContainer(const std::initializer_list<T>&);
 

diff --git a/test/structures_tests.cpp b/test/structures_tests.cpp
@@ -16,6 +16,18 @@ TEST(PayloadTests, UseStringVariableTest) {
     EXPECT_EQ(payload.GetContent(CurlHolder()), expected);
 }
 
+TEST(PayloadTests, DisableEncodingTest) {
+    std::string key1 = "key1";
+    std::string key2 = "key2§$%&/";
+    std::string value1 = "hello.,.,";
+    std::string value2 = "hello";
+    Payload payload{{key1, value1}, {key2, value2}};
+    payload.encode = false;
+
+    std::string expected = key1 + '=' + value1 + '&' + key2 + '=' + value2;
+    EXPECT_EQ(payload.GetContent(CurlHolder()), expected);
+}
+
 TEST(ParametersTests, UseStringVariableTest) {
     std::string value1 = "hello";
     std::string key2 = "key2";
@@ -25,6 +37,18 @@ TEST(ParametersTests, UseStringVariableTest) {
     EXPECT_EQ(parameters.GetContent(CurlHolder()), expected);
 }
 
+TEST(ParametersTests, DisableEncodingTest) {
+    std::string key1 = "key1";
+    std::string key2 = "key2§$%&/";
+    std::string value1 = "hello.,.,";
+    std::string value2 = "hello";
+    Parameters parameters{{key1, value1}, {key2, value2}};
+    parameters.encode = false;
+
+    std::string expected = key1 + '=' + value1 + '&' + key2 + '=' + value2;
+    EXPECT_EQ(parameters.GetContent(CurlHolder()), expected);
+}
+
 int main(int argc, char** argv) {
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();