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

fix(stp): use same session from file upload

Browse Source
This commit is contained in:
Saad Jutt
2022-03-24 18:06:28 +05:00
parent c5117abe71
commit dd56a95314
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -49,19 +49,19 @@ Example contents of a `.env` file:
``` ```
# options: [desktop|server] default: `desktop` # options: [desktop|server] default: `desktop`
MODE=desktop MODE=
# options: [disable|enable] default: `disable` for `server` & `enable` for `desktop` # options: [disable|enable] default: `disable` for `server` & `enable` for `desktop`
CORS=disable CORS=
# options: <http://localhost:3000 https://abc.com ...> space separated urls # options: <http://localhost:3000 https://abc.com ...> space separated urls
WHITELIST= WHITELIST=
# options: [http|https] default: http # options: [http|https] default: http
PROTOCOL=http PROTOCOL=
# default: 5000 # default: 5000
PORT=5000 PORT=
# optional # optional

14
api/src/controllers/internal/Execution.ts
View File

@@ -8,7 +8,7 @@ import {
moveFile, moveFile,
readFileBinary readFileBinary
} from '@sasjs/utils' } from '@sasjs/utils'
import { PreProgramVars, TreeNode } from '../../types' import { PreProgramVars, Session, TreeNode } from '../../types'
import { import {
extractHeaders, extractHeaders,
generateFileUploadSasCode, generateFileUploadSasCode,
@@ -39,7 +39,8 @@ export class ExecutionController {
preProgramVariables: PreProgramVars, preProgramVariables: PreProgramVars,
vars: ExecutionVars, vars: ExecutionVars,
otherArgs?: any, otherArgs?: any,
returnJson?: boolean returnJson?: boolean,
session?: Session
) { ) {
if (!(await fileExists(programPath))) if (!(await fileExists(programPath)))
throw 'ExecutionController: SAS file does not exist.' throw 'ExecutionController: SAS file does not exist.'
@@ -51,7 +52,8 @@ export class ExecutionController {
preProgramVariables, preProgramVariables,
vars, vars,
otherArgs, otherArgs,
returnJson returnJson,
session
) )
} }
@@ -60,11 +62,13 @@ export class ExecutionController {
preProgramVariables: PreProgramVars, preProgramVariables: PreProgramVars,
vars: ExecutionVars, vars: ExecutionVars,
otherArgs?: any, otherArgs?: any,
returnJson?: boolean returnJson?: boolean,
sessionByFileUpload?: Session
): Promise<ExecuteReturnRaw | ExecuteReturnJson> { ): Promise<ExecuteReturnRaw | ExecuteReturnJson> {
const sessionController = getSessionController() const sessionController = getSessionController()
const session = await sessionController.getSession() const session =
sessionByFileUpload ?? (await sessionController.getSession())
session.inUse = true session.inUse = true
session.consumed = true session.consumed = true

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

@@ -185,7 +185,8 @@ const executeReturnJson = async (
getPreProgramVariables(req), getPreProgramVariables(req),
{ ...req.query, ...req.body }, { ...req.query, ...req.body },
{ filesNamesMap: filesNamesMap }, { filesNamesMap: filesNamesMap },
true true,
req.sasSession
)) as ExecuteReturnJson )) as ExecuteReturnJson
let weboutRes: string | IRecordOfAny = webout let weboutRes: string | IRecordOfAny = webout