@webiny/api-file-manager-s3 0.0.0-unstable.97a151f74d → 0.0.0-unstable.98511f29f1

package/index.d.ts

@@ -1,2 +1,3 @@
-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>)[];
+declare const _default: () => (import("@webiny/handler-graphql/types").GraphQLSchemaPlugin<import("@webiny/api-file-manager/types").FileManagerContext> | import("@webiny/api").ContextPlugin<import("@webiny/api/types").Context>)[];
 export default _default;
+export { createFileUploadModifier } from "./utils/FileUploadModifier";

package/index.js

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

package/index.js.map

@@ -1 +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;;eAEe,MAAM,CAAC,IAAAA,qBAAA,GAAD,EAAkBC,4BAAlB,C"}
+{"version":3,"names":["_graphqlFileStorageS","_interopRequireDefault","require","_fileStorageS","_FileUploadModifier","_default","fileStorageS3","graphqlFileStorageS3","exports","default"],"sources":["index.ts"],"sourcesContent":["import graphqlFileStorageS3 from \"./plugins/graphqlFileStorageS3\";\nimport fileStorageS3 from \"./plugins/fileStorageS3\";\n\nexport default () => [fileStorageS3(), graphqlFileStorageS3];\n\nexport { createFileUploadModifier } from \"./utils/FileUploadModifier\";\n"],"mappings":";;;;;;;;;;;;;AAAA,IAAAA,oBAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,aAAA,GAAAF,sBAAA,CAAAC,OAAA;AAIA,IAAAE,mBAAA,GAAAF,OAAA;AAAsE,IAAAG,QAAA,GAFvDA,CAAA,KAAM,CAAC,IAAAC,qBAAa,EAAC,CAAC,EAAEC,4BAAoB,CAAC;AAAAC,OAAA,CAAAC,OAAA,GAAAJ,QAAA"}

package/multiPartUpload/CompleteMultiPartUploadUseCase.d.ts

@@ -0,0 +1,13 @@
+import S3 from "aws-sdk/clients/s3";
+interface CompleteMultiPartUploadParams {
+    fileKey: string;
+    uploadId: string;
+}
+export declare class CompleteMultiPartUploadUseCase {
+    private readonly s3;
+    private readonly bucket;
+    constructor(bucket: string, s3Client: S3);
+    execute(params: CompleteMultiPartUploadParams): Promise<void>;
+    private getAllUploadParts;
+}
+export {};

package/multiPartUpload/CompleteMultiPartUploadUseCase.js

@@ -0,0 +1,65 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CompleteMultiPartUploadUseCase = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+class CompleteMultiPartUploadUseCase {
+  constructor(bucket, s3Client) {
+    (0, _defineProperty2.default)(this, "s3", void 0);
+    (0, _defineProperty2.default)(this, "bucket", void 0);
+    this.bucket = bucket;
+    this.s3 = s3Client;
+  }
+  async execute(params) {
+    const uploadParams = {
+      Bucket: this.bucket,
+      Key: params.fileKey,
+      UploadId: params.uploadId
+    };
+    const allParts = await this.getAllUploadParts(uploadParams);
+    const s3Params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, uploadParams), {}, {
+      MultipartUpload: {
+        Parts: allParts
+      }
+    });
+    return new Promise((resolve, reject) => {
+      this.s3.completeMultipartUpload(s3Params, (err, data) => {
+        if (err) {
+          console.error(err);
+          reject(err);
+          return;
+        }
+        console.log(data);
+        resolve();
+      });
+    });
+  }
+  async getAllUploadParts(params) {
+    const parts = [];
+    let marker = undefined;
+    while (true) {
+      const {
+        Parts,
+        PartNumberMarker
+      } = await this.s3.listParts((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+        PartNumberMarker: marker
+      })).promise();
+      if (Parts) {
+        Parts.forEach(part => parts.push(part));
+      }
+      marker = PartNumberMarker || undefined;
+      if (!marker) {
+        break;
+      }
+    }
+    return parts.map(part => ({
+      ETag: part.ETag,
+      PartNumber: part.PartNumber
+    }));
+  }
+}
+exports.CompleteMultiPartUploadUseCase = CompleteMultiPartUploadUseCase;

