diff --git a/api/src/controllers/stp.ts b/api/src/controllers/stp.ts index 3c35adc..573cf0a 100644 --- a/api/src/controllers/stp.ts +++ b/api/src/controllers/stp.ts @@ -118,18 +118,9 @@ export class STPController { @Post('/trigger') public async triggerProgram( @Request() request: express.Request, - @Body() body: TriggerProgramPayload, - @Query() _program?: string + @Body() body: TriggerProgramPayload ): Promise { - const program = _program ?? body?._program - const vars = { ...request.query, ...request.body } - const filesNamesMap = request.files?.length - ? makeFilesNamesMap(request.files as MulterFile[]) - : null - const otherArgs = { filesNamesMap: filesNamesMap } - const { expiresAfterMins } = body - - return triggerProgram(request, program!, vars, otherArgs, expiresAfterMins) + return triggerProgram(request, body) } } @@ -172,12 +163,14 @@ const execute = async ( const triggerProgram = async ( req: express.Request, - _program: string, - vars: ExecutionVars, - otherArgs?: any, - expiresAfterMins?: number + { _program, expiresAfterMins }: TriggerProgramPayload ): Promise => { try { + const vars = { ...req.body } + const filesNamesMap = req.files?.length + ? makeFilesNamesMap(req.files as MulterFile[]) + : null + const otherArgs = { filesNamesMap: filesNamesMap } const { codePath, runTime } = await getRunTimeAndFilePath(_program) // get session controller based on runTime diff --git a/api/src/routes/api/stp.ts b/api/src/routes/api/stp.ts index 9ce45e5..632bcbd 100644 --- a/api/src/routes/api/stp.ts +++ b/api/src/routes/api/stp.ts @@ -78,11 +78,7 @@ stpRouter.post('/trigger', async (req, res) => { if (error) return res.status(400).send(error.details[0].message) try { - const response = await controller.triggerProgram( - req, - body, - req.query?._program as string - ) + const response = await controller.triggerProgram(req, body) res.status(200) res.send(response)