@webiny/api-file-manager-s3 0.0.0-mt-3 → 0.0.0-unstable.2af142b57e

package/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: () => (import("@webiny/handler-graphql/types").GraphQLSchemaPlugin<import("@webiny/api-file-manager/types").FileManagerContext> | import("@webiny/api-file-manager/plugins/definitions/FilePhysicalStoragePlugin").FilePhysicalStoragePlugin)[];
+declare const _default: () => (import("@webiny/handler-graphql/types").GraphQLSchemaPlugin<import("@webiny/api-file-manager/types").FileManagerContext> | import("@webiny/api-file-manager/plugins/definitions/FilePhysicalStoragePlugin").FilePhysicalStoragePlugin<import("@webiny/api-file-manager/plugins/definitions/FilePhysicalStoragePlugin").FilePhysicalStoragePluginUploadParams, import("@webiny/api-file-manager/plugins/definitions/FilePhysicalStoragePlugin").FilePhysicalStoragePluginDeleteParams>)[];
 export default _default;

package/index.js

@@ -1,16 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _graphqlFileStorageS = _interopRequireDefault(require("./plugins/graphqlFileStorageS3"));
-
 var _fileStorageS = _interopRequireDefault(require("./plugins/fileStorageS3"));
-
 var _default = () => [(0, _fileStorageS.default)(), _graphqlFileStorageS.default];
-
 exports.default = _default;

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["fileStorageS3","graphqlFileStorageS3"],"sources":["index.ts"],"sourcesContent":["import graphqlFileStorageS3 from \"./plugins/graphqlFileStorageS3\";\nimport fileStorageS3 from \"./plugins/fileStorageS3\";\n\nexport default () => [fileStorageS3(), graphqlFileStorageS3];\n"],"mappings":";;;;;;;AAAA;AACA;AAAoD,eAErC,MAAM,CAAC,IAAAA,qBAAa,GAAE,EAAEC,4BAAoB,CAAC;AAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-file-manager-s3",
-	"version": "0.0.0-mt-3",
+	"version": "0.0.0-unstable.2af142b57e",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -10,21 +10,23 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api-file-manager": "0.0.0-mt-3",
-		"@webiny/handler-graphql": "0.0.0-mt-3",
-		"@webiny/validation": "0.0.0-mt-3",
-		"form-data": "3.0.1",
-		"node-fetch": "2.6.5",
+		"@webiny/api-file-manager": "0.0.0-unstable.2af142b57e",
+		"@webiny/error": "0.0.0-unstable.2af142b57e",
+		"@webiny/handler-graphql": "0.0.0-unstable.2af142b57e",
+		"@webiny/validation": "0.0.0-unstable.2af142b57e",
+		"form-data": "4.0.0",
+		"node-fetch": "2.6.9",
 		"sanitize-filename": "1.6.3",
 		"uniqid": "5.4.0"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.5.5",
-		"@babel/core": "^7.5.5",
-		"@webiny/cli": "^0.0.0-mt-3",
-		"@webiny/project-utils": "^0.0.0-mt-3",
+		"@babel/cli": "^7.19.3",
+		"@babel/core": "^7.19.3",
+		"@types/node-fetch": "^2.6.1",
+		"@webiny/cli": "^0.0.0-unstable.2af142b57e",
+		"@webiny/project-utils": "^0.0.0-unstable.2af142b57e",
 		"rimraf": "^3.0.2",
-		"typescript": "^4.1.3"
+		"typescript": "4.7.4"
 	},
 	"publishConfig": {
 		"access": "public",
@@ -34,5 +36,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "ebea815be2be99404591cba465cc1fe88355bd48"
+	"gitHead": "2af142b57e7cdc433f5098b3b6d43ae6caa5d54e"
 }

package/plugins/fileStorageS3.d.ts