package/multiPartUpload/CompleteMultiPartUploadUseCase.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["CompleteMultiPartUploadUseCase","constructor","bucket","s3Client","_defineProperty2","default","s3","execute","params","uploadParams","Bucket","Key","fileKey","UploadId","uploadId","allParts","getAllUploadParts","s3Params","_objectSpread2","MultipartUpload","Parts","Promise","resolve","reject","completeMultipartUpload","err","data","console","error","log","parts","marker","undefined","PartNumberMarker","listParts","promise","forEach","part","push","map","ETag","PartNumber","exports"],"sources":["CompleteMultiPartUploadUseCase.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\n\ninterface CompleteMultiPartUploadParams {\n    fileKey: string;\n    uploadId: string;\n}\n\ninterface GetAllUploadPartsParams {\n    Bucket: string;\n    Key: string;\n    UploadId: string;\n}\n\nexport class CompleteMultiPartUploadUseCase {\n    private readonly s3: S3;\n    private readonly bucket: string;\n\n    constructor(bucket: string, s3Client: S3) {\n        this.bucket = bucket;\n        this.s3 = s3Client;\n    }\n\n    async execute(params: CompleteMultiPartUploadParams) {\n        const uploadParams = {\n            Bucket: this.bucket,\n            Key: params.fileKey,\n            UploadId: params.uploadId\n        };\n\n        const allParts = await this.getAllUploadParts(uploadParams);\n\n        const s3Params = {\n            ...uploadParams,\n            MultipartUpload: {\n                Parts: allParts\n            }\n        };\n\n        return new Promise<void>((resolve, reject) => {\n            this.s3.completeMultipartUpload(s3Params, (err, data) => {\n                if (err) {\n                    console.error(err);\n                    reject(err);\n                    return;\n                }\n\n                console.log(data);\n                resolve();\n            });\n        });\n    }\n\n    private async getAllUploadParts(params: GetAllUploadPartsParams) {\n        const parts: S3.Parts = [];\n\n        let marker: number | undefined = undefined;\n        while (true) {\n            const { Parts, PartNumberMarker }: S3.ListPartsOutput = await this.s3\n                .listParts({\n                    ...params,\n                    PartNumberMarker: marker\n                })\n                .promise();\n\n            if (Parts) {\n                Parts.forEach(part => parts.push(part));\n            }\n\n            marker = PartNumberMarker || undefined;\n            if (!marker) {\n                break;\n            }\n        }\n\n        return parts.map(part => ({\n            ETag: part.ETag as string,\n            PartNumber: part.PartNumber as number\n        }));\n    }\n}\n"],"mappings":";;;;;;;;;AAaO,MAAMA,8BAA8B,CAAC;EAIxCC,WAAWA,CAACC,MAAc,EAAEC,QAAY,EAAE;IAAA,IAAAC,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IACtC,IAAI,CAACH,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACI,EAAE,GAAGH,QAAQ;EACtB;EAEA,MAAMI,OAAOA,CAACC,MAAqC,EAAE;IACjD,MAAMC,YAAY,GAAG;MACjBC,MAAM,EAAE,IAAI,CAACR,MAAM;MACnBS,GAAG,EAAEH,MAAM,CAACI,OAAO;MACnBC,QAAQ,EAAEL,MAAM,CAACM;IACrB,CAAC;IAED,MAAMC,QAAQ,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAACP,YAAY,CAAC;IAE3D,MAAMQ,QAAQ,OAAAC,cAAA,CAAAb,OAAA,MAAAa,cAAA,CAAAb,OAAA,MACPI,YAAY;MACfU,eAAe,EAAE;QACbC,KAAK,EAAEL;MACX;IAAC,EACJ;IAED,OAAO,IAAIM,OAAO,CAAO,CAACC,OAAO,EAAEC,MAAM,KAAK;MAC1C,IAAI,CAACjB,EAAE,CAACkB,uBAAuB,CAACP,QAAQ,EAAE,CAACQ,GAAG,EAAEC,IAAI,KAAK;QACrD,IAAID,GAAG,EAAE;UACLE,OAAO,CAACC,KAAK,CAACH,GAAG,CAAC;UAClBF,MAAM,CAACE,GAAG,CAAC;UACX;QACJ;QAEAE,OAAO,CAACE,GAAG,CAACH,IAAI,CAAC;QACjBJ,OAAO,CAAC,CAAC;MACb,CAAC,CAAC;IACN,CAAC,CAAC;EACN;EAEA,MAAcN,iBAAiBA,CAACR,MAA+B,EAAE;IAC7D,MAAMsB,KAAe,GAAG,EAAE;IAE1B,IAAIC,MAA0B,GAAGC,SAAS;IAC1C,OAAO,IAAI,EAAE;MACT,MAAM;QAAEZ,KAAK;QAAEa;MAAqC,CAAC,GAAG,MAAM,IAAI,CAAC3B,EAAE,CAChE4B,SAAS,KAAAhB,cAAA,CAAAb,OAAA,MAAAa,cAAA,CAAAb,OAAA,MACHG,MAAM;QACTyB,gBAAgB,EAAEF;MAAM,EAC3B,CAAC,CACDI,OAAO,CAAC,CAAC;MAEd,IAAIf,KAAK,EAAE;QACPA,KAAK,CAACgB,OAAO,CAACC,IAAI,IAAIP,KAAK,CAACQ,IAAI,CAACD,IAAI,CAAC,CAAC;MAC3C;MAEAN,MAAM,GAAGE,gBAAgB,IAAID,SAAS;MACtC,IAAI,CAACD,MAAM,EAAE;QACT;MACJ;IACJ;IAEA,OAAOD,KAAK,CAACS,GAAG,CAACF,IAAI,KAAK;MACtBG,IAAI,EAAEH,IAAI,CAACG,IAAc;MACzBC,UAAU,EAAEJ,IAAI,CAACI;IACrB,CAAC,CAAC,CAAC;EACP;AACJ;AAACC,OAAA,CAAA1C,8BAAA,GAAAA,8BAAA"}

