From d9555e151b0e1d1a4068efdf8ee9ed53b25b9b89 Mon Sep 17 00:00:00 2001
From: Mihajlo Medjedovic <mihmed@sas.analytium.co.uk>
Date: Mon, 18 Oct 2021 10:42:21 +0000
Subject: [PATCH] fix: debug not passed

---
 src/controllers/Execution.ts            | 4 ++--
 src/controllers/FileUploadController.ts | 2 +-
 src/routes/index.ts                     | 4 ++--
 src/utils/upload.ts                     | 7 ++++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/controllers/Execution.ts b/src/controllers/Execution.ts
index 24827b7..e24b576 100644
--- a/src/controllers/Execution.ts
+++ b/src/controllers/Execution.ts
@@ -41,7 +41,7 @@ export class ExecutionController {
 
     let webout = path.join(session.path, 'webout.txt')
     await createFile(webout, '')
-
+    
     program = `
 %let sasjsprocessmode=Stored Program;
 filename _webout "${webout}";
@@ -49,7 +49,7 @@ ${program}`
 
     // if no files are uploaded filesNamesMap will be undefined
     if (otherArgs && otherArgs.filesNamesMap) {
-      const uploadSasCode = generateFileUploadSasCode(
+      const uploadSasCode = await generateFileUploadSasCode(
         otherArgs.filesNamesMap,
         session.path
       )
diff --git a/src/controllers/FileUploadController.ts b/src/controllers/FileUploadController.ts
index 3a55fce..53d42de 100644
--- a/src/controllers/FileUploadController.ts
+++ b/src/controllers/FileUploadController.ts
@@ -16,7 +16,7 @@ export class FileUploadController {
 
   private upload = multer({ storage: this.storage })
 
-  //It will intercept request and generate uniqe uuid to be used as a subfolder name
+  //It will intercept request and generate unique uuid to be used as a subfolder name
   //that will store the files uploaded
   public preuploadMiddleware = async (req: any, res: any, next: any) => {
     let session
diff --git a/src/routes/index.ts b/src/routes/index.ts
index 7a9302a..930ec44 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -103,13 +103,13 @@ router.post(
       if (req.files && req.files.length > 0) {
         filesNamesMap = makeFilesNamesMap(req.files)
       }
-
+      
       await new ExecutionController()
         .execute(
           sasCodePath,
           undefined,
           req.sasSession,
-          { ...req.query },
+          { ...req.query, ...req.body },
           { filesNamesMap: filesNamesMap }
         )
         .then((result: {}) => {
diff --git a/src/utils/upload.ts b/src/utils/upload.ts
index e0ce494..c216cd4 100644
--- a/src/utils/upload.ts
+++ b/src/utils/upload.ts
@@ -27,10 +27,10 @@ export const makeFilesNamesMap = (files: MulterFile[]) => {
  * @param sasUploadFolder name of the folder that is created for the purpose of files in concurrent request
  * @returns generated sas code
  */
-export const generateFileUploadSasCode = (
+export const generateFileUploadSasCode = async (
   filesNamesMap: any,
   sasSessionFolder: string
-): string => {
+): Promise<string> => {
   let uploadSasCode = ''
   let fileCount = 0
   let uploadedFilesMap: {
@@ -40,7 +40,8 @@ export const generateFileUploadSasCode = (
     count: number
   }[] = []
 
-  fs.readdirSync(sasSessionFolder).forEach((fileName) => {
+  const sasSessionFolderList: string[] = await listFilesInFolder(sasSessionFolder)
+  sasSessionFolderList.forEach((fileName) => {
     let fileCountString = fileCount < 100 ? '0' + fileCount : fileCount
     fileCountString = fileCount < 10 ? '00' + fileCount : fileCount