sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2026-01-04 21:30:05 +00:00
Code Issues Projects Releases Wiki Activity

fix(stp): return json for webout

Browse Source
This commit is contained in:
Saad Jutt
2022-02-21 04:13:04 +05:00
parent 232a73fd17
commit 5005f203b8
5 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
api/src/controllers/stp.ts
View File

@@ -33,9 +33,13 @@ interface ExecuteReturnJsonPayload {
*/
_program?: string
}
interface IRecordOfAny {
[key: string]: any
}
export interface ExecuteReturnJsonResponse {
status: string
_webout: string
_webout: string | IRecordOfAny
log: LogLine[]
message?: string
httpHeaders: HTTPHeaders
@@ -52,7 +56,7 @@ export class STPController {
* Any files provided are placed into the session and
* corresponding _WEBIN_XXX variables are created.
* @summary Execute Stored Program, return raw content
* @query _program Location of SAS program
* @param _program Location of SAS program
* @example _program "/Public/somefolder/some.file"
*/
@Get('/execute')
@@ -70,7 +74,7 @@ export class STPController {
* Any files provided are placed into the session and
* corresponding _WEBIN_XXX variables are created.
* @summary Execute Stored Program, return JSON
* @query _program Location of SAS program
* @param _program Location of SAS program
* @example _program "/Public/somefolder/some.file"
*/
@Example<ExecuteReturnJsonResponse>({
@@ -87,7 +91,7 @@ export class STPController {
@Request() request: express.Request,
@Body() body?: ExecuteReturnJsonPayload,
@Query() _program?: string
): Promise<ExecuteReturnJsonResponse | Buffer> {
): Promise<ExecuteReturnJsonResponse> {
const program = _program ?? body?._program
return executeReturnJson(request, program!)
}
@@ -131,7 +135,7 @@ const executeReturnRaw = async (
const executeReturnJson = async (
req: any,
_program: string
): Promise<ExecuteReturnJsonResponse | Buffer> => {
): Promise<ExecuteReturnJsonResponse> => {
const sasCodePath =
path
.join(getTmpFilesFolderPath(), _program)
@@ -149,14 +153,16 @@ const executeReturnJson = async (
true
)) as ExecuteReturnJson
if (webout instanceof Buffer) {
;(req as any).sasHeaders = httpHeaders
return webout
let weboutRes: string | IRecordOfAny = webout
if (httpHeaders['content-type']?.toLowerCase() === 'application/json') {
try {
weboutRes = JSON.parse(webout as string)
} catch (_) {}
}
return {
status: 'success',
_webout: webout,
_webout: weboutRes,
log: parseLogToArray(log),
httpHeaders
}