package/multiPartUpload/CreateMultiPartUploadUseCase.d.ts

@@ -0,0 +1,20 @@
+import S3 from "aws-sdk/clients/s3";
+import { FileData } from "../types";
+interface CreateMultiPartUploadParams {
+    file: FileData;
+    numberOfParts: number;
+}
+export declare class CreateMultiPartUploadUseCase {
+    private readonly s3;
+    private readonly bucket;
+    constructor(bucket: string, s3Client: S3);
+    execute({ file, numberOfParts }: CreateMultiPartUploadParams): Promise<{
+        file: FileData;
+        uploadId: string | undefined;
+        parts: {
+            url: string;
+            partNumber: number;
+        }[];
+    }>;
+}
+export {};

package/multiPartUpload/CreateMultiPartUploadUseCase.js

@@ -0,0 +1,48 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CreateMultiPartUploadUseCase = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+class CreateMultiPartUploadUseCase {
+  constructor(bucket, s3Client) {
+    (0, _defineProperty2.default)(this, "s3", void 0);
+    (0, _defineProperty2.default)(this, "bucket", void 0);
+    this.bucket = bucket;
+    this.s3 = s3Client;
+  }
+  async execute({
+    file,
+    numberOfParts
+  }) {
+    const s3Params = {
+      Bucket: this.bucket,
+      Key: file.key
+    };
+    const {
+      UploadId
+    } = await this.s3.createMultipartUpload(s3Params).promise();
+    const parts = await Promise.all(Array.from({
+      length: numberOfParts
+    }).map((_, index) => {
+      return this.s3.getSignedUrlPromise("uploadPart", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, s3Params), {}, {
+        UploadId,
+        PartNumber: index + 1,
+        // URL expires after 24 hours.
+        Expires: 86400
+      })).then(url => ({
+        url,
+        partNumber: index + 1
+      }));
+    }));
+    return {
+      file,
+      uploadId: UploadId,
+      parts
+    };
+  }
+}
+exports.CreateMultiPartUploadUseCase = CreateMultiPartUploadUseCase;

