fix(documents): add mimeType lookup for mimeType/file-extension check

Author: tstoppe89

addon/services/alexandria-documents.js

@@ -11,11 +11,19 @@ import { ErrorHandler } from "ember-alexandria/utils/error-handler";
  * Check if document upload is in allowed mime types of category
  * If no allowedMimeTypes are set on the category, just return true
  */
-const fileHasValidMimeType = (file, category) =>
-  category.allowedMimeTypes?.includes(
-    file.type || mime.getType(file.name ?? file.title),
-  ) ?? true;
+function fileHasValidMimeType(file, category) {
+  if (!category.allowedMimeTypes) {
+    return true;
+  }
+
+  if (file instanceof File) {
+    // newly uploaded files that do not have a model yet
+    return category.allowedMimeTypes.includes(file.type);
+  }
 
+  // existing file models
+  return category.allowedMimeTypes.includes(file.mimeType);
+}
 export default class AlexandriaDocumentsService extends Service {
   @service store;
   @service("alexandria-config") config;
@@ -160,7 +168,12 @@ export default class AlexandriaDocumentsService extends Service {
           return true;
         }
 
-        if (!fileHasValidMimeType(document, newCategory)) {
+        const files = (await document.files) ?? [];
+        if (
+          files
+            .filter((f) => f.variant === "original")
+            .some((file) => !fileHasValidMimeType(file, newCategory))
+        ) {
           return "invalid-file-type";
         }
 

tests/acceptance/documents-test.js

@@ -170,7 +170,9 @@ module("Acceptance | documents", function (hooks) {
         });
     });
     await triggerEvent("[data-test-upload] [data-test-input]", "change", {
-      files: [new File(["Ember Rules!"], "test-file.txt")],
+      files: [
+        new File(["Ember Rules!"], "test-file.txt", { type: "text/plain" }),
+      ],
     });
     assert.dom("[data-test-document-list-item]").exists({ count: 1 });
   });

tests/integration/components/category-nav/category-test.js

@@ -34,12 +34,30 @@ module("Integration | Component | category-nav/category", function (hooks) {
   test("it moves dropped documents to new category", async function (assert) {
     const category = this.server.create("category");
     const oldCategory = this.server.create("category");
-    const documents = this.server.createList("document", 2, {
-      categoryId: oldCategory.id,
-      title: "test.txt",
-    });
-    documents[1].update({ title: "test.xlsx" });
-
+    const documents = [
+      // Case 1: File with ext in name & allowed mimType
+      this.server.create("document", {
+        categoryId: oldCategory.id,
+        title: "TestTextFile",
+        files: [
+          this.server.create("file", {
+            name: "test.txt",
+            mimeType: "text/plain",
+          }),
+        ],
+      }),
+      // Case 2: File with not allowed mimeType
+      this.server.create("document", {
+        categoryId: oldCategory.id,
+        title: "TestVid",
+        files: [
+          this.server.create("file", {
+            name: "TestVid.webm",
+            mimeType: "video/webm",
+          }),
+        ],
+      }),
+    ];
     const store = this.owner.lookup("service:store");
 
     this.category = await store.findRecord("category", category.id);
@@ -59,7 +77,9 @@ module("Integration | Component | category-nav/category", function (hooks) {
       dataTransfer: {
         getData: () => documents.map((d) => d.id).join(","),
         // sometimes browser send a file as well (e.g. when dragging a thumbnail) - this should be ignored
-        files: [new File(["Thumbnail"], "test-file.docx")],
+        files: [
+          new File(["Thumbnail"], "test-file.txt", { type: "text/plain" }),
+        ],
       },
     });
 

tests/unit/services/alexandria-documents-test.js

@@ -15,10 +15,13 @@ module("Unit | Service | alexandria-documents", function (hooks) {
       "category",
       this.server.create("category").id,
     );
+
+    const docxMimeType =
+      "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
     const files = [
-      new File(["1"], "test1.docx"),
-      new File(["2"], "test2.docx"),
-      new File(["3"], "test3.docx"),
+      new File(["1"], "test1.docx", { type: docxMimeType }),
+      new File(["2"], "test2.docx", { type: docxMimeType }),
+      new File(["3"], "test3.docx", { type: docxMimeType }),
     ];
 
     await service.upload(category, files);