From b1979f63ef9cabd248b3222481ed77fcb22cc808 Mon Sep 17 00:00:00 2001 From: Yury Shkoda Date: Thu, 10 Feb 2022 16:58:15 +0300 Subject: [PATCH 1/3] feat(executeJobSASjs): add _returnLog query option --- src/types/ExecuteScript.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/types/ExecuteScript.ts b/src/types/ExecuteScript.ts index b556578..c8aaa0a 100644 --- a/src/types/ExecuteScript.ts +++ b/src/types/ExecuteScript.ts @@ -1,4 +1,5 @@ export interface ExecutionQuery { _program: string _debug?: number + _returnLog?: boolean } From 30a99f9cc5241bd0d24e3a2456ce55d52b0aba74 Mon Sep 17 00:00:00 2001 From: Yury Shkoda Date: Fri, 11 Feb 2022 13:10:38 +0300 Subject: [PATCH 2/3] fix(executeJobSASjs): add parse webout response --- src/SASjsApiClient.ts | 6 ++++++ src/types/ExecuteScript.ts | 1 - src/utils/parseWeboutResponse.ts | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/SASjsApiClient.ts b/src/SASjsApiClient.ts index 73ed694..10ebc7f 100644 --- a/src/SASjsApiClient.ts +++ b/src/SASjsApiClient.ts @@ -3,6 +3,7 @@ import { RequestClient } from './request/RequestClient' import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs' import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs' import { getAuthCodeForSasjs } from './auth/getAuthCodeForSasjs' +import { parseWeboutResponse } from './utils' export class SASjsApiClient { constructor( @@ -35,8 +36,13 @@ export class SASjsApiClient { log?: string logPath?: string error?: {} + _webout?: string }>('SASjsApi/stp/execute', query, undefined) + if (Object.keys(result).includes('_webout')) { + result._webout = parseWeboutResponse(result._webout!) + } + return Promise.resolve(result) } diff --git a/src/types/ExecuteScript.ts b/src/types/ExecuteScript.ts index c8aaa0a..b556578 100644 --- a/src/types/ExecuteScript.ts +++ b/src/types/ExecuteScript.ts @@ -1,5 +1,4 @@ export interface ExecutionQuery { _program: string _debug?: number - _returnLog?: boolean } diff --git a/src/utils/parseWeboutResponse.ts b/src/utils/parseWeboutResponse.ts index 716cc31..b87705c 100644 --- a/src/utils/parseWeboutResponse.ts +++ b/src/utils/parseWeboutResponse.ts @@ -10,6 +10,7 @@ export const parseWeboutResponse = (response: string, url?: string): string => { .split('>>weboutEND<<')[0] } catch (e) { if (url) throw new WeboutResponseError(url) + sasResponse = '' console.error(e) } From eab19a0e6e2b4ac643173a0bae385784d6948597 Mon Sep 17 00:00:00 2001 From: Yury Shkoda Date: Tue, 15 Feb 2022 09:59:26 +0300 Subject: [PATCH 3/3] chore(deps): bump axios to fix follow-redirects issue --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 55a7304..19dac61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "license": "ISC", "dependencies": { "@sasjs/utils": "2.35.0", - "axios": "0.25.0", + "axios": "0.26.0", "axios-cookiejar-support": "2.0.3", "form-data": "4.0.0", "https": "1.0.0", @@ -2205,11 +2205,11 @@ } }, "node_modules/axios": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz", - "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==", + "version": "0.26.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz", + "integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==", "dependencies": { - "follow-redirects": "^1.14.7" + "follow-redirects": "^1.14.8" } }, "node_modules/axios-cookiejar-support": { @@ -4097,9 +4097,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", - "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==", "funding": [ { "type": "individual", @@ -14932,11 +14932,11 @@ "dev": true }, "axios": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz", - "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==", + "version": "0.26.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz", + "integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==", "requires": { - "follow-redirects": "^1.14.7" + "follow-redirects": "^1.14.8" } }, "axios-cookiejar-support": { @@ -16454,9 +16454,9 @@ } }, "follow-redirects": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", - "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==" + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==" }, "foreach": { "version": "2.0.5", diff --git a/package.json b/package.json index b924efa..10aa9c5 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "main": "index.js", "dependencies": { "@sasjs/utils": "2.35.0", - "axios": "0.25.0", + "axios": "0.26.0", "axios-cookiejar-support": "2.0.3", "form-data": "4.0.0", "https": "1.0.0",