package/multiPartUpload/CreateMultiPartUploadUseCase.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["CreateMultiPartUploadUseCase","constructor","bucket","s3Client","_defineProperty2","default","s3","execute","file","numberOfParts","s3Params","Bucket","Key","key","UploadId","createMultipartUpload","promise","parts","Promise","all","Array","from","length","map","_","index","getSignedUrlPromise","_objectSpread2","PartNumber","Expires","then","url","partNumber","uploadId","exports"],"sources":["CreateMultiPartUploadUseCase.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport { FileData } from \"~/types\";\n\ninterface CreateMultiPartUploadParams {\n    file: FileData;\n    numberOfParts: number;\n}\n\nexport class CreateMultiPartUploadUseCase {\n    private readonly s3: S3;\n    private readonly bucket: string;\n\n    constructor(bucket: string, s3Client: S3) {\n        this.bucket = bucket;\n        this.s3 = s3Client;\n    }\n\n    async execute({ file, numberOfParts }: CreateMultiPartUploadParams) {\n        const s3Params = { Bucket: this.bucket, Key: file.key };\n\n        const { UploadId } = await this.s3.createMultipartUpload(s3Params).promise();\n\n        const parts = await Promise.all(\n            Array.from({ length: numberOfParts }).map((_, index) => {\n                return this.s3\n                    .getSignedUrlPromise(\"uploadPart\", {\n                        ...s3Params,\n                        UploadId,\n                        PartNumber: index + 1,\n                        // URL expires after 24 hours.\n                        Expires: 86400\n                    })\n                    .then(url => ({\n                        url,\n                        partNumber: index + 1\n                    }));\n            })\n        );\n\n        return {\n            file,\n            uploadId: UploadId,\n            parts\n        };\n    }\n}\n"],"mappings":";;;;;;;;;AAQO,MAAMA,4BAA4B,CAAC;EAItCC,WAAWA,CAACC,MAAc,EAAEC,QAAY,EAAE;IAAA,IAAAC,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IACtC,IAAI,CAACH,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACI,EAAE,GAAGH,QAAQ;EACtB;EAEA,MAAMI,OAAOA,CAAC;IAAEC,IAAI;IAAEC;EAA2C,CAAC,EAAE;IAChE,MAAMC,QAAQ,GAAG;MAAEC,MAAM,EAAE,IAAI,CAACT,MAAM;MAAEU,GAAG,EAAEJ,IAAI,CAACK;IAAI,CAAC;IAEvD,MAAM;MAAEC;IAAS,CAAC,GAAG,MAAM,IAAI,CAACR,EAAE,CAACS,qBAAqB,CAACL,QAAQ,CAAC,CAACM,OAAO,CAAC,CAAC;IAE5E,MAAMC,KAAK,GAAG,MAAMC,OAAO,CAACC,GAAG,CAC3BC,KAAK,CAACC,IAAI,CAAC;MAAEC,MAAM,EAAEb;IAAc,CAAC,CAAC,CAACc,GAAG,CAAC,CAACC,CAAC,EAAEC,KAAK,KAAK;MACpD,OAAO,IAAI,CAACnB,EAAE,CACToB,mBAAmB,CAAC,YAAY,MAAAC,cAAA,CAAAtB,OAAA,MAAAsB,cAAA,CAAAtB,OAAA,MAC1BK,QAAQ;QACXI,QAAQ;QACRc,UAAU,EAAEH,KAAK,GAAG,CAAC;QACrB;QACAI,OAAO,EAAE;MAAK,EACjB,CAAC,CACDC,IAAI,CAACC,GAAG,KAAK;QACVA,GAAG;QACHC,UAAU,EAAEP,KAAK,GAAG;MACxB,CAAC,CAAC,CAAC;IACX,CAAC,CACL,CAAC;IAED,OAAO;MACHjB,IAAI;MACJyB,QAAQ,EAAEnB,QAAQ;MAClBG;IACJ,CAAC;EACL;AACJ;AAACiB,OAAA,CAAAlC,4BAAA,GAAAA,4BAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-file-manager-s3",
-	"version": "0.0.0-unstable.97a151f74d",
+	"version": "0.0.0-unstable.98511f29f1",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -10,22 +10,28 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api-file-manager": "0.0.0-unstable.97a151f74d",
-		"@webiny/error": "0.0.0-unstable.97a151f74d",
-		"@webiny/handler-graphql": "0.0.0-unstable.97a151f74d",
-		"@webiny/validation": "0.0.0-unstable.97a151f74d",
+		"@webiny/api": "0.0.0-unstable.98511f29f1",
+		"@webiny/api-file-manager": "0.0.0-unstable.98511f29f1",
+		"@webiny/api-security": "0.0.0-unstable.98511f29f1",
+		"@webiny/error": "0.0.0-unstable.98511f29f1",
+		"@webiny/handler-graphql": "0.0.0-unstable.98511f29f1",
+		"@webiny/plugins": "0.0.0-unstable.98511f29f1",
+		"@webiny/utils": "0.0.0-unstable.98511f29f1",
+		"@webiny/validation": "0.0.0-unstable.98511f29f1",
 		"form-data": "4.0.0",
