Merge pull request #34 from Yoshiin/yoshin/fix-empty-acceptedMimeType

giomfo · web-flow · commit 76627265c676 · 2019-04-04T19:34:23.000+02:00
Fixing a bug where the file is not copied for analyse if the acceptedMimeType option is not present
diff --git a/src/reporting.js b/src/reporting.js
@@ -293,12 +293,12 @@ async function generateReport(console, httpUrl, matrixFile, filePath, tempDir, s
                 console.info(`FileType: ${type.mime}`);
                 return {clean: false, info: 'File type not supported'};
             }
-            try {
-                fs.copyFileSync(filePath, decryptedFilePath);
-            } catch (err) {
-                console.error(err);
-                throw new ClientError(400, 'Failed to copy file for decryption', 'MCS_MEDIA_FAILED_TO_DECRYPT');
-            }
+        }
+        try {
+            fs.copyFileSync(filePath, decryptedFilePath);
+        } catch (err) {
+            console.error(err);
+            throw new ClientError(400, 'Failed to copy file for decryption', 'MCS_MEDIA_FAILED_TO_DECRYPT');
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -293,12 +293,12 @@ async function generateReport(console, httpUrl, matrixFile, filePath, tempDir, s`
`293`	`293`	console.info(`FileType: ${type.mime}`);
`294`	`294`	`return {clean: false, info: 'File type not supported'};`
`295`	`295`	`}`
`296`		`- try {`
`297`		`- fs.copyFileSync(filePath, decryptedFilePath);`
`298`		`- } catch (err) {`
`299`		`- console.error(err);`
`300`		`- throw new ClientError(400, 'Failed to copy file for decryption', 'MCS_MEDIA_FAILED_TO_DECRYPT');`
`301`		`- }`
	`296`	`+ }`
	`297`	`+ try {`
	`298`	`+ fs.copyFileSync(filePath, decryptedFilePath);`
	`299`	`+ } catch (err) {`
	`300`	`+ console.error(err);`
	`301`	`+ throw new ClientError(400, 'Failed to copy file for decryption', 'MCS_MEDIA_FAILED_TO_DECRYPT');`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`