fix(channel-web): fixed file upload not sending uploaded file namme

botpress · Mar 23, 2019 · afb5f1f · afb5f1f
1 parent d9af389
commit afb5f1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/modules/channel-web/src/backend/api.ts b/modules/channel-web/src/backend/api.ts
@@ -16,7 +16,10 @@ const ERR_MSG_TYPE = '`type` is required and must be valid'
 const ERR_CONV_ID_REQ = '`conversationId` is required and must be valid'
 
 export default async (bp: typeof sdk, db: Database) => {
+  const globalConfig = (await bp.config.getModuleConfig('channel-web')) as Config
+
   const diskStorage = multer.diskStorage({
+    destination: globalConfig.fileUploadPath,
     limits: {
       files: 1,
       fileSize: 5242880 // 5MB
@@ -29,8 +32,6 @@ export default async (bp: typeof sdk, db: Database) => {
     }
   })
 
-  const globalConfig = await bp.config.getModuleConfig('channel-web')
-
   let upload = multer({ storage: diskStorage })
 
   if (globalConfig.uploadsUseS3) {
@@ -172,8 +173,9 @@ export default async (bp: typeof sdk, db: Database) => {
         type: 'file',
         data: {
           storage: req.file.location ? 's3' : 'local',
-          url: req.file.location || undefined,
-          name: req.file.originalname,
+          url: req.file.location || req.file.path || undefined,
+          name: req.file.filename,
+          originalName: req.file.originalname,
           mime: req.file.contentType || req.file.mimetype,
           size: req.file.size
         }

diff --git a/modules/channel-web/src/config.ts b/modules/channel-web/src/config.ts
@@ -35,4 +35,9 @@ export interface Config {
    * @default false
    */
   showBotInfoPage: boolean
+  /**
+   * Destination of file uploads if S3 is not enabled
+   * @default ./uploads
+   */
+  fileUploadPath: string
 }