-		"node-fetch": "2.6.7",
-		"sanitize-filename": "1.6.3",
-		"uniqid": "5.4.0"
+		"mime": "3.0.0",
+		"node-fetch": "2.6.9",
+		"p-map": "4.0.0",
+		"p-reduce": "2.1.0",
+		"sanitize-filename": "1.6.3"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.19.3",
-		"@babel/core": "^7.19.3",
-		"@types/node-fetch": "^2.6.1",
-		"@webiny/cli": "^0.0.0-unstable.97a151f74d",
-		"@webiny/project-utils": "^0.0.0-unstable.97a151f74d",
-		"rimraf": "^3.0.2",
+		"@babel/cli": "7.22.6",
+		"@babel/core": "7.22.8",
+		"@types/node-fetch": "2.6.2",
+		"@webiny/cli": "0.0.0-unstable.98511f29f1",
+		"@webiny/project-utils": "0.0.0-unstable.98511f29f1",
+		"rimraf": "3.0.2",
 		"typescript": "4.7.4"
 	},
 	"publishConfig": {
@@ -36,5 +42,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "97a151f74d8c5679323989fcc8cc7036be0f150e"
+	"gitHead": "98511f29f1e1fc7d03ed0d1379d0a0aeff6dae84"
 }

package/plugins/checkPermissions.d.ts

@@ -0,0 +1,4 @@
+import { FileManagerContext, FilePermission } from "@webiny/api-file-manager/types";
+export declare const checkPermissions: (context: FileManagerContext, check?: {
+    rwd?: string;
+}) => Promise<FilePermission[]>;

package/plugins/checkPermissions.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.checkPermissions = void 0;
+var _apiSecurity = require("@webiny/api-security");
+const checkPermissions = async (context, check = {}) => {
+  const filePermissions = await context.security.getPermissions("fm.file");
+  const relevantFilePermissions = filePermissions.filter(current => {
+    if (check.rwd && !hasRwd(current, check.rwd)) {
+      return false;
+    }
+    return true;
+  });
+  if (relevantFilePermissions.length === 0) {
+    throw new _apiSecurity.NotAuthorizedError();
+  }
+  return relevantFilePermissions;
+};
+exports.checkPermissions = checkPermissions;
+const hasRwd = (filesFilePermissions, rwd) => {
+  if (!Array.isArray(filesFilePermissions)) {
+    filesFilePermissions = [filesFilePermissions];
+  }
+  if (!rwd) {
+    return true;
+  }
+
+  // Is there a permission that doesn't restrict RWD permissions, that means all RWD permissions are allowed.
+  const permissionWithoutRwdRestrictions = filesFilePermissions.some(permission => {
+    return typeof permission.rwd !== "string";
+  });
+  if (permissionWithoutRwdRestrictions) {
+    return true;
+  }
+
+  // If there is no permission that doesn't restrict RWD permissions, that means we need to check if the RWD.
+  return filesFilePermissions.some(permission => {
+    return permission.rwd && permission.rwd.includes(rwd);
+  });
+};