@@ -1,3 +1,6 @@
-import { FilePhysicalStoragePlugin } from "@webiny/api-file-manager/plugins/definitions/FilePhysicalStoragePlugin";
+import { FilePhysicalStoragePlugin, FilePhysicalStoragePluginUploadParams } from "@webiny/api-file-manager/plugins/definitions/FilePhysicalStoragePlugin";
+import { PresignedPostPayloadData } from "../types";
+export interface S3FilePhysicalStoragePluginUploadParams extends FilePhysicalStoragePluginUploadParams, PresignedPostPayloadData {
+}
 declare const _default: () => FilePhysicalStoragePlugin;
 export default _default;

package/plugins/fileStorageS3.js

@@ -1,53 +1,50 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
-
 var _getPresignedPostPayload = _interopRequireDefault(require("../utils/getPresignedPostPayload"));
-
 var _uploadFileToS = _interopRequireDefault(require("../utils/uploadFileToS3"));
-
 var _FilePhysicalStoragePlugin = require("@webiny/api-file-manager/plugins/definitions/FilePhysicalStoragePlugin");
-
 const _excluded = ["settings", "buffer"];
 const S3_BUCKET = process.env.S3_BUCKET;
-
 var _default = () => {
+  /**
+   * We need to extends the type for FilePhysicalStoragePlugin.
+   * Otherwise the getPresignedPostPayload does not know it has all required values in params.
+   */
   return new _FilePhysicalStoragePlugin.FilePhysicalStoragePlugin({
-    upload: async args => {
+    upload: async params => {
       const {
-        settings,
-        buffer
-      } = args,
-            data = (0, _objectWithoutProperties2.default)(args, _excluded);
+          settings,
+          buffer
+        } = params,
+        data = (0, _objectWithoutProperties2.default)(params, _excluded);
       const {
         data: preSignedPostPayload,
         file
       } = await (0, _getPresignedPostPayload.default)(data, settings);
       const response = await (0, _uploadFileToS.default)(buffer, preSignedPostPayload);
-
       if (!response.ok) {
         throw Error("Unable to upload file.");
       }
-
       return {
         data: preSignedPostPayload,
         file
       };
     },
-    delete: async args => {
+    delete: async params => {
       const {
         key
-      } = args;
+      } = params;
       const s3 = new _s.default();
+      if (!key || !S3_BUCKET) {
+        return;
+      }
       await s3.deleteObject({
         Bucket: S3_BUCKET,
         Key: key
@@ -55,5 +52,4 @@ var _default = () => {
     }
   });
 };
-
 exports.default = _default;

package/plugins/fileStorageS3.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["S3_BUCKET","process","env","FilePhysicalStoragePlugin","upload","params","settings","buffer","data","preSignedPostPayload","file","getPresignedPostPayload","response","uploadFileToS3","ok","Error","delete","key","s3","S3","deleteObject","Bucket","Key","promise"],"sources":["fileStorageS3.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport getPresignedPostPayload from \"../utils/getPresignedPostPayload\";\nimport uploadFileToS3 from \"../utils/uploadFileToS3\";\nimport {\n    FilePhysicalStoragePlugin,\n    FilePhysicalStoragePluginUploadParams\n} from \"@webiny/api-file-manager/plugins/definitions/FilePhysicalStoragePlugin\";\nimport { PresignedPostPayloadData } from \"~/types\";\n\nconst S3_BUCKET = process.env.S3_BUCKET;\n\nexport interface S3FilePhysicalStoragePluginUploadParams\n    extends FilePhysicalStoragePluginUploadParams,\n        PresignedPostPayloadData {}\n\nexport default (): FilePhysicalStoragePlugin => {\n    /**\n     * We need to extends the type for FilePhysicalStoragePlugin.\n     * Otherwise the getPresignedPostPayload does not know it has all required values in params.\n     */\n    return new FilePhysicalStoragePlugin<S3FilePhysicalStoragePluginUploadParams>({\n        upload: async params => {\n            const { settings, buffer, ...data } = params;\n\n            const { data: preSignedPostPayload, file } = await getPresignedPostPayload(\n                data,\n                settings\n            );\n\n            const response = await uploadFileToS3(buffer, preSignedPostPayload);\n            if (!response.ok) {\n                throw Error(\"Unable to upload file.\");\n            }\n\n            return {\n                data: preSignedPostPayload,\n                file\n            };\n        },\n        delete: async params => {\n            const { key } = params;\n            const s3 = new S3();\n\n            if (!key || !S3_BUCKET) {\n                return;\n            }\n\n            await s3\n                .deleteObject({\n                    Bucket: S3_BUCKET,\n                    Key: key\n                })\n                .promise();\n        }\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AACA;AACA;AACA;AAGgF;AAGhF,MAAMA,SAAS,GAAGC,OAAO,CAACC,GAAG,CAACF,SAAS;AAAC,eAMzB,MAAiC;EAC5C;AACJ;AACA;AACA;EACI,OAAO,IAAIG,oDAAyB,CAA0C;IAC1EC,MAAM,EAAE,MAAMC,MAAM,IAAI;MACpB,MAAM;UAAEC,QAAQ;UAAEC;QAAgB,CAAC,GAAGF,MAAM;QAAfG,IAAI,0CAAKH,MAAM;MAE5C,MAAM;QAAEG,IAAI,EAAEC,oBAAoB;QAAEC;MAAK,CAAC,GAAG,MAAM,IAAAC,gCAAuB,EACtEH,IAAI,EACJF,QAAQ,CACX;MAED,MAAMM,QAAQ,GAAG,MAAM,IAAAC,sBAAc,EAACN,MAAM,EAAEE,oBAAoB,CAAC;MACnE,IAAI,CAACG,QAAQ,CAACE,EAAE,EAAE;QACd,MAAMC,KAAK,CAAC,wBAAwB,CAAC;MACzC;MAEA,OAAO;QACHP,IAAI,EAAEC,oBAAoB;QAC1BC;MACJ,CAAC;IACL,CAAC;IACDM,MAAM,EAAE,MAAMX,MAAM,IAAI;MACpB,MAAM;QAAEY;MAAI,CAAC,GAAGZ,MAAM;MACtB,MAAMa,EAAE,GAAG,IAAIC,UAAE,EAAE;MAEnB,IAAI,CAACF,GAAG,IAAI,CAACjB,SAAS,EAAE;QACpB;MACJ;MAEA,MAAMkB,EAAE,CACHE,YAAY,CAAC;QACVC,MAAM,EAAErB,SAAS;QACjBsB,GAAG,EAAEL;MACT,CAAC,CAAC,CACDM,OAAO,EAAE;IAClB;EACJ,CAAC,CAAC;AACN,CAAC;AAAA"}

package/plugins/graphqlFileStorageS3.js

@@ -1,26 +1,20 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _responses = require("@webiny/handler-graphql/responses");
-
 var _checkBasePermissions = _interopRequireDefault(require("@webiny/api-file-manager/plugins/crud/utils/checkBasePermissions"));
-
 var _getPresignedPostPayload = _interopRequireDefault(require("../utils/getPresignedPostPayload"));
-
+var _error = _interopRequireDefault(require("@webiny/error"));
 const BATCH_UPLOAD_MAX_FILES = 20;
 const plugin = {
   type: "graphql-schema",
   name: "graphql-schema-api-file-manager-s3",
   schema: {
-    typeDefs:
-    /* GraphQL */
-    `
+    typeDefs: /* GraphQL */`
             input PreSignedPostPayloadInput {
                 name: String!
                 type: String!
@@ -70,6 +64,11 @@ const plugin = {
               data
             } = args;
             const settings = await context.fileManager.settings.getSettings();
+            if (!settings) {
+              throw new _error.default("Missing File Manager Settings.", "FILE_MANAGER_SETTINGS_ERROR", {
+                file: data
+              });
+            }
             const response = await (0, _getPresignedPostPayload.default)(data, settings);
             return new _responses.Response(response);
           } catch (e) {
@@ -87,37 +86,35 @@ const plugin = {
           const {
             data: files
           } = args;
-
           if (!Array.isArray(files)) {
             return new _responses.ErrorResponse({
               code: "UPLOAD_FILES_NON_ARRAY",
               message: `"data" argument must be an array.`
             });
           }
-
           if (files.length === 0) {
             return new _responses.ErrorResponse({
               code: "UPLOAD_FILES_MIN_FILES",
               message: `"data" argument must contain at least one file.`
             });
           }
-
           if (files.length > BATCH_UPLOAD_MAX_FILES) {
             return new _responses.ErrorResponse({
               code: "UPLOAD_FILES_MAX_FILES",
               message: `"data" argument must not contain more than ${BATCH_UPLOAD_MAX_FILES} files.`
             });
           }
-
           try {
             const settings = await context.fileManager.settings.getSettings();
+            if (!settings) {
+              throw new _error.default("Missing File Manager Settings.", "FILE_MANAGER_SETTINGS_ERROR", {
+                files
+              });
+            }
             const promises = [];
-
-            for (let i = 0; i < files.length; i++) {
-              const item = files[i];
+            for (const item of files) {
               promises.push((0, _getPresignedPostPayload.default)(item, settings));
             }
-
             return new _responses.Response(await Promise.all(promises));
           } catch (e) {
             return new _responses.ErrorResponse({

package/plugins/graphqlFileStorageS3.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["BATCH_UPLOAD_MAX_FILES","plugin","type","name","schema","typeDefs","resolvers","FmQuery","getPreSignedPostPayload","_","args","context","checkBasePermissions","rwd","data","settings","fileManager","getSettings","WebinyError","file","response","getPresignedPostPayload","Response","e","ErrorResponse","message","code","getPreSignedPostPayloads","files","Array","isArray","length","promises","item","push","Promise","all"],"sources":["graphqlFileStorageS3.ts"],"sourcesContent":["import { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/types\";\nimport { ErrorResponse, Response } from \"@webiny/handler-graphql/responses\";\nimport checkBasePermissions from \"@webiny/api-file-manager/plugins/crud/utils/checkBasePermissions\";\nimport { FileManagerContext } from \"@webiny/api-file-manager/types\";\nimport getPresignedPostPayload from \"../utils/getPresignedPostPayload\";\nimport WebinyError from \"@webiny/error\";\n\nconst BATCH_UPLOAD_MAX_FILES = 20;\n\nconst plugin: GraphQLSchemaPlugin<FileManagerContext> = {\n    type: \"graphql-schema\",\n    name: \"graphql-schema-api-file-manager-s3\",\n    schema: {\n        typeDefs: /* GraphQL */ `\n            input PreSignedPostPayloadInput {\n                name: String!\n                type: String!\n                size: Int!\n            }\n\n            type GetPreSignedPostPayloadResponseDataFile {\n                name: String\n                type: String\n                size: Int\n                key: String\n            }\n\n            type GetPreSignedPostPayloadResponseData {\n                # Contains data that is necessary for initiating a file upload.\n                data: JSON\n                file: UploadFileResponseDataFile\n            }\n\n            type GetPreSignedPostPayloadResponse {\n                error: FileError\n                data: GetPreSignedPostPayloadResponseData\n            }\n\n            type GetPreSignedPostPayloadsResponse {\n                error: FileError\n                data: [GetPreSignedPostPayloadResponseData]!\n            }\n\n            extend type FmQuery {\n                getPreSignedPostPayload(\n                    data: PreSignedPostPayloadInput!\n                ): GetPreSignedPostPayloadResponse\n                getPreSignedPostPayloads(\n                    data: [PreSignedPostPayloadInput]!\n                ): GetPreSignedPostPayloadsResponse\n            }\n        `,\n        resolvers: {\n            FmQuery: {\n                getPreSignedPostPayload: async (_, args: any, context) => {\n                    try {\n                        await checkBasePermissions(context, { rwd: \"w\" });\n\n                        const { data } = args;\n                        const settings = await context.fileManager.settings.getSettings();\n                        if (!settings) {\n                            throw new WebinyError(\n                                \"Missing File Manager Settings.\",\n                                \"FILE_MANAGER_SETTINGS_ERROR\",\n                                {\n                                    file: data\n                                }\n                            );\n                        }\n                        const response = await getPresignedPostPayload(data, settings);\n\n                        return new Response(response);\n                    } catch (e) {\n                        return new ErrorResponse({\n                            message: e.message,\n                            code: e.code,\n                            data: e.data\n                        });\n                    }\n                },\n                getPreSignedPostPayloads: async (_, args: any, context) => {\n                    await checkBasePermissions(context, { rwd: \"w\" });\n\n                    const { data: files } = args;\n                    if (!Array.isArray(files)) {\n                        return new ErrorResponse({\n                            code: \"UPLOAD_FILES_NON_ARRAY\",\n                            message: `\"data\" argument must be an array.`\n                        });\n                    }\n\n                    if (files.length === 0) {\n                        return new ErrorResponse({\n                            code: \"UPLOAD_FILES_MIN_FILES\",\n                            message: `\"data\" argument must contain at least one file.`\n                        });\n                    }\n\n                    if (files.length > BATCH_UPLOAD_MAX_FILES) {\n                        return new ErrorResponse({\n                            code: \"UPLOAD_FILES_MAX_FILES\",\n                            message: `\"data\" argument must not contain more than ${BATCH_UPLOAD_MAX_FILES} files.`\n                        });\n                    }\n\n                    try {\n                        const settings = await context.fileManager.settings.getSettings();\n                        if (!settings) {\n                            throw new WebinyError(\n                                \"Missing File Manager Settings.\",\n                                \"FILE_MANAGER_SETTINGS_ERROR\",\n                                {\n                                    files\n                                }\n                            );\n                        }\n\n                        const promises = [];\n                        for (const item of files) {\n                            promises.push(getPresignedPostPayload(item, settings));\n                        }\n\n                        return new Response(await Promise.all(promises));\n                    } catch (e) {\n                        return new ErrorResponse({\n                            message: e.message,\n                            code: e.code,\n                            data: e.data\n                        });\n                    }\n                }\n            }\n        }\n    }\n};\n\nexport default plugin;\n"],"mappings":"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"}

package/types.d.ts

@@ -0,0 +1,16 @@
+import S3 from "aws-sdk/clients/s3";
+export interface PresignedPostPayloadData {
+    name: string;
+    type: string;
+    size: number;
+    keyPrefix: string;
+}
+export interface PresignedPostPayloadDataResponse {
+    data: S3.PresignedPost;
+    file: {
+        name: string;
+        key: string;
+        type: string;
+        size: number;
+    };
+}

package/types.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\n\nexport interface PresignedPostPayloadData {\n    name: string;\n    type: string;\n    size: number;\n    keyPrefix: string;\n}\n\nexport interface PresignedPostPayloadDataResponse {\n    data: S3.PresignedPost;\n    file: {\n        name: string;\n        key: string;\n        type: string;\n        size: number;\n    };\n}\n"],"mappings":""}

package/utils/getPresignedPostPayload.d.ts

@@ -1,11 +1,4 @@
-import S3 from "aws-sdk/clients/s3";
-declare const _default: (data: any, settings: any) => Promise<{
-    data: S3.PresignedPost;
-    file: {
-        name: string;
-        key: string;
-        type: any;
-        size: any;
-    };
-}>;
+import { PresignedPostPayloadData, PresignedPostPayloadDataResponse } from "../types";
+import { FileManagerSettings } from "@webiny/api-file-manager/types";
+declare const _default: (data: PresignedPostPayloadData, settings: FileManagerSettings) => Promise<PresignedPostPayloadDataResponse>;
 export default _default;

package/utils/getPresignedPostPayload.js

@@ -1,57 +1,45 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _uniqid = _interopRequireDefault(require("uniqid"));
-
 var _sanitizeFilename = _interopRequireDefault(require("sanitize-filename"));
-
 var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
-
 var _validation = require("@webiny/validation");
-
 const S3_BUCKET = process.env.S3_BUCKET;
 const UPLOAD_MAX_FILE_SIZE_DEFAULT = 26214400; // 25MB
 
 const sanitizeFileSizeValue = (value, defaultValue) => {
   try {
     _validation.validation.validateSync(value, "required,numeric,gte:0");
-
     return value;
   } catch (e) {
+    // TODO @ts-refactor No need to log the error?
     return defaultValue;
   }
 };
-
 var _default = async (data, settings) => {
   // If type is missing, let's use the default "application/octet-stream" type,
   // which is also the default type that the Amazon S3 would use.
   if (!data.type) {
     data.type = "application/octet-stream";
   }
-
   const contentType = data.type;
-
   if (!contentType) {
     throw Error(`File's content type could not be resolved.`);
   }
-
   let key = (0, _sanitizeFilename.default)(data.name);
-
   if (key) {
     key = (0, _uniqid.default)() + "-" + key;
   }
-
   if (data.keyPrefix) {
     key = `${(0, _sanitizeFilename.default)(data.keyPrefix)}-${key}`;
-  } // Replace all whitespace.
-
+  }
 
+  // Replace all whitespace.
   key = key.replace(/\s/g, "");
   const uploadMinFileSize = sanitizeFileSizeValue(settings.uploadMinFileSize, 0);
   const uploadMaxFileSize = sanitizeFileSizeValue(settings.uploadMaxFileSize, UPLOAD_MAX_FILE_SIZE_DEFAULT);
@@ -65,11 +53,9 @@ var _default = async (data, settings) => {
       key
     }
   };
-
   if (params.Fields.key.startsWith("/")) {
-    params.Fields.key = params.Fields.key.substr(1);
+    params.Fields.key = params.Fields.key.slice(1);
   }
-
   const s3 = new _s.default();
   const payload = s3.createPresignedPost(params);
   return {
@@ -82,5 +68,4 @@ var _default = async (data, settings) => {
     }
   };
 };
-
 exports.default = _default;

package/utils/getPresignedPostPayload.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["S3_BUCKET","process","env","UPLOAD_MAX_FILE_SIZE_DEFAULT","sanitizeFileSizeValue","value","defaultValue","validation","validateSync","e","data","settings","type","contentType","Error","key","sanitizeFilename","name","uniqueId","keyPrefix","replace","uploadMinFileSize","uploadMaxFileSize","params","Expires","Bucket","Conditions","Fields","startsWith","slice","s3","S3","payload","createPresignedPost","file","size"],"sources":["getPresignedPostPayload.ts"],"sourcesContent":["import uniqueId from \"uniqid\";\nimport sanitizeFilename from \"sanitize-filename\";\nimport S3 from \"aws-sdk/clients/s3\";\nimport { validation } from \"@webiny/validation\";\nimport { PresignedPostPayloadData, PresignedPostPayloadDataResponse } from \"~/types\";\nimport { FileManagerSettings } from \"@webiny/api-file-manager/types\";\n\nconst S3_BUCKET = process.env.S3_BUCKET;\nconst UPLOAD_MAX_FILE_SIZE_DEFAULT = 26214400; // 25MB\n\nconst sanitizeFileSizeValue = (value: number, defaultValue: number): number => {\n    try {\n        validation.validateSync(value, \"required,numeric,gte:0\");\n        return value;\n    } catch (e) {\n        // TODO @ts-refactor No need to log the error?\n        return defaultValue;\n    }\n};\n\nexport default async (\n    data: PresignedPostPayloadData,\n    settings: FileManagerSettings\n): Promise<PresignedPostPayloadDataResponse> => {\n    // If type is missing, let's use the default \"application/octet-stream\" type,\n    // which is also the default type that the Amazon S3 would use.\n    if (!data.type) {\n        data.type = \"application/octet-stream\";\n    }\n\n    const contentType = data.type;\n    if (!contentType) {\n        throw Error(`File's content type could not be resolved.`);\n    }\n\n    let key = sanitizeFilename(data.name);\n    if (key) {\n        key = uniqueId() + \"-\" + key;\n    }\n\n    if (data.keyPrefix) {\n        key = `${sanitizeFilename(data.keyPrefix)}-${key}`;\n    }\n\n    // Replace all whitespace.\n    key = key.replace(/\\s/g, \"\");\n\n    const uploadMinFileSize = sanitizeFileSizeValue(settings.uploadMinFileSize, 0);\n    const uploadMaxFileSize = sanitizeFileSizeValue(\n        settings.uploadMaxFileSize,\n        UPLOAD_MAX_FILE_SIZE_DEFAULT\n    );\n\n    const params = {\n        Expires: 60,\n        Bucket: S3_BUCKET,\n        Conditions: [[\"content-length-range\", uploadMinFileSize, uploadMaxFileSize]], // 0 Bytes - 25MB\n        Fields: {\n            \"Content-Type\": contentType,\n            key\n        }\n    };\n\n    if (params.Fields.key.startsWith(\"/\")) {\n        params.Fields.key = params.Fields.key.slice(1);\n    }\n\n    const s3 = new S3();\n    const payload = s3.createPresignedPost(params);\n\n    return {\n        data: payload,\n        file: {\n            name: key,\n            key,\n            type: contentType,\n            size: data.size\n        }\n    };\n};\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AAIA,MAAMA,SAAS,GAAGC,OAAO,CAACC,GAAG,CAACF,SAAS;AACvC,MAAMG,4BAA4B,GAAG,QAAQ,CAAC,CAAC;;AAE/C,MAAMC,qBAAqB,GAAG,CAACC,KAAa,EAAEC,YAAoB,KAAa;EAC3E,IAAI;IACAC,sBAAU,CAACC,YAAY,CAACH,KAAK,EAAE,wBAAwB,CAAC;IACxD,OAAOA,KAAK;EAChB,CAAC,CAAC,OAAOI,CAAC,EAAE;IACR;IACA,OAAOH,YAAY;EACvB;AACJ,CAAC;AAAC,eAEa,OACXI,IAA8B,EAC9BC,QAA6B,KACe;EAC5C;EACA;EACA,IAAI,CAACD,IAAI,CAACE,IAAI,EAAE;IACZF,IAAI,CAACE,IAAI,GAAG,0BAA0B;EAC1C;EAEA,MAAMC,WAAW,GAAGH,IAAI,CAACE,IAAI;EAC7B,IAAI,CAACC,WAAW,EAAE;IACd,MAAMC,KAAK,CAAE,4CAA2C,CAAC;EAC7D;EAEA,IAAIC,GAAG,GAAG,IAAAC,yBAAgB,EAACN,IAAI,CAACO,IAAI,CAAC;EACrC,IAAIF,GAAG,EAAE;IACLA,GAAG,GAAG,IAAAG,eAAQ,GAAE,GAAG,GAAG,GAAGH,GAAG;EAChC;EAEA,IAAIL,IAAI,CAACS,SAAS,EAAE;IAChBJ,GAAG,GAAI,GAAE,IAAAC,yBAAgB,EAACN,IAAI,CAACS,SAAS,CAAE,IAAGJ,GAAI,EAAC;EACtD;;EAEA;EACAA,GAAG,GAAGA,GAAG,CAACK,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;EAE5B,MAAMC,iBAAiB,GAAGjB,qBAAqB,CAACO,QAAQ,CAACU,iBAAiB,EAAE,CAAC,CAAC;EAC9E,MAAMC,iBAAiB,GAAGlB,qBAAqB,CAC3CO,QAAQ,CAACW,iBAAiB,EAC1BnB,4BAA4B,CAC/B;EAED,MAAMoB,MAAM,GAAG;IACXC,OAAO,EAAE,EAAE;IACXC,MAAM,EAAEzB,SAAS;IACjB0B,UAAU,EAAE,CAAC,CAAC,sBAAsB,EAAEL,iBAAiB,EAAEC,iBAAiB,CAAC,CAAC;IAAE;IAC9EK,MAAM,EAAE;MACJ,cAAc,EAAEd,WAAW;MAC3BE;IACJ;EACJ,CAAC;EAED,IAAIQ,MAAM,CAACI,MAAM,CAACZ,GAAG,CAACa,UAAU,CAAC,GAAG,CAAC,EAAE;IACnCL,MAAM,CAACI,MAAM,CAACZ,GAAG,GAAGQ,MAAM,CAACI,MAAM,CAACZ,GAAG,CAACc,KAAK,CAAC,CAAC,CAAC;EAClD;EAEA,MAAMC,EAAE,GAAG,IAAIC,UAAE,EAAE;EACnB,MAAMC,OAAO,GAAGF,EAAE,CAACG,mBAAmB,CAACV,MAAM,CAAC;EAE9C,OAAO;IACHb,IAAI,EAAEsB,OAAO;IACbE,IAAI,EAAE;MACFjB,IAAI,EAAEF,GAAG;MACTA,GAAG;MACHH,IAAI,EAAEC,WAAW;MACjBsB,IAAI,EAAEzB,IAAI,CAACyB;IACf;EACJ,CAAC;AACL,CAAC;AAAA"}

package/utils/uploadFileToS3.d.ts

@@ -1,2 +1,5 @@
-declare const _default: (buffer: any, preSignedPostPayload: any) => Promise<import("node-fetch").Response>;
+/// <reference types="node" />
+import { Response } from "node-fetch";
+import S3 from "aws-sdk/clients/s3";
+declare const _default: (buffer: Buffer, preSignedPostPayload: S3.PresignedPost) => Promise<Response>;
 export default _default;

package/utils/uploadFileToS3.js

@@ -1,29 +1,24 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _formData = _interopRequireDefault(require("form-data"));
-
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-
 var _default = async (buffer, preSignedPostPayload) => {
-  const formData = new _formData.default(); // Add all pre signed payload field to "FormData".
-
+  const formData = new _formData.default();
+  // Add all pre signed payload field to "FormData".
   Object.keys(preSignedPostPayload.fields).forEach(key => {
     formData.append(key, preSignedPostPayload.fields[key]);
-  }); // Add file content to "FormData".
-
-  formData.append("file", buffer); // Finally make the upload request to S3.
-
+  });
+  // Add file content to "FormData".
+  formData.append("file", buffer);
+  // Finally make the upload request to S3.
   return (0, _nodeFetch.default)(preSignedPostPayload.url, {
     method: "POST",
     body: formData
   });
 };
-
 exports.default = _default;

package/utils/uploadFileToS3.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["buffer","preSignedPostPayload","formData","FormData","Object","keys","fields","forEach","key","append","fetch","url","method","body"],"sources":["uploadFileToS3.ts"],"sourcesContent":["import FormData from \"form-data\";\nimport fetch, { Response } from \"node-fetch\";\nimport S3 from \"aws-sdk/clients/s3\";\n\nexport default async (\n    buffer: Buffer,\n    preSignedPostPayload: S3.PresignedPost\n): Promise<Response> => {\n    const formData = new FormData();\n    // Add all pre signed payload field to \"FormData\".\n    Object.keys(preSignedPostPayload.fields).forEach(key => {\n        formData.append(key, preSignedPostPayload.fields[key]);\n    });\n    // Add file content to \"FormData\".\n    formData.append(\"file\", buffer);\n    // Finally make the upload request to S3.\n    return fetch(preSignedPostPayload.url, {\n        method: \"POST\",\n        body: formData\n    });\n};\n"],"mappings":";;;;;;;AAAA;AACA;AAA6C,eAG9B,OACXA,MAAc,EACdC,oBAAsC,KAClB;EACpB,MAAMC,QAAQ,GAAG,IAAIC,iBAAQ,EAAE;EAC/B;EACAC,MAAM,CAACC,IAAI,CAACJ,oBAAoB,CAACK,MAAM,CAAC,CAACC,OAAO,CAACC,GAAG,IAAI;IACpDN,QAAQ,CAACO,MAAM,CAACD,GAAG,EAAEP,oBAAoB,CAACK,MAAM,CAACE,GAAG,CAAC,CAAC;EAC1D,CAAC,CAAC;EACF;EACAN,QAAQ,CAACO,MAAM,CAAC,MAAM,EAAET,MAAM,CAAC;EAC/B;EACA,OAAO,IAAAU,kBAAK,EAACT,oBAAoB,CAACU,GAAG,EAAE;IACnCC,MAAM,EAAE,MAAM;IACdC,IAAI,EAAEX;EACV,CAAC,CAAC;AACN,CAAC;AAAA"}