Merge pull request #541 from rfcx/fix-multer-upload

Fix multer upload
rfcx · Feb 22, 2024 · 9e6e98e · 9e6e98e
2 parents fea68ef + 7b603db
commit 9e6e98e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/common/users/index.js b/common/users/index.js
@@ -89,10 +89,10 @@ function update (user, attrs) {
 
 function checkUserPicture (files) {
   return new Promise((resolve, reject) => {
-    if (Array.isArray(files.file)) {
+    if (files.length > 1) {
       return reject(new ValidationError('It is only one file allowed to be uploaded.'))
     }
-    const file = files.file
+    const file = files[0]
     if (!file) {
       return reject(new ValidationError('No file provided.'))
     }

diff --git a/core/classifiers/create.js b/core/classifiers/create.js
@@ -52,8 +52,11 @@ module.exports = async (req, res) => {
 
     // Upload model if included
     let modelUrl = ''
-    if (req.files && req.files.file) {
-      const file = req.files.file
+    if (req.files && req.files.length > 0) {
+      if (req.files.length > 1) {
+        throw new ValidationError('Can upload only 1 file at a time')
+      }
+      const file = req.files[0]
       if (!file.originalname.endsWith('.tar.gz')) {
         throw new ValidationError('File must be .tar.gz')
       }

diff --git a/noncore/v1/guardians/guardians-checkins.js b/noncore/v1/guardians/guardians-checkins.js
@@ -110,7 +110,8 @@ router.route('/:guardian_id/checkins')
       })
       .then(function () {
         // parse, review and save screenshots
-        const screenShotInfo = checkInHelpers.screenshots.info(req.files.screenshot, strArrToJSArr(this.json.screenshots, '|', '*'),
+        const screenshotFile = req.files.find(x => x.fieldname === 'screenshot')
+        const screenShotInfo = checkInHelpers.screenshots.info(screenshotFile, strArrToJSArr(this.json.screenshots, '|', '*'),
           this.dbGuardian.id, this.dbGuardian.guid, this.dbCheckIn.id)
         const proms = []
         for (const screenShotInfoInd in screenShotInfo) {
@@ -126,7 +127,8 @@ router.route('/:guardian_id/checkins')
       .then(function () {
         const self = this
         // parse, review and save audio
-        const audioInfo = checkInHelpers.audio.info(req.files.audio, req.rfcx.api_url_domain, strArrToJSArr(this.json.audio, '|', '*'), this.dbGuardian, this.dbCheckIn)
+        const audioFile = req.files.find(x => x.fieldname === 'audio')
+        const audioInfo = checkInHelpers.audio.info(audioFile, req.rfcx.api_url_domain, strArrToJSArr(this.json.audio, '|', '*'), this.dbGuardian, this.dbCheckIn)
         const proms = []
         for (const audioInfoInd in audioInfo) {
           const info = audioInfo[audioInfoInd]

diff --git a/noncore/v1/users/users.js b/noncore/v1/users/users.js
@@ -207,15 +207,15 @@ router.route('/avatar-change')
       })
       .then(() => {
         const opts = {
-          filePath: req.files.file.path,
-          fileName: `/userpics/${guid}${path.extname(req.files.file.originalname)}`,
+          filePath: req.files[0].path,
+          fileName: `/userpics/${guid}${path.extname(req.files[0].originalname)}`,
           bucket: process.env.USERS_BUCKET,
           acl: 'public-read'
         }
         return usersService.uploadImageFile(opts)
       })
       .then(() => {
-        const url = `https://${process.env.USERS_BUCKET}.s3-${process.env.AWS_REGION_ID}.amazonaws.com/userpics/${guid}${path.extname(req.files.file.originalname)}`
+        const url = `https://${process.env.USERS_BUCKET}.s3-${process.env.AWS_REGION_ID}.amazonaws.com/userpics/${guid}${path.extname(req.files[0].originalname)}`
         return usersService.prepareUserUrlPicture(user, url)
           .then(() => {
             return url