package/plugins/checkPermissions.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_apiSecurity","require","checkPermissions","context","check","filePermissions","security","getPermissions","relevantFilePermissions","filter","current","rwd","hasRwd","length","NotAuthorizedError","exports","filesFilePermissions","Array","isArray","permissionWithoutRwdRestrictions","some","permission","includes"],"sources":["checkPermissions.ts"],"sourcesContent":["import { FileManagerContext, FilePermission } from \"@webiny/api-file-manager/types\";\nimport { NotAuthorizedError } from \"@webiny/api-security\";\n\nexport const checkPermissions = async (\n    context: FileManagerContext,\n    check: { rwd?: string } = {}\n) => {\n    const filePermissions = await context.security.getPermissions<FilePermission>(\"fm.file\");\n\n    const relevantFilePermissions = filePermissions.filter(current => {\n        if (check.rwd && !hasRwd(current, check.rwd)) {\n            return false;\n        }\n\n        return true;\n    });\n\n    if (relevantFilePermissions.length === 0) {\n        throw new NotAuthorizedError();\n    }\n\n    return relevantFilePermissions;\n};\n\nconst hasRwd = (filesFilePermissions: FilePermission | FilePermission[], rwd: string): boolean => {\n    if (!Array.isArray(filesFilePermissions)) {\n        filesFilePermissions = [filesFilePermissions];\n    }\n\n    if (!rwd) {\n        return true;\n    }\n\n    // Is there a permission that doesn't restrict RWD permissions, that means all RWD permissions are allowed.\n    const permissionWithoutRwdRestrictions = filesFilePermissions.some(permission => {\n        return typeof permission.rwd !== \"string\";\n    });\n\n    if (permissionWithoutRwdRestrictions) {\n        return true;\n    }\n\n    // If there is no permission that doesn't restrict RWD permissions, that means we need to check if the RWD.\n    return filesFilePermissions.some(permission => {\n        return permission.rwd && permission.rwd.includes(rwd);\n    });\n};\n"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAEO,MAAMC,gBAAgB,GAAG,MAAAA,CAC5BC,OAA2B,EAC3BC,KAAuB,GAAG,CAAC,CAAC,KAC3B;EACD,MAAMC,eAAe,GAAG,MAAMF,OAAO,CAACG,QAAQ,CAACC,cAAc,CAAiB,SAAS,CAAC;EAExF,MAAMC,uBAAuB,GAAGH,eAAe,CAACI,MAAM,CAACC,OAAO,IAAI;IAC9D,IAAIN,KAAK,CAACO,GAAG,IAAI,CAACC,MAAM,CAACF,OAAO,EAAEN,KAAK,CAACO,GAAG,CAAC,EAAE;MAC1C,OAAO,KAAK;IAChB;IAEA,OAAO,IAAI;EACf,CAAC,CAAC;EAEF,IAAIH,uBAAuB,CAACK,MAAM,KAAK,CAAC,EAAE;IACtC,MAAM,IAAIC,+BAAkB,CAAC,CAAC;EAClC;EAEA,OAAON,uBAAuB;AAClC,CAAC;AAACO,OAAA,CAAAb,gBAAA,GAAAA,gBAAA;AAEF,MAAMU,MAAM,GAAGA,CAACI,oBAAuD,EAAEL,GAAW,KAAc;EAC9F,IAAI,CAACM,KAAK,CAACC,OAAO,CAACF,oBAAoB,CAAC,EAAE;IACtCA,oBAAoB,GAAG,CAACA,oBAAoB,CAAC;EACjD;EAEA,IAAI,CAACL,GAAG,EAAE;IACN,OAAO,IAAI;EACf;;EAEA;EACA,MAAMQ,gCAAgC,GAAGH,oBAAoB,CAACI,IAAI,CAACC,UAAU,IAAI;IAC7E,OAAO,OAAOA,UAAU,CAACV,GAAG,KAAK,QAAQ;EAC7C,CAAC,CAAC;EAEF,IAAIQ,gCAAgC,EAAE;IAClC,OAAO,IAAI;EACf;;EAEA;EACA,OAAOH,oBAAoB,CAACI,IAAI,CAACC,UAAU,IAAI;IAC3C,OAAOA,UAAU,CAACV,GAAG,IAAIU,UAAU,CAACV,GAAG,CAACW,QAAQ,CAACX,GAAG,CAAC;EACzD,CAAC,CAAC;AACN,CAAC"}

package/plugins/fileStorageS3.d.ts

@@ -1,6 +1,3 @@
-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;
+import { ContextPlugin } from "@webiny/api";
+declare const _default: () => ContextPlugin<import("@webiny/api/types").Context>;
 export default _default;

package/plugins/fileStorageS3.js

@@ -1,68 +1,60 @@
 "use strict";
 
 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 _FilePhysicalStoragePlugin = require("@webiny/api-file-manager/plugins/FilePhysicalStoragePlugin");
+var _getPresignedPostPayload = require("../utils/getPresignedPostPayload");
 var _uploadFileToS = _interopRequireDefault(require("../utils/uploadFileToS3"));
-
-var _FilePhysicalStoragePlugin = require("@webiny/api-file-manager/plugins/definitions/FilePhysicalStoragePlugin");
-
+var _api = require("@webiny/api");
+var _createFileNormalizerFromContext = require("../utils/createFileNormalizerFromContext");
 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.
