sasjs/adapter
1
0
Fork 0
mirror of https://github.com/sasjs/adapter.git synced 2026-01-17 17:10:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #636 from sasjs/cli-issue-1108

Browse Source 
feat(executeJobSASjs): add parse _webout in response
This commit is contained in:
Yury Shkoda
2022-02-15 12:46:55 +03:00
committed by GitHub
parent de51946850 eab19a0e6e
commit 4026b03005
4 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
package-lock.json generated
View File

@@ -9,7 +9,7 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@sasjs/utils": "2.35.0", "@sasjs/utils": "2.35.0",
"axios": "0.25.0", "axios": "0.26.0",
"axios-cookiejar-support": "2.0.3", "axios-cookiejar-support": "2.0.3",
"form-data": "4.0.0", "form-data": "4.0.0",
"https": "1.0.0", "https": "1.0.0",
@@ -2205,11 +2205,11 @@
} }
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "0.25.0", "version": "0.26.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz",
"integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==", "integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==",
"dependencies": { "dependencies": {
"follow-redirects": "^1.14.7" "follow-redirects": "^1.14.8"
} }
}, },
"node_modules/axios-cookiejar-support": { "node_modules/axios-cookiejar-support": {
@@ -4097,9 +4097,9 @@
} }
}, },
"node_modules/follow-redirects": { "node_modules/follow-redirects": {
"version": "1.14.7", "version": "1.14.8",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
"integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@@ -14932,11 +14932,11 @@
"dev": true "dev": true
}, },
"axios": { "axios": {
"version": "0.25.0", "version": "0.26.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz",
"integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==", "integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==",
"requires": { "requires": {
"follow-redirects": "^1.14.7" "follow-redirects": "^1.14.8"
} }
}, },
"axios-cookiejar-support": { "axios-cookiejar-support": {
@@ -16454,9 +16454,9 @@
} }
}, },
"follow-redirects": { "follow-redirects": {
"version": "1.14.7", "version": "1.14.8",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
"integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==" "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="
}, },
"foreach": { "foreach": {
"version": "2.0.5", "version": "2.0.5",

2
package.json
View File

@@ -74,7 +74,7 @@
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"@sasjs/utils": "2.35.0", "@sasjs/utils": "2.35.0",
"axios": "0.25.0", "axios": "0.26.0",
"axios-cookiejar-support": "2.0.3", "axios-cookiejar-support": "2.0.3",
"form-data": "4.0.0", "form-data": "4.0.0",
"https": "1.0.0", "https": "1.0.0",

6
src/SASjsApiClient.ts
View File

@@ -4,6 +4,7 @@ import { RequestClient } from './request/RequestClient'
import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs' import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs'
import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs' import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs'
import { getAuthCodeForSasjs } from './auth/getAuthCodeForSasjs' import { getAuthCodeForSasjs } from './auth/getAuthCodeForSasjs'
import { parseWeboutResponse } from './utils'
import { getTokens } from './auth/getTokens' import { getTokens } from './auth/getTokens'
export class SASjsApiClient { export class SASjsApiClient {
@@ -49,8 +50,13 @@ export class SASjsApiClient {
log?: string log?: string
logPath?: string logPath?: string
error?: {} error?: {}
_webout?: string
}>('SASjsApi/stp/execute', query, undefined) }>('SASjsApi/stp/execute', query, undefined)
if (Object.keys(result).includes('_webout')) {
result._webout = parseWeboutResponse(result._webout!)
}
return Promise.resolve(result) return Promise.resolve(result)
} }

1
src/utils/parseWeboutResponse.ts
View File

@@ -10,6 +10,7 @@ export const parseWeboutResponse = (response: string, url?: string): string => {
.split('>>weboutEND<<')[0] .split('>>weboutEND<<')[0]
} catch (e) { } catch (e) {
if (url) throw new WeboutResponseError(url) if (url) throw new WeboutResponseError(url)
sasResponse = '' sasResponse = ''
console.error(e) console.error(e)
} }