Implementing callback for redirect processing #85

jgaa · Mar 26, 2019 · 8e93037 · 8e93037
1 parent 5a8abb5
commit 8e93037
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/include/restc-cpp/restc-cpp.h b/include/restc-cpp/restc-cpp.h
@@ -142,6 +142,7 @@ class Request {
     class Properties {
     public:
         using ptr_t = std::shared_ptr<Properties>;
+        using redirect_fn_t = std::function<void (std::string& url)>;
 
         int maxRedirects = 3;
         int connectTimeoutMs = (1000 * 12);
@@ -155,6 +156,7 @@ class Request {
         headers_t headers;
         args_t args;
         Proxy proxy;
+        redirect_fn_t redirectFn;
     };
 
     virtual const Properties& GetProperties() const = 0;

diff --git a/src/RequestImpl.cpp b/src/RequestImpl.cpp
@@ -126,6 +126,13 @@ class RequestImpl : public Request {
             try {
                 return DoExecute((ctx));
             } catch(RedirectException& ex) {
+
+                auto url = move(ex.url);
+
+                if (properties_->redirectFn) {
+                    properties_->redirectFn(url);
+                }
+
                 if ((properties_->maxRedirects >= 0)
                     && (++redirects > properties_->maxRedirects)) {
                     throw ConstraintException("Too many redirects.");
@@ -135,9 +142,9 @@ class RequestImpl : public Request {
                     << ex.code
                     << ") '" << url_
                     << "' --> '"
-                    << ex.url
+                    << url
                     << "') ";
-                url_ = move(ex.url);
+                url_ = move(url);
                 parsed_url_ = url_.c_str();
                 add_url_args_ = false; // Use whatever arguments we got in the redirect
             }