Adds url (%) encoding to all processed url query parameters, and json escaping for all json post bodies.

Author: FiniteSingularity

src/api.cpp

@@ -106,19 +106,13 @@ std::string MarketplaceApi::getAuthUrl(
 	std::string endpoint = segments.size() > 0 ? std::accumulate(std::next(segments.begin()), segments.end(), segments[0],
 		[&](std::string a, std::string b) { return a + "/" + b; }) : "";
 
-	std::stringstream queryStrStream;
-	for (const auto& pair : queryParams) {
-		queryStrStream << pair.first << "=" << pair.second << "&";
-	}
-
-	std::string queryString = queryStrStream.str();
+	auto qString = queryString(queryParams);
 
-	if (!queryString.empty()) {
-		queryString.pop_back();
-		queryString = "?" + queryString;
+	if (!qString.empty()) {
+		qString = "?" + qString;
 	}
 
-	std::string url = _authUrl + "/" + endpoint + queryString;
+	std::string url = _authUrl + "/" + endpoint + qString;
 	return url;
 }
 
@@ -130,19 +124,13 @@ std::string MarketplaceApi::getGatewayUrl(
 	std::string endpoint = segments.size() > 0 ? std::accumulate(std::next(segments.begin()), segments.end(), segments[0],
 		[&](std::string a, std::string b) { return a + "/" + b; }) : "";
 
-	std::stringstream queryStrStream;
-	for (const auto& pair : queryParams) {
-		queryStrStream << pair.first << "=" << pair.second << "&";
-	}
-
-	std::string queryString = queryStrStream.str();
+	auto qString = queryString(queryParams);
 
-	if (!queryString.empty()) {
-		queryString.pop_back();
-		queryString = "?" + queryString;
+	if (!qString.empty()) {
+		qString = "?" + qString;
 	}
 
-	std::string url = _gatewayUrl + "/" + endpoint + queryString;
+	std::string url = _gatewayUrl + "/" + endpoint + qString;
 	return url;
 }
 

src/elgato-cloud-data.cpp

@@ -207,7 +207,7 @@ void ElgatoCloud::_Listen()
 				std::map<std::string, std::string> queryParams = {
 					{"grant_type", "authorization_code"},
 					{"code", code},
-					{REDIRECT_KEY, url_encode(REDIRECT)},
+					{REDIRECT_KEY, REDIRECT},
 					{CODE_VERIFIER_KEY, _last_code_verifier},
 					{ID_KEY, ID}
 				};
@@ -296,7 +296,7 @@ void ElgatoCloud::StartLogin()
 	std::map<std::string, std::string> queryParams = {
 		{RESPONSE_TYPE_KEY, RESPONSE_TYPE_CODE},
 		{ID_KEY, ID},
-		{REDIRECT_KEY, url_encode(REDIRECT)},
+		{REDIRECT_KEY, REDIRECT},
 		{CHALLENGE_KEY, stringhash},
 		{CC_KEY, CC_METHOD}
 	};

src/util.cpp

@@ -190,7 +190,7 @@ std::string queryString(std::map<std::string, std::string> params)
 {
 	std::stringstream queryStrStream;
 	for (const auto& pair : params) {
-		queryStrStream << pair.first << "=" << pair.second << "&";
+		queryStrStream << url_encode(pair.first) << "=" << url_encode(pair.second) << "&";
 	}
 
 	std::string queryString = queryStrStream.str();
@@ -204,18 +204,9 @@ std::string queryString(std::map<std::string, std::string> params)
 
 std::string postBody(std::map<std::string, std::string> params)
 {
-	std::stringstream queryStrStream;
-	for (const auto& pair : params) {
-		queryStrStream << "\"" << pair.first << "\": \"" << pair.second << "\",";
-	}
-
-	std::string queryString = queryStrStream.str();
-
-	if (!queryString.empty()) {
-		queryString.pop_back();
-	}
-
-	return "{" + queryString + "}";
+	nlohmann::json jsonBody = nlohmann::json(params);
+	std::string jsonString = jsonBody.dump();
+	return jsonString;
 }
 
 std::string fetch_string_from_post(std::string url, std::string postdata, std::string token)