always return cookies and headers if 'keepCookie' is true

OpenFn · Feb 4, 2021 · 31fe0ec · 31fe0ec
1 parent fca7b95
commit 31fe0ec
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 25 deletions.
diff --git a/lib/Adaptor.js b/lib/Adaptor.js
@@ -131,21 +131,30 @@ axios.interceptors.request.use(config => {
 });
 
 function handleCookies(response) {
-  if (response.headers['set-cookie']) {
-    var _response$headers$set, _response$headers$set2;
+  var _response$config;
 
+  if ((_response$config = response.config) === null || _response$config === void 0 ? void 0 : _response$config.keepCookie) {
     let cookies;
     let keepCookies = [];
-    if (response.headers['set-cookie'] instanceof Array) cookies = (_response$headers$set = response.headers['set-cookie']) === null || _response$headers$set === void 0 ? void 0 : _response$headers$set.map(Cookie.parse);else cookies = [Cookie.parse(response.headers['set-cookie'])];
-    (_response$headers$set2 = response.headers['set-cookie']) === null || _response$headers$set2 === void 0 ? void 0 : _response$headers$set2.forEach(c => {
-      cookiejar.setCookie(Cookie.parse(c), response.config.url, function (err, cookie) {
-        var _response$config;
 
-        if ((_response$config = response.config) === null || _response$config === void 0 ? void 0 : _response$config.keepCookie) {
+    if (response.headers['set-cookie']) {
+      var _response$headers$set2;
+
+      if (response.headers['set-cookie'] instanceof Array) {
+        var _response$headers$set;
+
+        cookies = (_response$headers$set = response.headers['set-cookie']) === null || _response$headers$set === void 0 ? void 0 : _response$headers$set.map(Cookie.parse);
+      } else {
+        cookies = [Cookie.parse(response.headers['set-cookie'])];
+      }
+
+      (_response$headers$set2 = response.headers['set-cookie']) === null || _response$headers$set2 === void 0 ? void 0 : _response$headers$set2.forEach(c => {
+        cookiejar.setCookie(Cookie.parse(c), response.config.url, (err, cookie) => {
           keepCookies === null || keepCookies === void 0 ? void 0 : keepCookies.push(cookie === null || cookie === void 0 ? void 0 : cookie.cookieString());
-        }
+        });
       });
-    });
+    }
+
     return { ...response,
       data: { ...response.data,
         __cookie: (keepCookies === null || keepCookies === void 0 ? void 0 : keepCookies.length) === 1 ? keepCookies[0] : keepCookies,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/language-http",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "An HTTP request language package for use with Open Function",
   "homepage": "https://docs.openfn.org",
   "repository": {

diff --git a/src/Adaptor.js b/src/Adaptor.js
@@ -56,24 +56,28 @@ axios.interceptors.request.use(config => {
 });
 
 function handleCookies(response) {
-  if (response.headers['set-cookie']) {
+  if (response.config?.keepCookie) {
     let cookies;
     let keepCookies = [];
-    if (response.headers['set-cookie'] instanceof Array)
-      cookies = response.headers['set-cookie']?.map(Cookie.parse);
-    else cookies = [Cookie.parse(response.headers['set-cookie'])];
-
-    response.headers['set-cookie']?.forEach(c => {
-      cookiejar.setCookie(
-        Cookie.parse(c),
-        response.config.url,
-        function (err, cookie) {
-          if (response.config?.keepCookie) {
+
+    if (response.headers['set-cookie']) {
+      if (response.headers['set-cookie'] instanceof Array) {
+        cookies = response.headers['set-cookie']?.map(Cookie.parse);
+      } else {
+        cookies = [Cookie.parse(response.headers['set-cookie'])];
+      }
+
+      response.headers['set-cookie']?.forEach(c => {
+        cookiejar.setCookie(
+          Cookie.parse(c),
+          response.config.url,
+          (err, cookie) => {
             keepCookies?.push(cookie?.cookieString());
           }
-        }
-      );
-    });
+        );
+      });
+    }
+
     return {
       ...response,
       data: {
@@ -83,6 +87,7 @@ function handleCookies(response) {
       },
     };
   }
+
   return response;
 }