diff --git a/lib/Adaptor.js b/lib/Adaptor.js index 5918027..59d41e0 100644 --- a/lib/Adaptor.js +++ b/lib/Adaptor.js @@ -121,8 +121,8 @@ function execute(...operations) { }; } -var Cookie = _toughCookie.default.Cookie; var cookiejar = new _toughCookie.default.CookieJar(); +var Cookie = _toughCookie.default.Cookie; axios.interceptors.request.use(config => { cookiejar === null || cookiejar === void 0 ? void 0 : cookiejar.getCookies(config.url, (err, cookies) => { config.headers.cookie = cookies === null || cookies === void 0 ? void 0 : cookies.join('; '); @@ -164,16 +164,14 @@ function handleResponse(state, response) { params: response.config }); if (error) throw error; - const backCompatibleResponse = { ...response, + const compatibleResp = { ...response, httpStatus: response.status, - message: response.statusText - }; - const standardDataResponse = { ...backCompatibleResponse, - data: (0, _Utils.tryJson)(backCompatibleResponse.data) + message: response.statusText, + data: (0, _Utils.tryJson)(response.data) }; - const responseWithCookies = handleCookies(standardDataResponse); - return { ...(0, _languageCommon.composeNextState)(state, responseWithCookies.data), - response: responseWithCookies + const respWithCookies = handleCookies(compatibleResp); + return { ...(0, _languageCommon.composeNextState)(state, respWithCookies.data), + response: respWithCookies }; } diff --git a/package-lock.json b/package-lock.json index c09b1df..126c785 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openfn/language-http", - "version": "3.1.1", + "version": "3.1.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2a38613..d866aa6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openfn/language-http", - "version": "3.1.1", + "version": "3.1.2", "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 index f769c34..ecdf677 100644 --- a/src/Adaptor.js +++ b/src/Adaptor.js @@ -45,8 +45,8 @@ export function execute(...operations) { }; } -var Cookie = tough.Cookie; var cookiejar = new tough.CookieJar(); +var Cookie = tough.Cookie; axios.interceptors.request.use(config => { cookiejar?.getCookies(config.url, (err, cookies) => { @@ -95,22 +95,18 @@ function handleResponse(state, response) { if (error) throw error; - const backCompatibleResponse = { + const compatibleResp = { ...response, httpStatus: response.status, message: response.statusText, + data: tryJson(response.data), }; - const standardDataResponse = { - ...backCompatibleResponse, - data: tryJson(backCompatibleResponse.data), - }; - - const responseWithCookies = handleCookies(standardDataResponse); + const respWithCookies = handleCookies(compatibleResp); return { - ...composeNextState(state, responseWithCookies.data), - response: responseWithCookies, + ...composeNextState(state, respWithCookies.data), + response: respWithCookies, }; }