@webiny/api-file-manager-s3 5.23.1 → 5.25.0-beta.0

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.map

@@ -0,0 +1 @@
+{"version":3,"sources":["index.ts"],"names":["graphqlFileStorageS3"],"mappings":";;;;;;;;;AAAA;;AACA;;eAEe,MAAM,CAAC,4BAAD,EAAkBA,4BAAlB,C","sourcesContent":["import graphqlFileStorageS3 from \"./plugins/graphqlFileStorageS3\";\nimport fileStorageS3 from \"./plugins/fileStorageS3\";\n\nexport default () => [fileStorageS3(), graphqlFileStorageS3];\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-file-manager-s3",
-	"version": "5.23.1",
+	"version": "5.25.0-beta.0",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -10,9 +10,10 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api-file-manager": "5.23.1",
-		"@webiny/handler-graphql": "5.23.1",
-		"@webiny/validation": "5.23.1",
+		"@webiny/api-file-manager": "5.25.0-beta.0",
+		"@webiny/error": "5.25.0-beta.0",
+		"@webiny/handler-graphql": "5.25.0-beta.0",
+		"@webiny/validation": "5.25.0-beta.0",
 		"form-data": "3.0.1",
 		"node-fetch": "2.6.7",
 		"sanitize-filename": "1.6.3",
@@ -21,10 +22,10 @@
 	"devDependencies": {
 		"@babel/cli": "^7.16.0",
 		"@babel/core": "^7.16.0",
-		"@webiny/cli": "^5.23.1",
-		"@webiny/project-utils": "^5.23.1",
+		"@webiny/cli": "^5.25.0-beta.0",
+		"@webiny/project-utils": "^5.25.0-beta.0",
 		"rimraf": "^3.0.2",
-		"typescript": "^4.1.3"
+		"typescript": "4.5.5"
 	},
 	"publishConfig": {
 		"access": "public",
@@ -34,5 +35,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "a726d09d2647d13e5a4f376cef23463564ef7ca0"
+	"gitHead": "2d3e7833575e88fde77d84e5490e746933a5ec28"
 }

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

@@ -21,13 +21,17 @@ 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);
+      } = params,
+            data = (0, _objectWithoutProperties2.default)(params, _excluded);
       const {
         data: preSignedPostPayload,
         file
@@ -43,11 +47,16 @@ var _default = () => {
         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

package/plugins/fileStorageS3.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["fileStorageS3.ts"],"names":["S3_BUCKET","process","env","FilePhysicalStoragePlugin","upload","params","settings","buffer","data","preSignedPostPayload","file","response","ok","Error","delete","key","s3","S3","deleteObject","Bucket","Key","promise"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;AAMA,MAAMA,SAAS,GAAGC,OAAO,CAACC,GAAR,CAAYF,SAA9B;;eAMe,MAAiC;AAC5C;AACJ;AACA;AACA;AACI,SAAO,IAAIG,oDAAJ,CAAuE;AAC1EC,IAAAA,MAAM,EAAE,MAAMC,MAAN,IAAgB;AACpB,YAAM;AAAEC,QAAAA,QAAF;AAAYC,QAAAA;AAAZ,UAAgCF,MAAtC;AAAA,YAA6BG,IAA7B,0CAAsCH,MAAtC;AAEA,YAAM;AAAEG,QAAAA,IAAI,EAAEC,oBAAR;AAA8BC,QAAAA;AAA9B,UAAuC,MAAM,sCAC/CF,IAD+C,EAE/CF,QAF+C,CAAnD;AAKA,YAAMK,QAAQ,GAAG,MAAM,4BAAeJ,MAAf,EAAuBE,oBAAvB,CAAvB;;AACA,UAAI,CAACE,QAAQ,CAACC,EAAd,EAAkB;AACd,cAAMC,KAAK,CAAC,wBAAD,CAAX;AACH;;AAED,aAAO;AACHL,QAAAA,IAAI,EAAEC,oBADH;AAEHC,QAAAA;AAFG,OAAP;AAIH,KAlByE;AAmB1EI,IAAAA,MAAM,EAAE,MAAMT,MAAN,IAAgB;AACpB,YAAM;AAAEU,QAAAA;AAAF,UAAUV,MAAhB;AACA,YAAMW,EAAE,GAAG,IAAIC,UAAJ,EAAX;;AAEA,UAAI,CAACF,GAAD,IAAQ,CAACf,SAAb,EAAwB;AACpB;AACH;;AAED,YAAMgB,EAAE,CACHE,YADC,CACY;AACVC,QAAAA,MAAM,EAAEnB,SADE;AAEVoB,QAAAA,GAAG,EAAEL;AAFK,OADZ,EAKDM,OALC,EAAN;AAMH;AAjCyE,GAAvE,CAAP;AAmCH,C","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"]}

package/plugins/graphqlFileStorageS3.js

@@ -13,6 +13,8 @@ var _checkBasePermissions = _interopRequireDefault(require("@webiny/api-file-man
 
 var _getPresignedPostPayload = _interopRequireDefault(require("../utils/getPresignedPostPayload"));
 
+var _error = _interopRequireDefault(require("@webiny/error"));
+
 const BATCH_UPLOAD_MAX_FILES = 20;
 const plugin = {
   type: "graphql-schema",
@@ -70,6 +72,13 @@ 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) {
@@ -111,10 +120,16 @@ const plugin = {
 
           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));
             }
 

package/plugins/graphqlFileStorageS3.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["graphqlFileStorageS3.ts"],"names":["BATCH_UPLOAD_MAX_FILES","plugin","type","name","schema","typeDefs","resolvers","FmQuery","getPreSignedPostPayload","_","args","context","rwd","data","settings","fileManager","getSettings","WebinyError","file","response","Response","e","ErrorResponse","message","code","getPreSignedPostPayloads","files","Array","isArray","length","promises","item","push","Promise","all"],"mappings":";;;;;;;;;AACA;;AACA;;AAEA;;AACA;;AAEA,MAAMA,sBAAsB,GAAG,EAA/B;AAEA,MAAMC,MAA+C,GAAG;AACpDC,EAAAA,IAAI,EAAE,gBAD8C;AAEpDC,EAAAA,IAAI,EAAE,oCAF8C;AAGpDC,EAAAA,MAAM,EAAE;AACJC,IAAAA,QAAQ;AAAE;AAAe;AACjC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAvCY;AAwCJC,IAAAA,SAAS,EAAE;AACPC,MAAAA,OAAO,EAAE;AACLC,QAAAA,uBAAuB,EAAE,OAAOC,CAAP,EAAUC,IAAV,EAAqBC,OAArB,KAAiC;AACtD,cAAI;AACA,kBAAM,mCAAqBA,OAArB,EAA8B;AAAEC,cAAAA,GAAG,EAAE;AAAP,aAA9B,CAAN;AAEA,kBAAM;AAAEC,cAAAA;AAAF,gBAAWH,IAAjB;AACA,kBAAMI,QAAQ,GAAG,MAAMH,OAAO,CAACI,WAAR,CAAoBD,QAApB,CAA6BE,WAA7B,EAAvB;;AACA,gBAAI,CAACF,QAAL,EAAe;AACX,oBAAM,IAAIG,cAAJ,CACF,gCADE,EAEF,6BAFE,EAGF;AACIC,gBAAAA,IAAI,EAAEL;AADV,eAHE,CAAN;AAOH;;AACD,kBAAMM,QAAQ,GAAG,MAAM,sCAAwBN,IAAxB,EAA8BC,QAA9B,CAAvB;AAEA,mBAAO,IAAIM,mBAAJ,CAAaD,QAAb,CAAP;AACH,WAjBD,CAiBE,OAAOE,CAAP,EAAU;AACR,mBAAO,IAAIC,wBAAJ,CAAkB;AACrBC,cAAAA,OAAO,EAAEF,CAAC,CAACE,OADU;AAErBC,cAAAA,IAAI,EAAEH,CAAC,CAACG,IAFa;AAGrBX,cAAAA,IAAI,EAAEQ,CAAC,CAACR;AAHa,aAAlB,CAAP;AAKH;AACJ,SA1BI;AA2BLY,QAAAA,wBAAwB,EAAE,OAAOhB,CAAP,EAAUC,IAAV,EAAqBC,OAArB,KAAiC;AACvD,gBAAM,mCAAqBA,OAArB,EAA8B;AAAEC,YAAAA,GAAG,EAAE;AAAP,WAA9B,CAAN;AAEA,gBAAM;AAAEC,YAAAA,IAAI,EAAEa;AAAR,cAAkBhB,IAAxB;;AACA,cAAI,CAACiB,KAAK,CAACC,OAAN,CAAcF,KAAd,CAAL,EAA2B;AACvB,mBAAO,IAAIJ,wBAAJ,CAAkB;AACrBE,cAAAA,IAAI,EAAE,wBADe;AAErBD,cAAAA,OAAO,EAAG;AAFW,aAAlB,CAAP;AAIH;;AAED,cAAIG,KAAK,CAACG,MAAN,KAAiB,CAArB,EAAwB;AACpB,mBAAO,IAAIP,wBAAJ,CAAkB;AACrBE,cAAAA,IAAI,EAAE,wBADe;AAErBD,cAAAA,OAAO,EAAG;AAFW,aAAlB,CAAP;AAIH;;AAED,cAAIG,KAAK,CAACG,MAAN,GAAe7B,sBAAnB,EAA2C;AACvC,mBAAO,IAAIsB,wBAAJ,CAAkB;AACrBE,cAAAA,IAAI,EAAE,wBADe;AAErBD,cAAAA,OAAO,EAAG,8CAA6CvB,sBAAuB;AAFzD,aAAlB,CAAP;AAIH;;AAED,cAAI;AACA,kBAAMc,QAAQ,GAAG,MAAMH,OAAO,CAACI,WAAR,CAAoBD,QAApB,CAA6BE,WAA7B,EAAvB;;AACA,gBAAI,CAACF,QAAL,EAAe;AACX,oBAAM,IAAIG,cAAJ,CACF,gCADE,EAEF,6BAFE,EAGF;AACIS,gBAAAA;AADJ,eAHE,CAAN;AAOH;;AAED,kBAAMI,QAAQ,GAAG,EAAjB;;AACA,iBAAK,MAAMC,IAAX,IAAmBL,KAAnB,EAA0B;AACtBI,cAAAA,QAAQ,CAACE,IAAT,CAAc,sCAAwBD,IAAxB,EAA8BjB,QAA9B,CAAd;AACH;;AAED,mBAAO,IAAIM,mBAAJ,CAAa,MAAMa,OAAO,CAACC,GAAR,CAAYJ,QAAZ,CAAnB,CAAP;AACH,WAlBD,CAkBE,OAAOT,CAAP,EAAU;AACR,mBAAO,IAAIC,wBAAJ,CAAkB;AACrBC,cAAAA,OAAO,EAAEF,CAAC,CAACE,OADU;AAErBC,cAAAA,IAAI,EAAEH,CAAC,CAACG,IAFa;AAGrBX,cAAAA,IAAI,EAAEQ,CAAC,CAACR;AAHa,aAAlB,CAAP;AAKH;AACJ;AA7EI;AADF;AAxCP;AAH4C,CAAxD;eA+HeZ,M","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"]}

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,"sources":[],"names":[],"mappings":"","sourcesContent":[]}

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

@@ -24,6 +24,7 @@ const sanitizeFileSizeValue = (value, defaultValue) => {
 
     return value;
   } catch (e) {
+    // TODO @ts-refactor No need to log the error?
     return defaultValue;
   }
 };

