Common/HttpRequest: Add option to allow non 200 response codes

1 files changed, 12 insertions, 8 deletions

diff --git a/Source/Core/Common/HttpRequest.cpp b/Source/Core/Common/HttpRequest.cpp
index 88f6a126fb..8098e315bd 100644
--- a/Source/Core/Common/HttpRequest.cpp
+++ b/Source/Core/Common/HttpRequest.cpp
@@ -32,7 +32,7 @@ public:
   void UseIPv4();
   void FollowRedirects(long max);
   Response Fetch(const std::string& url, Method method, const Headers& headers, const u8* payload,
-                 size_t size);
+                 size_t size, AllowedReturnCodes codes = AllowedReturnCodes::Ok_Only);
 
   static int CurlProgressCallback(Impl* impl, double dlnow, double dltotal, double ulnow,
                                   double ultotal);
@@ -80,22 +80,23 @@ std::string HttpRequest::EscapeComponent(const std::string& string)
   return m_impl->EscapeComponent(string);
 }
 
-HttpRequest::Response HttpRequest::Get(const std::string& url, const Headers& headers)
+HttpRequest::Response HttpRequest::Get(const std::string& url, const Headers& headers,
+                                       AllowedReturnCodes codes)
 {
-  return m_impl->Fetch(url, Impl::Method::GET, headers, nullptr, 0);
+  return m_impl->Fetch(url, Impl::Method::GET, headers, nullptr, 0, codes);
 }
 
 HttpRequest::Response HttpRequest::Post(const std::string& url, const std::vector<u8>& payload,
-                                        const Headers& headers)
+                                        const Headers& headers, AllowedReturnCodes codes)
 {
-  return m_impl->Fetch(url, Impl::Method::POST, headers, payload.data(), payload.size());
+  return m_impl->Fetch(url, Impl::Method::POST, headers, payload.data(), payload.size(), codes);
 }
 
 HttpRequest::Response HttpRequest::Post(const std::string& url, const std::string& payload,
-                                        const Headers& headers)
+                                        const Headers& headers, AllowedReturnCodes codes)
 {
   return m_impl->Fetch(url, Impl::Method::POST, headers,
-                       reinterpret_cast<const u8*>(payload.data()), payload.size());
+                       reinterpret_cast<const u8*>(payload.data()), payload.size(), codes);
 }
 
 int HttpRequest::Impl::CurlProgressCallback(Impl* impl, double dlnow, double dltotal, double ulnow,
@@ -184,7 +185,7 @@ static size_t CurlWriteCallback(char* data, size_t size, size_t nmemb, void* use
 
 HttpRequest::Response HttpRequest::Impl::Fetch(const std::string& url, Method method,
                                                const Headers& headers, const u8* payload,
-                                               size_t size)
+                                               size_t size, AllowedReturnCodes codes)
 {
   curl_easy_setopt(m_curl.get(), CURLOPT_POST, method == Method::POST);
   curl_easy_setopt(m_curl.get(), CURLOPT_URL, url.c_str());
@@ -219,6 +220,9 @@ HttpRequest::Response HttpRequest::Impl::Fetch(const std::string& url, Method me
     return {};
   }
 
+  if (codes == AllowedReturnCodes::All)
+    return buffer;
+
   long response_code = 0;
   curl_easy_getinfo(m_curl.get(), CURLINFO_RESPONSE_CODE, &response_code);
   if (response_code != 200)