1
0
mirror of https://github.com/sasjs/server.git synced 2025-12-10 19:34:34 +00:00

fix: sending _webout as result object in response JSON

This commit is contained in:
Allan Bowe
2021-11-18 20:57:56 +00:00
parent d2955645f0
commit b97523e555
4 changed files with 8 additions and 8 deletions

2
api/package-lock.json generated
View File

@@ -16174,7 +16174,7 @@
"integrity": "sha512-5kCf4TdCVOYve4wSHVTi+db34hknDwvY2C/JVEPHT6T3CkQ5cnwRVPSFz/1WzXzcVvdUi4ag5xd9SDOsU12oWA=="
},
"@sasjs/utils": {
"version": "file:../../utils/build/sasjs-utils-5.0.0.tgz",
"version": "file:..\\..\\utils\\build\\sasjs-utils-5.0.0.tgz",
"integrity": "sha512-ZSX1oHLEl3Gaz1ILnmbf1hMt3WLfvAddck65BY1NduOePtHx2ioja9CjzXKxB75CphBjLdjR95tbmb8jjzGDZA==",
"requires": {
"@types/fs-extra": "^9.0.11",

View File

@@ -364,7 +364,7 @@ components:
type: string
log:
type: string
result:
_webout:
type: string
message:
type: string
@@ -981,7 +981,7 @@ paths:
application/json:
schema:
type: string
description: "Trigger a SAS program using it's location in the _program parameter.\nEnable debugging using the _debug parameter.\nAdditional URL parameters are turned into SAS macro variables.\nAny files provided are placed into the session and\ncorresponding _WEBIN_XXX variables are created."
description: "Trigger a SAS program using it's location in the _program parameter.\r\nEnable debugging using the _debug parameter.\r\nAdditional URL parameters are turned into SAS macro variables.\r\nAny files provided are placed into the session and\r\ncorresponding _WEBIN_XXX variables are created."
summary: 'Execute Stored Program, return raw content'
tags:
- STP
@@ -1005,7 +1005,7 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ExecuteReturnJsonResponse'
description: "Trigger a SAS program using it's location in the _program parameter.\nEnable debugging using the _debug parameter.\nAdditional URL parameters are turned into SAS macro variables.\nAny files provided are placed into the session and\ncorresponding _WEBIN_XXX variables are created."
description: "Trigger a SAS program using it's location in the _program parameter.\r\nEnable debugging using the _debug parameter.\r\nAdditional URL parameters are turned into SAS macro variables.\r\nAny files provided are placed into the session and\r\ncorresponding _WEBIN_XXX variables are created."
summary: 'Execute Stored Program, return JSON'
tags:
- STP

View File

@@ -53,7 +53,7 @@ export class ExecutionController {
program = `
/* runtime vars */
${varStatments}
filename _webout "${weboutPath}";
filename _webout "${weboutPath}" mod;
/* dynamic user-provided vars */
${preProgramVarStatments}
@@ -111,7 +111,7 @@ ${program}`
if (returnJson) {
const response: any = {
result: webout
webout: webout
}
if ((debugValue && debugValue >= 131) || session.crashed) {
response.log = log

View File

@@ -25,7 +25,7 @@ interface ExecuteReturnJsonPayload {
interface ExecuteReturnJsonResponse {
status: string
log?: string
result?: string
_webout?: string
message?: string
}
@@ -120,7 +120,7 @@ const executeReturnJson = async (
)
return {
status: 'success',
result: jsonResult.result,
_webout: jsonResult.webout,
log: jsonResult.log
}
} catch (err: any) {