mirror of
https://github.com/sasjs/server.git
synced 2025-12-10 19:34:34 +00:00
chore(stp): removed query logic from trigger endpoint
This commit is contained in:
@@ -118,18 +118,9 @@ export class STPController {
|
|||||||
@Post('/trigger')
|
@Post('/trigger')
|
||||||
public async triggerProgram(
|
public async triggerProgram(
|
||||||
@Request() request: express.Request,
|
@Request() request: express.Request,
|
||||||
@Body() body: TriggerProgramPayload,
|
@Body() body: TriggerProgramPayload
|
||||||
@Query() _program?: string
|
|
||||||
): Promise<TriggerProgramResponse> {
|
): Promise<TriggerProgramResponse> {
|
||||||
const program = _program ?? body?._program
|
return triggerProgram(request, body)
|
||||||
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)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -172,12 +163,14 @@ const execute = async (
|
|||||||
|
|
||||||
const triggerProgram = async (
|
const triggerProgram = async (
|
||||||
req: express.Request,
|
req: express.Request,
|
||||||
_program: string,
|
{ _program, expiresAfterMins }: TriggerProgramPayload
|
||||||
vars: ExecutionVars,
|
|
||||||
otherArgs?: any,
|
|
||||||
expiresAfterMins?: number
|
|
||||||
): Promise<TriggerProgramResponse> => {
|
): Promise<TriggerProgramResponse> => {
|
||||||
try {
|
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)
|
const { codePath, runTime } = await getRunTimeAndFilePath(_program)
|
||||||
|
|
||||||
// get session controller based on runTime
|
// get session controller based on runTime
|
||||||
|
|||||||
@@ -78,11 +78,7 @@ stpRouter.post('/trigger', async (req, res) => {
|
|||||||
if (error) return res.status(400).send(error.details[0].message)
|
if (error) return res.status(400).send(error.details[0].message)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await controller.triggerProgram(
|
const response = await controller.triggerProgram(req, body)
|
||||||
req,
|
|
||||||
body,
|
|
||||||
req.query?._program as string
|
|
||||||
)
|
|
||||||
|
|
||||||
res.status(200)
|
res.status(200)
|
||||||
res.send(response)
|
res.send(response)
|
||||||
|
|||||||
Reference in New Issue
Block a user