fix: updated route for sas code

api/src/controllers/index.ts

@@ -2,6 +2,7 @@ export * from './auth'
 export * from './client'
 export * from './drive'
 export * from './group'
+export * from './run'
+export * from './session'
 export * from './stp'
 export * from './user'
-export * from './session'

api/src/controllers/run.ts

@@ -0,0 +1,61 @@
+import express from 'express'
+import { Request, Security, Route, Tags, Post, Body } from 'tsoa'
+import { ExecutionController } from './internal'
+import { PreProgramVars } from '../types'
+
+interface RunSASPayload {
+  /**
+   * Code of SAS program
+   * @example "* SAS Code HERE;"
+   */
+  code: string
+}
+
+@Security('bearerAuth')
+@Route('SASjsApi/run')
+@Tags('RUN')
+export class RUNController {
+  /**
+   * Trigger a SAS program.
+   * @summary Run SAS Program, return raw content
+   */
+  @Post('/code')
+  public async runSAS(
+    @Request() request: express.Request,
+    @Body() body: RunSASPayload
+  ): Promise<string> {
+    return runSAS(request, body)
+  }
+}
+
+const runSAS = async (req: any, { code }: RunSASPayload) => {
+  try {
+    const result = await new ExecutionController().executeProgram(
+      code,
+      getPreProgramVariables(req),
+      { ...req.query, _debug: 131 }
+    )
+
+    return result as string
+  } catch (err: any) {
+    throw {
+      code: 400,
+      status: 'failure',
+      message: 'Job execution failed.',
+      error: typeof err === 'object' ? err.toString() : err
+    }
+  }
+}
+
+const getPreProgramVariables = (req: any): PreProgramVars => {
+  const host = req.get('host')
+  const protocol = req.protocol + '://'
+  const { user, accessToken } = req
+  return {
+    username: user.username,
+    userId: user.userId,
+    displayName: user.displayName,
+    serverUrl: protocol + host,
+    accessToken
+  }
+}

api/src/controllers/stp.ts

@@ -5,13 +5,6 @@ import { ExecutionController } from './internal'
 import { PreProgramVars } from '../types'
 import { getTmpFilesFolderPath, makeFilesNamesMap } from '../utils'
 
-interface RunSASPayload {
-  /**
-   * Code of SAS program
-   * @example "* SAS Code HERE;"
-   */
-  code: string
-}
 interface ExecuteReturnJsonPayload {
   /**
    * Location of SAS program
@@ -48,18 +41,6 @@ export class STPController {
     return executeReturnRaw(request, _program)
   }
 
-  /**
-   * Trigger a SAS program.
-   * @summary Run SAS Program, return raw content
-   */
-  @Post('/run')
-  public async runSAS(
-    @Request() request: express.Request,
-    @Body() body: RunSASPayload
-  ): Promise<string> {
-    return runSAS(request, body)
-  }
-
   /**
    * Trigger a SAS program using it's location in the _program parameter.
    * Enable debugging using the _debug parameter.
@@ -109,25 +90,6 @@ const executeReturnRaw = async (
   }
 }
 
-const runSAS = async (req: any, { code }: RunSASPayload) => {
-  try {
-    const result = await new ExecutionController().executeProgram(
-      code,
-      getPreProgramVariables(req),
-      req.query
-    )
-
-    return result as string
-  } catch (err: any) {
-    throw {
-      code: 400,
-      status: 'failure',
-      message: 'Job execution failed.',
-      error: typeof err === 'object' ? err.toString() : err
-    }
-  }
-}
-
 const executeReturnJson = async (
   req: any,
   _program: string