package/utils/getPresignedPostPayload.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["getPresignedPostPayload.ts"],"names":["S3_BUCKET","process","env","UPLOAD_MAX_FILE_SIZE_DEFAULT","sanitizeFileSizeValue","value","defaultValue","validation","validateSync","e","data","settings","type","contentType","Error","key","name","keyPrefix","replace","uploadMinFileSize","uploadMaxFileSize","params","Expires","Bucket","Conditions","Fields","startsWith","substr","s3","S3","payload","createPresignedPost","file","size"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AAIA,MAAMA,SAAS,GAAGC,OAAO,CAACC,GAAR,CAAYF,SAA9B;AACA,MAAMG,4BAA4B,GAAG,QAArC,C,CAA+C;;AAE/C,MAAMC,qBAAqB,GAAG,CAACC,KAAD,EAAgBC,YAAhB,KAAiD;AAC3E,MAAI;AACAC,2BAAWC,YAAX,CAAwBH,KAAxB,EAA+B,wBAA/B;;AACA,WAAOA,KAAP;AACH,GAHD,CAGE,OAAOI,CAAP,EAAU;AACR;AACA,WAAOH,YAAP;AACH;AACJ,CARD;;eAUe,OACXI,IADW,EAEXC,QAFW,KAGiC;AAC5C;AACA;AACA,MAAI,CAACD,IAAI,CAACE,IAAV,EAAgB;AACZF,IAAAA,IAAI,CAACE,IAAL,GAAY,0BAAZ;AACH;;AAED,QAAMC,WAAW,GAAGH,IAAI,CAACE,IAAzB;;AACA,MAAI,CAACC,WAAL,EAAkB;AACd,UAAMC,KAAK,CAAE,4CAAF,CAAX;AACH;;AAED,MAAIC,GAAG,GAAG,+BAAiBL,IAAI,CAACM,IAAtB,CAAV;;AACA,MAAID,GAAJ,EAAS;AACLA,IAAAA,GAAG,GAAG,yBAAa,GAAb,GAAmBA,GAAzB;AACH;;AAED,MAAIL,IAAI,CAACO,SAAT,EAAoB;AAChBF,IAAAA,GAAG,GAAI,GAAE,+BAAiBL,IAAI,CAACO,SAAtB,CAAiC,IAAGF,GAAI,EAAjD;AACH,GAnB2C,CAqB5C;;;AACAA,EAAAA,GAAG,GAAGA,GAAG,CAACG,OAAJ,CAAY,KAAZ,EAAmB,EAAnB,CAAN;AAEA,QAAMC,iBAAiB,GAAGf,qBAAqB,CAACO,QAAQ,CAACQ,iBAAV,EAA6B,CAA7B,CAA/C;AACA,QAAMC,iBAAiB,GAAGhB,qBAAqB,CAC3CO,QAAQ,CAACS,iBADkC,EAE3CjB,4BAF2C,CAA/C;AAKA,QAAMkB,MAAM,GAAG;AACXC,IAAAA,OAAO,EAAE,EADE;AAEXC,IAAAA,MAAM,EAAEvB,SAFG;AAGXwB,IAAAA,UAAU,EAAE,CAAC,CAAC,sBAAD,EAAyBL,iBAAzB,EAA4CC,iBAA5C,CAAD,CAHD;AAGmE;AAC9EK,IAAAA,MAAM,EAAE;AACJ,sBAAgBZ,WADZ;AAEJE,MAAAA;AAFI;AAJG,GAAf;;AAUA,MAAIM,MAAM,CAACI,MAAP,CAAcV,GAAd,CAAkBW,UAAlB,CAA6B,GAA7B,CAAJ,EAAuC;AACnCL,IAAAA,MAAM,CAACI,MAAP,CAAcV,GAAd,GAAoBM,MAAM,CAACI,MAAP,CAAcV,GAAd,CAAkBY,MAAlB,CAAyB,CAAzB,CAApB;AACH;;AAED,QAAMC,EAAE,GAAG,IAAIC,UAAJ,EAAX;AACA,QAAMC,OAAO,GAAGF,EAAE,CAACG,mBAAH,CAAuBV,MAAvB,CAAhB;AAEA,SAAO;AACHX,IAAAA,IAAI,EAAEoB,OADH;AAEHE,IAAAA,IAAI,EAAE;AACFhB,MAAAA,IAAI,EAAED,GADJ;AAEFA,MAAAA,GAFE;AAGFH,MAAAA,IAAI,EAAEC,WAHJ;AAIFoB,MAAAA,IAAI,EAAEvB,IAAI,CAACuB;AAJT;AAFH,GAAP;AASH,C","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.substr(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"]}

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.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uploadFileToS3.ts"],"names":["buffer","preSignedPostPayload","formData","FormData","Object","keys","fields","forEach","key","append","url","method","body"],"mappings":";;;;;;;;;AAAA;;AACA;;eAGe,OACXA,MADW,EAEXC,oBAFW,KAGS;AACpB,QAAMC,QAAQ,GAAG,IAAIC,iBAAJ,EAAjB,CADoB,CAEpB;;AACAC,EAAAA,MAAM,CAACC,IAAP,CAAYJ,oBAAoB,CAACK,MAAjC,EAAyCC,OAAzC,CAAiDC,GAAG,IAAI;AACpDN,IAAAA,QAAQ,CAACO,MAAT,CAAgBD,GAAhB,EAAqBP,oBAAoB,CAACK,MAArB,CAA4BE,GAA5B,CAArB;AACH,GAFD,EAHoB,CAMpB;;AACAN,EAAAA,QAAQ,CAACO,MAAT,CAAgB,MAAhB,EAAwBT,MAAxB,EAPoB,CAQpB;;AACA,SAAO,wBAAMC,oBAAoB,CAACS,GAA3B,EAAgC;AACnCC,IAAAA,MAAM,EAAE,MAD2B;AAEnCC,IAAAA,IAAI,EAAEV;AAF6B,GAAhC,CAAP;AAIH,C","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"]}