fix(api-file-manager): extract file extension from an optional key

packages/api-file-manager-s3/jest.config.js

@@ -0,0 +1,5 @@
+const base = require("../../jest.config.base");
+
+module.exports = {
+    ...base({ path: __dirname })
+};

packages/api-file-manager-s3/src/plugins/graphqlFileStorageS3.ts

@@ -28,6 +28,8 @@ const plugin: GraphQLSchemaPlugin<FileManagerContext> = {
                 name: String!
                 type: String!
                 size: Long!
+                key: String
+                keyPrefix: String
             }
 
             type GetPreSignedPostPayloadResponseDataFile {

packages/api-file-manager-s3/src/utils/FileExtension.ts

@@ -9,15 +9,12 @@ export class FileExtension {
     }
 
     getValue() {
-        const name = this.data.name.toLowerCase();
-        const maybeHasExtension = name.includes(".");
+        const name = (this.data.key || this.data.name).toLowerCase();
 
-        if (maybeHasExtension) {
-            const maybeExt = name.split(".").pop() as string;
-            const extensions = mimeTypes[this.data.type];
-            if (extensions && !extensions.includes(maybeExt)) {
-                return extensions[0];
-            }
+        const maybeExt = name.split(".").pop() as string;
+        const extensions = mimeTypes[this.data.type];
+        if (extensions && !extensions.includes(maybeExt)) {
+            return extensions[0];
         }
 
         return "";

packages/api-file-manager-s3/src/utils/FileKey.test.ts

@@ -0,0 +1,68 @@
+import { FileKey } from "./FileKey";
+
+describe("FileKey", () => {
+    it("should generate a file key (extension is included in the name)", () => {
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image-14.jpg",
+            type: "image/jpeg"
+        });
+
+        expect(fileKey.toString()).toEqual("image-14.jpg");
+    });
+
+    it("should generate a file key (extension derived from file type)", () => {
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image-14",
+            type: "image/jpeg"
+        });
+
+        expect(fileKey.toString()).toEqual("image-14.jpeg");
+    });
+
+    it("should generate a file key containing id", () => {
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image-14.jpeg",
+            type: "image/jpeg",
+            id: "12345678"
+        });
+
+        expect(fileKey.toString()).toEqual("12345678/image-14.jpeg");
+    });
+
+    it("should generate a file key containing prefix", () => {
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image-14.jpeg",
+            type: "image/jpeg",
+            keyPrefix: "prefix"
+        });
+
+        expect(fileKey.toString()).toEqual("prefix/image-14.jpeg");
+    });
+
+    it("should generate a file key containing id and prefix", () => {
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image-14.jpeg",
+            type: "image/jpeg",
+            id: "12345678",
+            keyPrefix: "prefix"
+        });
+
+        expect(fileKey.toString()).toEqual("prefix/12345678/image-14.jpeg");
+    });
+
+    it("should use the key defined in the input", () => {
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image",
+            type: "image/jpeg",
+            key: "image-14.jpg"
+        });
+
+        expect(fileKey.toString()).toEqual("image-14.jpg");
+    });
+});

packages/api-file-manager-s3/src/utils/FileKey.ts

@@ -27,7 +27,7 @@ export class FileKey {
     }
 
     private getSanitizedKey() {
-        const key = sanitizeFilename(this.data.name).replace(/\s/g, "");
+        const key = sanitizeFilename(this.data.key || this.data.name).replace(/\s/g, "");
 
         return [key, this.getExtension()].filter(Boolean).join(".");
     }