Added some more context to redirect callback #85

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

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/include/restc-cpp/restc-cpp.h b/include/restc-cpp/restc-cpp.h
@@ -142,7 +142,8 @@ class Request {
     class Properties {
     public:
         using ptr_t = std::shared_ptr<Properties>;
-        using redirect_fn_t = std::function<void (std::string& url)>;
+        using redirect_fn_t = std::function<void (int code, std::string& url, 
+                                                  const Reply& reply)>;
 
         int maxRedirects = 3;
         int connectTimeoutMs = (1000 * 12);

diff --git a/src/RequestImpl.cpp b/src/RequestImpl.cpp
@@ -30,11 +30,13 @@ class RequestImpl : public Request {
         RedirectException(const RedirectException&) = default;
         RedirectException(RedirectException &&) = default;
 
-        RedirectException(int redirCode, string redirUrl)
-        : code{redirCode}, url{move(redirUrl)} {}
+        RedirectException(int redirCode, string redirUrl, std::unique_ptr<Reply> reply)
+        : code{redirCode}, url{move(redirUrl)}, redirectReply{move(reply)}
+        {}
 
         const int code;
         std::string url;
+        std::unique_ptr<Reply> redirectReply;
     };
 
     RequestImpl(const std::string& url,
@@ -125,12 +127,12 @@ class RequestImpl : public Request {
         while(true) {
             try {
                 return DoExecute((ctx));
-            } catch(RedirectException& ex) {
+            } catch(const RedirectException& ex) {
 
-                auto url = move(ex.url);
+                auto url = ex.url;
 
                 if (properties_->redirectFn) {
-                    properties_->redirectFn(url);
+                    properties_->redirectFn(ex.code, url, *ex.redirectReply);
                 }
 
                 if ((properties_->maxRedirects >= 0)
@@ -446,7 +448,7 @@ class RequestImpl : public Request {
                 throw ProtocolException(
                     "No Location header in redirect reply");
             }
-            throw RedirectException(http_code, *redirect_location);
+            throw RedirectException(http_code, *redirect_location, move(reply));
         }
 
         ValidateReply(*reply);