chore: allow .txt .svg .md and so on

HemmeligOrg · Aug 30, 2022 · 8d79ddd · 8d79ddd
1 parent 6558a15
commit 8d79ddd
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 95 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "fastify": "^4.5.3",
     "fastify-jwt": "^3.0.0",
     "fastify-plugin": "^3.0.0",
-    "file-type": "^16.5.4",
+    "file-type": "^18.0.0",
     "is-base64": "^1.1.0",
     "is-ip": "^3.1.0",
     "nanoid": "^3.1.31",

diff --git a/src/server/decorators/attachment-upload.js b/src/server/decorators/attachment-upload.js
@@ -1,5 +1,7 @@
+import path from 'path';
+import validator from 'validator';
 import fp from 'fastify-plugin';
-import FileType from 'file-type';
+import { fileTypeFromBuffer } from 'file-type';
 
 import fileAdapter from '../services/file-adapter.js';
 
@@ -46,7 +48,10 @@ export default fp(async (fastify) => {
         if (file.mimetype) {
             const fileData = await file.toBuffer();
 
-            const { ext, mime } = await FileType.fromBuffer(fileData);
+            const metadata = await fileTypeFromBuffer(fileData);
+
+            const mime = metadata?.mime ? metadata.mime : file.mimetype.toString();
+            const ext = metadata?.ext ? metadata.ext : path.extname(file.filename);
 
             if (!acceptedFileType(mime)) {
                 return reply.code(415).send({