feat(app-admin): extract common functions into FM provider

webiny · Mar 17, 2023 · c589100 · c589100
1 parent cae03ac
commit c589100
Show file tree

Hide file tree

Showing 85 changed files with 868 additions and 1,259 deletions.
diff --git a/packages/api-file-manager-s3/package.json b/packages/api-file-manager-s3/package.json
@@ -16,6 +16,7 @@
     "@webiny/validation": "0.0.0",
     "form-data": "^4.0.0",
     "mdbid": "^1.0.0",
+    "mime": "^3.0.0",
     "node-fetch": "^2.6.1",
     "sanitize-filename": "^1.6.3"
   },

diff --git a/packages/api-file-manager-s3/src/utils/getPresignedPostPayload.ts b/packages/api-file-manager-s3/src/utils/getPresignedPostPayload.ts
@@ -2,6 +2,7 @@
 import mdbid from "mdbid";
 import sanitizeFilename from "sanitize-filename";
 import S3 from "aws-sdk/clients/s3";
+import mime from "mime";
 import { validation } from "@webiny/validation";
 import { PresignedPostPayloadData, PresignedPostPayloadDataResponse } from "~/types";
 import { FileManagerSettings } from "@webiny/api-file-manager/types";
@@ -47,6 +48,12 @@ export default async (
     // Replace all whitespace.
     key = key.replace(/\s/g, "");
 
+    // Make sure file key contains a file extension
+    const ext = mime.getExtension(contentType);
+    if (!key.endsWith(`.${ext}`)) {
+        key = key + `.${ext}`;
+    }
+
     const uploadMinFileSize = sanitizeFileSizeValue(settings.uploadMinFileSize, 0);
     const uploadMaxFileSize = sanitizeFileSizeValue(
         settings.uploadMaxFileSize,

diff --git a/packages/app-admin/src/assets/icons/add-18px.svg b/packages/app-admin/src/assets/icons/add-18px.svg
diff --git a/packages/app-admin/src/assets/icons/arrow_drop_down-24px.svg b/packages/app-admin/src/assets/icons/arrow_drop_down-24px.svg
diff --git a/packages/app-admin/src/assets/icons/attach_file_black_24dp.svg b/packages/app-admin/src/assets/icons/attach_file_black_24dp.svg
diff --git a/packages/app-admin/src/assets/icons/baseline-menu-24px.svg b/packages/app-admin/src/assets/icons/baseline-menu-24px.svg
diff --git a/packages/app-admin/src/assets/icons/baseline-notification_important-24px.svg b/packages/app-admin/src/assets/icons/baseline-notification_important-24px.svg
diff --git a/packages/app-admin/src/assets/icons/baseline-security-24px.svg b/packages/app-admin/src/assets/icons/baseline-security-24px.svg
diff --git a/packages/app-admin/src/assets/icons/filter-24px.svg b/packages/app-admin/src/assets/icons/filter-24px.svg
diff --git a/packages/app-admin/src/assets/icons/highlight-24px.svg b/packages/app-admin/src/assets/icons/highlight-24px.svg
diff --git a/packages/app-admin/src/assets/icons/info.svg b/packages/app-admin/src/assets/icons/info.svg
diff --git a/packages/app-admin/src/assets/icons/insert_drive_file-24px.svg b/packages/app-admin/src/assets/icons/insert_drive_file-24px.svg
diff --git a/packages/app-admin/src/assets/icons/insert_photo-24px.svg b/packages/app-admin/src/assets/icons/insert_photo-24px.svg
diff --git a/packages/app-admin/src/assets/icons/label-24px.svg b/packages/app-admin/src/assets/icons/label-24px.svg
diff --git a/packages/app-admin/src/assets/icons/round-account_circle-24px.svg b/packages/app-admin/src/assets/icons/round-account_circle-24px.svg
diff --git a/packages/app-admin/src/assets/icons/round-add-24px.svg b/packages/app-admin/src/assets/icons/round-add-24px.svg
diff --git a/packages/app-admin/src/assets/icons/round-arrow_drop_down-24px.svg b/packages/app-admin/src/assets/icons/round-arrow_drop_down-24px.svg
diff --git a/packages/app-admin/src/assets/icons/round-chevron_right-24px.svg b/packages/app-admin/src/assets/icons/round-chevron_right-24px.svg
diff --git a/packages/app-admin/src/assets/icons/round-feedback-24px.svg b/packages/app-admin/src/assets/icons/round-feedback-24px.svg
diff --git a/packages/app-admin/src/assets/icons/round-help-24px.svg b/packages/app-admin/src/assets/icons/round-help-24px.svg
diff --git a/packages/app-admin/src/assets/icons/round-invert_colors-24px.svg b/packages/app-admin/src/assets/icons/round-invert_colors-24px.svg
diff --git a/packages/app-admin/src/assets/icons/round-keyboard_arrow_down-24px.svg b/packages/app-admin/src/assets/icons/round-keyboard_arrow_down-24px.svg
diff --git a/packages/app-admin/src/assets/icons/round-keyboard_arrow_up-24px.svg b/packages/app-admin/src/assets/icons/round-keyboard_arrow_up-24px.svg
diff --git a/packages/app-admin/src/assets/icons/round-lock_open-24px.svg b/packages/app-admin/src/assets/icons/round-lock_open-24px.svg
diff --git a/packages/app-admin/src/assets/icons/round-more_vert-24px.svg b/packages/app-admin/src/assets/icons/round-more_vert-24px.svg