From c32f18a6977c4db5378144dedc9a126e4a91b767 Mon Sep 17 00:00:00 2001
From: Bobby Wibowo <bobbywibowo98@gmail.com>
Date: Tue, 12 Jul 2022 15:26:53 +0700
Subject: [PATCH] fix: uploads mimetype not properly set

---
 controllers/uploadController.js | 49 +++++++++++++++------------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/controllers/uploadController.js b/controllers/uploadController.js
index 85c7e47..a9d7715 100644
--- a/controllers/uploadController.js
+++ b/controllers/uploadController.js
@@ -294,15 +294,24 @@ self.upload = async (req, res) => {
 
       // Write the file into disk, and return an object containing the required file information
       const file = await new Promise((resolve, reject) => {
+        const finalPath = path.join(destination, filename)
+
         // "weighted" resolve function, to be able to "await" multiple callbacks
         const REQUIRED_WEIGHT = 2
-        let tempObject = { originalname, extname }
-        let tempWeight = 0
+        let _result = {
+          destination,
+          extname,
+          filename,
+          mimetype: field.mime_type,
+          originalname,
+          path: finalPath
+        }
+        let _weight = 0
         const _resolve = (result = {}, weight = 2) => {
-          tempWeight += weight
-          tempObject = Object.assign(result, tempObject)
-          if (tempWeight >= REQUIRED_WEIGHT) {
-            resolve(tempObject)
+          _weight += weight
+          _result = Object.assign(result, _result)
+          if (_weight >= REQUIRED_WEIGHT) {
+            resolve(_result)
           }
         }
 
@@ -314,8 +323,6 @@ self.upload = async (req, res) => {
           reject(error)
         }
 
-        const finalPath = path.join(destination, filename)
-
         if (isChunk) {
           if (!chunksData.stream) {
             chunksData.stream = fs.createWriteStream(finalPath, { flags: 'a' })
@@ -343,31 +350,19 @@ self.upload = async (req, res) => {
         field.file.stream.on('data', d => hash.update(d))
 
         if (isChunk) {
-          field.file.stream.on('end', () => {
-            _resolve({
-              destination,
-              filename,
-              path: finalPath
-            })
-          })
+          field.file.stream.on('end', () => _resolve())
           field.file.stream.pipe(outStream, { end: false })
         } else {
-          outStream.on('finish', () => {
-            _resolve({
-              destination,
-              filename,
-              path: finalPath,
-              size: outStream.bytesWritten,
-              hash: hash.digest('hex')
-            }, scanStream ? 1 : 2)
-          })
+          outStream.on('finish', () => _resolve({
+            size: outStream.bytesWritten,
+            hash: hash.digest('hex')
+          }, scanStream ? 1 : 2)
+          )
 
           if (scanStream) {
             logger.debug(`[ClamAV]: ${filename}: Passthrough scanning\u2026`)
             scanStream.on('error', onerror)
-            scanStream.on('scan-complete', scan => {
-              _resolve({ scan }, 1)
-            })
+            scanStream.on('scan-complete', scan => _resolve({ scan }, 1))
             field.file.stream.pipe(scanStream).pipe(outStream)
           } else {
             field.file.stream.pipe(outStream)