implement FollowRedirects

mrtazz · mrtazz · commit fda9c945b9b7 · 2016-01-31T11:54:44.000-05:00
diff --git a/README.md b/README.md
@@ -61,6 +61,9 @@ conn->SetTimeout(5);
 // (this will result in the UA "foo/cool restclient-cpp/VERSION")
 conn->SetUserAgent("foo/cool");
 
+// enable following of redirects (default is off)
+conn->FollowRedirects(true);
+
 // set headers
 RestClient::HeaderFields headers;
 headers["Accept"] = "application/json";
diff --git a/include/restclient-cpp/connection.h b/include/restclient-cpp/connection.h
@@ -123,6 +123,7 @@ class Connection {
     std::string baseUrl;
     RestClient::HeaderFields headerFields;
     int timeout;
+    bool followRedirects;
     struct {
       std::string username;
       std::string password;
diff --git a/source/connection.cc b/source/connection.cc
@@ -89,6 +89,16 @@ RestClient::Connection::GetHeaders() {
   return this->headerFields;
 }
 
+/**
+ * @brief configure whether to follow redirects on this connection
+ *
+ * @param follow - boolean whether to follow redirects
+ */
+void
+RestClient::Connection::FollowRedirects(bool follow) {
+  this->followRedirects = follow;
+}
+
 /**
  * @brief set custom user agent for connection. This gets prepended to the
  * default restclient-cpp/RESTCLIENT_VERSION string
@@ -203,6 +213,10 @@ RestClient::Connection::performCurlRequest(const std::string& uri) {
     // dont want to get a sig alarm on timeout
     curl_easy_setopt(this->curlHandle, CURLOPT_NOSIGNAL, 1);
   }
+  // set follow redirect
+  if (this->followRedirects == true) {
+    curl_easy_setopt(this->curlHandle, CURLOPT_FOLLOWLOCATION, 1L);
+  }
   res = curl_easy_perform(this->curlHandle);
   if (res != CURLE_OK) {
     if (res == CURLE_OPERATION_TIMEDOUT) {
diff --git a/test/test_connection.cc b/test/test_connection.cc
@@ -153,3 +153,22 @@ TEST_F(ConnectionTest, TestGetInfo)
   EXPECT_EQ(0, info.lastRequest.redirectTime);
   EXPECT_EQ(0, info.lastRequest.redirectCount);
 }
+
+TEST_F(ConnectionTest, TestFollowRedirect)
+{
+  RestClient::Response res = conn->get("/redirect/2");
+  EXPECT_EQ(302, res.code);
+  conn->FollowRedirects(true);
+  res = conn->get("/redirect/2");
+  EXPECT_EQ(200, res.code);
+}
+
+TEST_F(ConnectionTest, TestGetInfoFromRedirect)
+{
+  conn->FollowRedirects(true);
+  RestClient::Response res = conn->get("/redirect/2");
+  EXPECT_EQ(200, res.code);
+  RestClient::Connection::Info info = conn->GetInfo();
+  EXPECT_NE(0, info.lastRequest.redirectTime);
+  EXPECT_NE(0, info.lastRequest.redirectCount);
+}