+   * We need to extend the type for FilePhysicalStoragePlugin.
+   * Otherwise, the `getPresignedPostPayload` doesn't know it has all required values in params.
    */
-  return new _FilePhysicalStoragePlugin.FilePhysicalStoragePlugin({
-    upload: async params => {
-      const {
-        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 new _api.ContextPlugin(context => {
+    context.plugins.register(new _FilePhysicalStoragePlugin.FilePhysicalStoragePlugin({
+      upload: async params => {
+        const {
+            settings,
+            buffer
+          } = params,
+          data = (0, _objectWithoutProperties2.default)(params, _excluded);
+        const normalizer = (0, _createFileNormalizerFromContext.createFileNormalizerFromContext)(context);
+        const {
+          data: preSignedPostPayload,
+          file
+        } = await (0, _getPresignedPostPayload.getPresignedPostPayload)(await normalizer.normalizeFile(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 params => {
+        const {
+          key
+        } = params;
+        const s3 = new _s.default();
+        if (!key || !S3_BUCKET) {
+          return;
+        }
+        await s3.deleteObject({
+          Bucket: S3_BUCKET,
+          Key: key
+        }).promise();
       }
-
-      return {
-        data: preSignedPostPayload,
-        file
-      };
-    },
-    delete: async params => {
-      const {
-        key
-      } = params;
-      const s3 = new _s.default();
-
-      if (!key || !S3_BUCKET) {
-        return;
-      }
-
-      await s3.deleteObject({
-        Bucket: S3_BUCKET,
-        Key: key
-      }).promise();
-    }
+    }));
   });
 };
-
 exports.default = _default;

package/plugins/fileStorageS3.js.map

@@ -1 +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;;;AAMA,MAAMA,SAAS,GAAGC,OAAO,CAACC,GAAR,CAAYF,SAA9B;;eAMe,MAAiC;EAC5C;AACJ;AACA;AACA;EACI,OAAO,IAAIG,oDAAJ,CAAuE;IAC1EC,MAAM,EAAE,MAAMC,MAAN,IAAgB;MACpB,MAAM;QAAEC,QAAF;QAAYC;MAAZ,IAAgCF,MAAtC;MAAA,MAA6BG,IAA7B,0CAAsCH,MAAtC;MAEA,MAAM;QAAEG,IAAI,EAAEC,oBAAR;QAA8BC;MAA9B,IAAuC,MAAM,IAAAC,gCAAA,EAC/CH,IAD+C,EAE/CF,QAF+C,CAAnD;MAKA,MAAMM,QAAQ,GAAG,MAAM,IAAAC,sBAAA,EAAeN,MAAf,EAAuBE,oBAAvB,CAAvB;;MACA,IAAI,CAACG,QAAQ,CAACE,EAAd,EAAkB;QACd,MAAMC,KAAK,CAAC,wBAAD,CAAX;MACH;;MAED,OAAO;QACHP,IAAI,EAAEC,oBADH;QAEHC;MAFG,CAAP;IAIH,CAlByE;IAmB1EM,MAAM,EAAE,MAAMX,MAAN,IAAgB;MACpB,MAAM;QAAEY;MAAF,IAAUZ,MAAhB;MACA,MAAMa,EAAE,GAAG,IAAIC,UAAJ,EAAX;;MAEA,IAAI,CAACF,GAAD,IAAQ,CAACjB,SAAb,EAAwB;QACpB;MACH;;MAED,MAAMkB,EAAE,CACHE,YADC,CACY;QACVC,MAAM,EAAErB,SADE;QAEVsB,GAAG,EAAEL;MAFK,CADZ,EAKDM,OALC,EAAN;IAMH;EAjCyE,CAAvE,CAAP;AAmCH,C"}
+{"version":3,"names":["_s","_interopRequireDefault","require","_FilePhysicalStoragePlugin","_getPresignedPostPayload","_uploadFileToS","_api","_createFileNormalizerFromContext","_excluded","S3_BUCKET","process","env","_default","ContextPlugin","context","plugins","register","FilePhysicalStoragePlugin","upload","params","settings","buffer","data","_objectWithoutProperties2","default","normalizer","createFileNormalizerFromContext","preSignedPostPayload","file","getPresignedPostPayload","normalizeFile","response","uploadFileToS3","ok","Error","delete","key","s3","S3","deleteObject","Bucket","Key","promise","exports"],"sources":["fileStorageS3.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport { FilePhysicalStoragePlugin } from \"@webiny/api-file-manager/plugins/FilePhysicalStoragePlugin\";\nimport { getPresignedPostPayload } from \"~/utils/getPresignedPostPayload\";\nimport uploadFileToS3 from \"../utils/uploadFileToS3\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport { createFileNormalizerFromContext } from \"~/utils/createFileNormalizerFromContext\";\nimport { PresignedPostPayloadData } from \"~/types\";\n\nconst S3_BUCKET = process.env.S3_BUCKET;\n\nexport default () => {\n    /**\n     * We need to extend the type for FilePhysicalStoragePlugin.\n     * Otherwise, the `getPresignedPostPayload` doesn't know it has all required values in params.\n     */\n    return new ContextPlugin(context => {\n        context.plugins.register(\n            new FilePhysicalStoragePlugin({\n                upload: async params => {\n                    const { settings, buffer, ...data } = params;\n\n                    const normalizer = createFileNormalizerFromContext(context);\n\n                    const { data: preSignedPostPayload, file } = await getPresignedPostPayload(\n                        await normalizer.normalizeFile(data as PresignedPostPayloadData),\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    });\n};\n"],"mappings":";;;;;;;;AAAA,IAAAA,EAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,0BAAA,GAAAD,OAAA;AACA,IAAAE,wBAAA,GAAAF,OAAA;AACA,IAAAG,cAAA,GAAAJ,sBAAA,CAAAC,OAAA;AACA,IAAAI,IAAA,GAAAJ,OAAA;AACA,IAAAK,gCAAA,GAAAL,OAAA;AAA0F,MAAAM,SAAA;AAG1F,MAAMC,SAAS,GAAGC,OAAO,CAACC,GAAG,CAACF,SAAS;AAAC,IAAAG,QAAA,GAEzBA,CAAA,KAAM;EACjB;AACJ;AACA;AACA;EACI,OAAO,IAAIC,kBAAa,CAACC,OAAO,IAAI;IAChCA,OAAO,CAACC,OAAO,CAACC,QAAQ,CACpB,IAAIC,oDAAyB,CAAC;MAC1BC,MAAM,EAAE,MAAMC,MAAM,IAAI;QACpB,MAAM;YAAEC,QAAQ;YAAEC;UAAgB,CAAC,GAAGF,MAAM;UAAfG,IAAI,OAAAC,yBAAA,CAAAC,OAAA,EAAKL,MAAM,EAAAX,SAAA;QAE5C,MAAMiB,UAAU,GAAG,IAAAC,gEAA+B,EAACZ,OAAO,CAAC;QAE3D,MAAM;UAAEQ,IAAI,EAAEK,oBAAoB;UAAEC;QAAK,CAAC,GAAG,MAAM,IAAAC,gDAAuB,EACtE,MAAMJ,UAAU,CAACK,aAAa,CAACR,IAAgC,CAAC,EAChEF,QACJ,CAAC;QAED,MAAMW,QAAQ,GAAG,MAAM,IAAAC,sBAAc,EAACX,MAAM,EAAEM,oBAAoB,CAAC;QACnE,IAAI,CAACI,QAAQ,CAACE,EAAE,EAAE;UACd,MAAMC,KAAK,CAAC,wBAAwB,CAAC;QACzC;QAEA,OAAO;UACHZ,IAAI,EAAEK,oBAAoB;UAC1BC;QACJ,CAAC;MACL,CAAC;MACDO,MAAM,EAAE,MAAMhB,MAAM,IAAI;QACpB,MAAM;UAAEiB;QAAI,CAAC,GAAGjB,MAAM;QACtB,MAAMkB,EAAE,GAAG,IAAIC,UAAE,CAAC,CAAC;QAEnB,IAAI,CAACF,GAAG,IAAI,CAAC3B,SAAS,EAAE;UACpB;QACJ;QAEA,MAAM4B,EAAE,CACHE,YAAY,CAAC;UACVC,MAAM,EAAE/B,SAAS;UACjBgC,GAAG,EAAEL;QACT,CAAC,CAAC,CACDM,OAAO,CAAC,CAAC;MAClB;IACJ,CAAC,CACL,CAAC;EACL,CAAC,CAAC;AACN,CAAC;AAAAC,OAAA,CAAAnB,OAAA,GAAAZ,QAAA"}