From 299512135d77c2ac9e34853cf35aee6f2e1d4da4 Mon Sep 17 00:00:00 2001
From: sabhas <sabirbk06@gmail.com>
Date: Tue, 19 Jul 2022 13:00:33 +0500
Subject: [PATCH 1/2] fix: filePath fix in code.js file for windows

---
 api/src/controllers/internal/createJSProgram.ts | 2 +-
 api/src/utils/upload.ts                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/src/controllers/internal/createJSProgram.ts b/api/src/controllers/internal/createJSProgram.ts
index b1e041c..8e39524 100644
--- a/api/src/controllers/internal/createJSProgram.ts
+++ b/api/src/controllers/internal/createJSProgram.ts
@@ -23,7 +23,7 @@ let _webout = '';
 const weboutPath = '${
     isWindows() ? weboutPath.replace(/\\/g, '\\\\') : weboutPath
   }'; 
-const _sasjs_tokenfile = '${tokenFile}';
+const _sasjs_tokenfile = '${isWindows() ? tokenFile.replace(/\\/g, '\\\\') : tokenFile }';
 const _sasjs_username = '${preProgramVariables?.username}';
 const _sasjs_userid = '${preProgramVariables?.userId}';
 const _sasjs_displayname = '${preProgramVariables?.displayName}';
diff --git a/api/src/utils/upload.ts b/api/src/utils/upload.ts
index cc9a47f..a8618c2 100644
--- a/api/src/utils/upload.ts
+++ b/api/src/utils/upload.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 import { MulterFile } from '../types/Upload'
-import { listFilesInFolder, readFileBinary } from '@sasjs/utils'
+import { listFilesInFolder, readFileBinary, isWindows } from '@sasjs/utils'
 
 interface FilenameMapSingle {
   fieldName: string
@@ -118,7 +118,7 @@ export const generateFileUploadJSCode = async (
     if (fileName.includes('req_file')) {
       fileCount++
       const filePath = path.join(sessionFolder, fileName)
-      uploadCode += `\nconst _WEBIN_FILEREF${fileCount} = fs.readFileSync('${filePath}')`
+      uploadCode += `\nconst _WEBIN_FILEREF${fileCount} = fs.readFileSync('${isWindows() ? filePath.replace(/\\/g, '\\\\') :  filePath}')`
       uploadCode += `\nconst _WEBIN_FILENAME${fileCount} = '${filesNamesMap[fileName].originalName}'`
       uploadCode += `\nconst _WEBIN_NAME${fileCount} = '${filesNamesMap[fileName].fieldName}'`
     }

From 63dd6813c0585de7a92d79e90e4e32729ee4632c Mon Sep 17 00:00:00 2001
From: sabhas <sabirbk06@gmail.com>
Date: Tue, 19 Jul 2022 13:07:34 +0500
Subject: [PATCH 2/2] chore: lint fix

---
 api/src/controllers/internal/createJSProgram.ts | 4 +++-
 api/src/utils/upload.ts                         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/api/src/controllers/internal/createJSProgram.ts b/api/src/controllers/internal/createJSProgram.ts
index 8e39524..c669ac5 100644
--- a/api/src/controllers/internal/createJSProgram.ts
+++ b/api/src/controllers/internal/createJSProgram.ts
@@ -23,7 +23,9 @@ let _webout = '';
 const weboutPath = '${
     isWindows() ? weboutPath.replace(/\\/g, '\\\\') : weboutPath
   }'; 
-const _sasjs_tokenfile = '${isWindows() ? tokenFile.replace(/\\/g, '\\\\') : tokenFile }';
+const _sasjs_tokenfile = '${
+    isWindows() ? tokenFile.replace(/\\/g, '\\\\') : tokenFile
+  }';
 const _sasjs_username = '${preProgramVariables?.username}';
 const _sasjs_userid = '${preProgramVariables?.userId}';
 const _sasjs_displayname = '${preProgramVariables?.displayName}';
diff --git a/api/src/utils/upload.ts b/api/src/utils/upload.ts
index a8618c2..8a64e62 100644
--- a/api/src/utils/upload.ts
+++ b/api/src/utils/upload.ts
@@ -118,7 +118,9 @@ export const generateFileUploadJSCode = async (
     if (fileName.includes('req_file')) {
       fileCount++
       const filePath = path.join(sessionFolder, fileName)
-      uploadCode += `\nconst _WEBIN_FILEREF${fileCount} = fs.readFileSync('${isWindows() ? filePath.replace(/\\/g, '\\\\') :  filePath}')`
+      uploadCode += `\nconst _WEBIN_FILEREF${fileCount} = fs.readFileSync('${
+        isWindows() ? filePath.replace(/\\/g, '\\\\') : filePath
+      }')`
       uploadCode += `\nconst _WEBIN_FILENAME${fileCount} = '${filesNamesMap[fileName].originalName}'`
       uploadCode += `\nconst _WEBIN_NAME${fileCount} = '${filesNamesMap[fileName].fieldName}'`
     }