@webiny/api-file-manager 0.0.0-unstable.a4f3e4ea8b → 0.0.0-unstable.a85ef555b2

package/features/assetDelivery/privateFiles/NotAuthorizedOutputStrategy.d.ts

@@ -1,5 +1,5 @@
 import type { AssetReply } from "../../../delivery/AssetDelivery/abstractions/AssetReply.js";
-import { AssetOutputStrategy } from "../abstractions/AssetOutputStrategy.js";
-export declare class NotAuthorizedOutputStrategy implements AssetOutputStrategy.Interface {
+import type { IAssetOutputStrategy } from "../abstractions.js";
+export declare class NotAuthorizedOutputStrategy implements IAssetOutputStrategy {
     output(): Promise<AssetReply>;
 }

package/features/assetDelivery/privateFiles/NotAuthorizedOutputStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/privateFiles/NotAuthorizedOutputStrategy.js","sources":["../../../../src/features/assetDelivery/privateFiles/NotAuthorizedOutputStrategy.ts"],"sourcesContent":["import type { AssetReply } from \"~/delivery/AssetDelivery/abstractions/AssetReply.js\";\nimport { NotAuthorizedAssetReply } from \"./NotAuthorizedAssetReply.js\";\nimport { AssetOutputStrategy } from \"../abstractions/AssetOutputStrategy.js\";\n\nexport class NotAuthorizedOutputStrategy implements AssetOutputStrategy.Interface {\n    async output(): Promise<AssetReply> {\n        return new NotAuthorizedAssetReply();\n    }\n}\n"],"names":["NotAuthorizedOutputStrategy","NotAuthorizedAssetReply"],"mappings":";AAIO,MAAMA;IACT,MAAM,SAA8B;QAChC,OAAO,IAAIC;IACf;AACJ"}
+{"version":3,"file":"features/assetDelivery/privateFiles/NotAuthorizedOutputStrategy.js","sources":["../../../../src/features/assetDelivery/privateFiles/NotAuthorizedOutputStrategy.ts"],"sourcesContent":["import type { AssetReply } from \"~/delivery/AssetDelivery/abstractions/AssetReply.js\";\nimport { NotAuthorizedAssetReply } from \"./NotAuthorizedAssetReply.js\";\nimport type { IAssetOutputStrategy } from \"../abstractions.js\";\n\nexport class NotAuthorizedOutputStrategy implements IAssetOutputStrategy {\n    async output(): Promise<AssetReply> {\n        return new NotAuthorizedAssetReply();\n    }\n}\n"],"names":["NotAuthorizedOutputStrategy","NotAuthorizedAssetReply"],"mappings":";AAIO,MAAMA;IACT,MAAM,SAA8B;QAChC,OAAO,IAAIC;IACf;AACJ"}

package/features/assetDelivery/privateFiles/PrivateAuthenticatedAuthorizer.d.ts

@@ -1,11 +1,11 @@
 import type { File } from "../../../domain/file/types.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
-import { AssetAuthorizer } from "../abstractions/AssetAuthorizer.js";
-export declare class PrivateAuthenticatedAuthorizer implements AssetAuthorizer.Interface {
+import { type IAssetAuthorizer } from "../abstractions.js";
+export declare class PrivateAuthenticatedAuthorizer implements IAssetAuthorizer {
     private identityContext;
     constructor(identityContext: IdentityContext.Interface);
     authorize(file: File): Promise<void>;
 }
 export declare const PrivateAuthenticatedAuthorizerImpl: typeof PrivateAuthenticatedAuthorizer & {
-    __abstraction: import("@webiny/di").Abstraction<import("../abstractions/AssetAuthorizer.js").IAssetAuthorizer>;
+    __abstraction: import("@webiny/di").Abstraction<IAssetAuthorizer>;
 };

package/features/assetDelivery/privateFiles/PrivateAuthenticatedAuthorizer.js

@@ -1,6 +1,6 @@
 import error from "@webiny/error";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
-import { AssetAuthorizer } from "../abstractions/AssetAuthorizer.js";
+import { AssetAuthorizer } from "../abstractions.js";
 class PrivateAuthenticatedAuthorizer {
     constructor(identityContext){
         this.identityContext = identityContext;

package/features/assetDelivery/privateFiles/PrivateAuthenticatedAuthorizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/privateFiles/PrivateAuthenticatedAuthorizer.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateAuthenticatedAuthorizer.ts"],"sourcesContent":["import Error from \"@webiny/error\";\nimport type { File } from \"~/domain/file/types.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { AssetAuthorizer } from \"../abstractions/AssetAuthorizer.js\";\n\nexport class PrivateAuthenticatedAuthorizer implements AssetAuthorizer.Interface {\n    private identityContext: IdentityContext.Interface;\n\n    constructor(identityContext: IdentityContext.Interface) {\n        this.identityContext = identityContext;\n    }\n\n    async authorize(file: File) {\n        if (file.accessControl && file.accessControl.type === \"private-authenticated\") {\n            const identity = this.identityContext.getIdentity();\n\n            if (!identity) {\n                throw new Error({\n                    code: \"NOT_AUTHORIZED\",\n                    message: \"You're not authorized to access this asset!\"\n                });\n            }\n        }\n    }\n}\n\nexport const PrivateAuthenticatedAuthorizerImpl = AssetAuthorizer.createImplementation({\n    implementation: PrivateAuthenticatedAuthorizer,\n    dependencies: [IdentityContext]\n});\n"],"names":["PrivateAuthenticatedAuthorizer","identityContext","file","identity","Error","PrivateAuthenticatedAuthorizerImpl","AssetAuthorizer","IdentityContext"],"mappings":";;;AAKO,MAAMA;IAGT,YAAYC,eAA0C,CAAE;QACpD,IAAI,CAAC,eAAe,GAAGA;IAC3B;IAEA,MAAM,UAAUC,IAAU,EAAE;QACxB,IAAIA,KAAK,aAAa,IAAIA,AAA4B,4BAA5BA,KAAK,aAAa,CAAC,IAAI,EAA8B;YAC3E,MAAMC,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;YAEjD,IAAI,CAACA,UACD,MAAM,IAAIC,MAAM;gBACZ,MAAM;gBACN,SAAS;YACb;QAER;IACJ;AACJ;AAEO,MAAMC,qCAAqCC,gBAAgB,oBAAoB,CAAC;IACnF,gBAAgBN;IAChB,cAAc;QAACO;KAAgB;AACnC"}
+{"version":3,"file":"features/assetDelivery/privateFiles/PrivateAuthenticatedAuthorizer.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateAuthenticatedAuthorizer.ts"],"sourcesContent":["import Error from \"@webiny/error\";\nimport type { File } from \"~/domain/file/types.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { AssetAuthorizer, type IAssetAuthorizer } from \"../abstractions.js\";\n\nexport class PrivateAuthenticatedAuthorizer implements IAssetAuthorizer {\n    private identityContext: IdentityContext.Interface;\n\n    constructor(identityContext: IdentityContext.Interface) {\n        this.identityContext = identityContext;\n    }\n\n    async authorize(file: File) {\n        if (file.accessControl && file.accessControl.type === \"private-authenticated\") {\n            const identity = this.identityContext.getIdentity();\n\n            if (!identity) {\n                throw new Error({\n                    code: \"NOT_AUTHORIZED\",\n                    message: \"You're not authorized to access this asset!\"\n                });\n            }\n        }\n    }\n}\n\nexport const PrivateAuthenticatedAuthorizerImpl = AssetAuthorizer.createImplementation({\n    implementation: PrivateAuthenticatedAuthorizer,\n    dependencies: [IdentityContext]\n});\n"],"names":["PrivateAuthenticatedAuthorizer","identityContext","file","identity","Error","PrivateAuthenticatedAuthorizerImpl","AssetAuthorizer","IdentityContext"],"mappings":";;;AAKO,MAAMA;IAGT,YAAYC,eAA0C,CAAE;QACpD,IAAI,CAAC,eAAe,GAAGA;IAC3B;IAEA,MAAM,UAAUC,IAAU,EAAE;QACxB,IAAIA,KAAK,aAAa,IAAIA,AAA4B,4BAA5BA,KAAK,aAAa,CAAC,IAAI,EAA8B;YAC3E,MAAMC,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;YAEjD,IAAI,CAACA,UACD,MAAM,IAAIC,MAAM;gBACZ,MAAM;gBACN,SAAS;YACb;QAER;IACJ;AACJ;AAEO,MAAMC,qCAAqCC,gBAAgB,oBAAoB,CAAC;IACnF,gBAAgBN;IAChB,cAAc;QAACO;KAAgB;AACnC"}

package/features/assetDelivery/privateFiles/PrivateCache.d.ts

@@ -1,8 +1,8 @@
 import type { Asset } from "../../../delivery/AssetDelivery/Asset.js";
 import type { AssetReply } from "../../../delivery/AssetDelivery/abstractions/AssetReply.js";
-import { AssetOutputStrategy } from "../abstractions/AssetOutputStrategy.js";
-export declare class PrivateCache implements AssetOutputStrategy.Interface {
+import type { IAssetOutputStrategy } from "../abstractions.js";
+export declare class PrivateCache implements IAssetOutputStrategy {
     private strategy;
-    constructor(strategy: AssetOutputStrategy.Interface);
+    constructor(strategy: IAssetOutputStrategy);
     output(asset: Asset): Promise<AssetReply>;
 }

package/features/assetDelivery/privateFiles/PrivateCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/privateFiles/PrivateCache.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateCache.ts"],"sourcesContent":["import { parse, stringify } from \"cache-control-parser\";\nimport type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetReply } from \"~/delivery/AssetDelivery/abstractions/AssetReply.js\";\nimport { AssetOutputStrategy } from \"../abstractions/AssetOutputStrategy.js\";\n\nexport class PrivateCache implements AssetOutputStrategy.Interface {\n    private strategy: AssetOutputStrategy.Interface;\n\n    constructor(strategy: AssetOutputStrategy.Interface) {\n        this.strategy = strategy;\n    }\n\n    async output(asset: Asset): Promise<AssetReply> {\n        const reply = await this.strategy.output(asset);\n\n        reply.setHeaders(headers => {\n            headers.set(\"cache-control\", (value = \"\") => {\n                const cacheControl = parse(value);\n                cacheControl[\"private\"] = true;\n                cacheControl[\"public\"] = false;\n                return stringify(cacheControl);\n            });\n            return headers;\n        });\n\n        return reply;\n    }\n}\n"],"names":["PrivateCache","strategy","asset","reply","headers","value","cacheControl","parse","stringify"],"mappings":";AAKO,MAAMA;IAGT,YAAYC,QAAuC,CAAE;QACjD,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAM,OAAOC,KAAY,EAAuB;QAC5C,MAAMC,QAAQ,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAACD;QAEzCC,MAAM,UAAU,CAACC,CAAAA;YACbA,QAAQ,GAAG,CAAC,iBAAiB,CAACC,QAAQ,EAAE;gBACpC,MAAMC,eAAeC,MAAMF;gBAC3BC,YAAY,CAAC,UAAU,GAAG;gBAC1BA,YAAY,CAAC,SAAS,GAAG;gBACzB,OAAOE,UAAUF;YACrB;YACA,OAAOF;QACX;QAEA,OAAOD;IACX;AACJ"}
+{"version":3,"file":"features/assetDelivery/privateFiles/PrivateCache.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateCache.ts"],"sourcesContent":["import { parse, stringify } from \"cache-control-parser\";\nimport type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetReply } from \"~/delivery/AssetDelivery/abstractions/AssetReply.js\";\nimport type { IAssetOutputStrategy } from \"../abstractions.js\";\n\nexport class PrivateCache implements IAssetOutputStrategy {\n    private strategy: IAssetOutputStrategy;\n\n    constructor(strategy: IAssetOutputStrategy) {\n        this.strategy = strategy;\n    }\n\n    async output(asset: Asset): Promise<AssetReply> {\n        const reply = await this.strategy.output(asset);\n\n        reply.setHeaders(headers => {\n            headers.set(\"cache-control\", (value = \"\") => {\n                const cacheControl = parse(value);\n                cacheControl[\"private\"] = true;\n                cacheControl[\"public\"] = false;\n                return stringify(cacheControl);\n            });\n            return headers;\n        });\n\n        return reply;\n    }\n}\n"],"names":["PrivateCache","strategy","asset","reply","headers","value","cacheControl","parse","stringify"],"mappings":";AAKO,MAAMA;IAGT,YAAYC,QAA8B,CAAE;QACxC,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAM,OAAOC,KAAY,EAAuB;QAC5C,MAAMC,QAAQ,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAACD;QAEzCC,MAAM,UAAU,CAACC,CAAAA;YACbA,QAAQ,GAAG,CAAC,iBAAiB,CAACC,QAAQ,EAAE;gBACpC,MAAMC,eAAeC,MAAMF;gBAC3BC,YAAY,CAAC,UAAU,GAAG;gBAC1BA,YAAY,CAAC,SAAS,GAAG;gBACzB,OAAOE,UAAUF;YACrB;YACA,OAAOF;QACX;QAEA,OAAOD;IACX;AACJ"}

package/features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.d.ts

@@ -1,12 +1,11 @@
-import { AssetRequestResolver } from "../abstractions/AssetRequestResolver.js";
-import { AssetRequestFactory } from "../AssetRequest/abstractions.js";
-declare class PrivateFileAssetRequestResolverImpl implements AssetRequestResolver.Interface {
-    private readonly assetRequestFactory;
+import type { Request } from "@webiny/handler/types.js";
+import { AssetRequest } from "../../../delivery/AssetDelivery/AssetRequest.js";
+import { type IAssetRequestResolver } from "../abstractions.js";
+export declare class PrivateFileAssetRequestResolver implements IAssetRequestResolver {
     private readonly resolver;
-    constructor(assetRequestFactory: AssetRequestFactory.Interface, resolver: AssetRequestResolver.Interface);
-    resolve(request: AssetRequestResolver.Request): Promise<AssetRequestResolver.AssetRequest | undefined>;
+    constructor(resolver: IAssetRequestResolver);
+    resolve(request: Request): Promise<AssetRequest | undefined>;
 }
-export declare const PrivateFileAssetRequestResolver: typeof PrivateFileAssetRequestResolverImpl & {
-    __abstraction: import("@webiny/di").Abstraction<import("../abstractions/AssetRequestResolver.js").IAssetRequestResolver>;
+export declare const PrivateFileAssetRequestResolverDecorator: typeof PrivateFileAssetRequestResolver & {
+    __abstraction: import("@webiny/di").Abstraction<IAssetRequestResolver>;
 };
-export {};

package/features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.js

@@ -1,34 +1,31 @@
-import { AssetRequestResolver } from "../abstractions/AssetRequestResolver.js";
-import { AssetRequestFactory } from "../AssetRequest/abstractions.js";
-class PrivateFileAssetRequestResolverImpl {
-    constructor(assetRequestFactory, resolver){
-        this.assetRequestFactory = assetRequestFactory;
+import { AssetRequest } from "../../../delivery/AssetDelivery/AssetRequest.js";
+import { AssetRequestResolver } from "../abstractions.js";
+class PrivateFileAssetRequestResolver {
+    constructor(resolver){
         this.resolver = resolver;
     }
     async resolve(request) {
-        if (!request.url.startsWith("/private/")) return this.resolver.resolve(request);
+        if (!request.url?.startsWith("/private/")) return this.resolver.resolve(request);
         const params = request.params ?? {};
         const query = request.query ?? {};
         const path = params["*"];
-        return this.assetRequestFactory.create({
+        return new AssetRequest({
             key: decodeURI(path).replace("/private/", ""),
             context: {
-                url: request.url,
-                private: true,
-                accept: request.headers?.accept
+                url: request.url ?? "",
+                private: true
             },
             options: {
-                ...query
+                ...query,
+                width: query.width ? parseInt(query.width) : void 0
             }
         });
     }
 }
-const PrivateFileAssetRequestResolver = AssetRequestResolver.createDecorator({
-    decorator: PrivateFileAssetRequestResolverImpl,
-    dependencies: [
-        AssetRequestFactory
-    ]
+const PrivateFileAssetRequestResolverDecorator = AssetRequestResolver.createDecorator({
+    decorator: PrivateFileAssetRequestResolver,
+    dependencies: []
 });
-export { PrivateFileAssetRequestResolver };
+export { PrivateFileAssetRequestResolver, PrivateFileAssetRequestResolverDecorator };
 
 //# sourceMappingURL=PrivateFileAssetRequestResolver.js.map

package/features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.ts"],"sourcesContent":["import { AssetRequestResolver } from \"../abstractions/AssetRequestResolver.js\";\nimport { AssetRequestFactory } from \"../AssetRequest/abstractions.js\";\n\nclass PrivateFileAssetRequestResolverImpl implements AssetRequestResolver.Interface {\n    private readonly assetRequestFactory: AssetRequestFactory.Interface;\n    private readonly resolver: AssetRequestResolver.Interface;\n\n    constructor(\n        assetRequestFactory: AssetRequestFactory.Interface,\n        resolver: AssetRequestResolver.Interface\n    ) {\n        this.assetRequestFactory = assetRequestFactory;\n        this.resolver = resolver;\n    }\n\n    async resolve(\n        request: AssetRequestResolver.Request\n    ): Promise<AssetRequestResolver.AssetRequest | undefined> {\n        if (!request.url.startsWith(\"/private/\")) {\n            return this.resolver.resolve(request);\n        }\n\n        const params = (request.params ?? {}) as Record<string, any>;\n        const query = (request.query ?? {}) as Record<string, any>;\n\n        const path = params[\"*\"];\n\n        return this.assetRequestFactory.create({\n            key: decodeURI(path).replace(\"/private/\", \"\"),\n            context: {\n                url: request.url,\n                private: true,\n                accept: request.headers?.accept as string | undefined\n            },\n            options: { ...query }\n        });\n    }\n}\n\nexport const PrivateFileAssetRequestResolver = AssetRequestResolver.createDecorator({\n    decorator: PrivateFileAssetRequestResolverImpl,\n    dependencies: [AssetRequestFactory]\n});\n"],"names":["PrivateFileAssetRequestResolverImpl","assetRequestFactory","resolver","request","params","query","path","decodeURI","PrivateFileAssetRequestResolver","AssetRequestResolver","AssetRequestFactory"],"mappings":";;AAGA,MAAMA;IAIF,YACIC,mBAAkD,EAClDC,QAAwC,CAC1C;QACE,IAAI,CAAC,mBAAmB,GAAGD;QAC3B,IAAI,CAAC,QAAQ,GAAGC;IACpB;IAEA,MAAM,QACFC,OAAqC,EACiB;QACtD,IAAI,CAACA,QAAQ,GAAG,CAAC,UAAU,CAAC,cACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAACA;QAGjC,MAAMC,SAAUD,QAAQ,MAAM,IAAI,CAAC;QACnC,MAAME,QAASF,QAAQ,KAAK,IAAI,CAAC;QAEjC,MAAMG,OAAOF,MAAM,CAAC,IAAI;QAExB,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;YACnC,KAAKG,UAAUD,MAAM,OAAO,CAAC,aAAa;YAC1C,SAAS;gBACL,KAAKH,QAAQ,GAAG;gBAChB,SAAS;gBACT,QAAQA,QAAQ,OAAO,EAAE;YAC7B;YACA,SAAS;gBAAE,GAAGE,KAAK;YAAC;QACxB;IACJ;AACJ;AAEO,MAAMG,kCAAkCC,qBAAqB,eAAe,CAAC;IAChF,WAAWT;IACX,cAAc;QAACU;KAAoB;AACvC"}
+{"version":3,"file":"features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.ts"],"sourcesContent":["import type { Request } from \"@webiny/handler/types.js\";\nimport { AssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport { AssetRequestResolver, type IAssetRequestResolver } from \"../abstractions.js\";\n\nexport class PrivateFileAssetRequestResolver implements IAssetRequestResolver {\n    private readonly resolver: IAssetRequestResolver;\n\n    constructor(resolver: IAssetRequestResolver) {\n        this.resolver = resolver;\n    }\n\n    async resolve(request: Request): Promise<AssetRequest | undefined> {\n        if (!request.url?.startsWith(\"/private/\")) {\n            return this.resolver.resolve(request);\n        }\n\n        const params = (request.params ?? {}) as Record<string, any>;\n        const query = (request.query ?? {}) as Record<string, any>;\n\n        const path = params[\"*\"];\n\n        return new AssetRequest({\n            key: decodeURI(path).replace(\"/private/\", \"\"),\n            context: {\n                url: request.url ?? \"\",\n                private: true\n            },\n            options: {\n                ...query,\n                width: query.width ? parseInt(query.width) : undefined\n            }\n        });\n    }\n}\n\nexport const PrivateFileAssetRequestResolverDecorator = AssetRequestResolver.createDecorator({\n    decorator: PrivateFileAssetRequestResolver,\n    dependencies: []\n});\n"],"names":["PrivateFileAssetRequestResolver","resolver","request","params","query","path","AssetRequest","decodeURI","parseInt","undefined","PrivateFileAssetRequestResolverDecorator","AssetRequestResolver"],"mappings":";;AAIO,MAAMA;IAGT,YAAYC,QAA+B,CAAE;QACzC,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAM,QAAQC,OAAgB,EAAqC;QAC/D,IAAI,CAACA,QAAQ,GAAG,EAAE,WAAW,cACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAACA;QAGjC,MAAMC,SAAUD,QAAQ,MAAM,IAAI,CAAC;QACnC,MAAME,QAASF,QAAQ,KAAK,IAAI,CAAC;QAEjC,MAAMG,OAAOF,MAAM,CAAC,IAAI;QAExB,OAAO,IAAIG,aAAa;YACpB,KAAKC,UAAUF,MAAM,OAAO,CAAC,aAAa;YAC1C,SAAS;gBACL,KAAKH,QAAQ,GAAG,IAAI;gBACpB,SAAS;YACb;YACA,SAAS;gBACL,GAAGE,KAAK;gBACR,OAAOA,MAAM,KAAK,GAAGI,SAASJ,MAAM,KAAK,IAAIK;YACjD;QACJ;IACJ;AACJ;AAEO,MAAMC,2CAA2CC,qBAAqB,eAAe,CAAC;IACzF,WAAWX;IACX,cAAc,EAAE;AACpB"}

package/features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.d.ts

@@ -1,19 +1,19 @@
+import type { Asset } from "../../../delivery/AssetDelivery/Asset.js";
+import type { AssetRequest } from "../../../delivery/AssetDelivery/AssetRequest.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { GetFileUseCase } from "../../../features/file/GetFile/index.js";
-import { AssetAuthorizer } from "../abstractions/AssetAuthorizer.js";
-import { AssetProcessor } from "../abstractions/AssetProcessor.js";
-declare class PrivateFilesAssetProcessorImpl implements AssetProcessor.Interface {
+import { type IAssetProcessor, type IAssetAuthorizer } from "../abstractions.js";
+export declare class PrivateFilesAssetProcessor implements IAssetProcessor {
     private readonly identityContext;
     private readonly getFile;
     private readonly assetAuthorizer;
     private readonly assetProcessor;
-    constructor(identityContext: IdentityContext.Interface, getFile: GetFileUseCase.Interface, assetAuthorizer: AssetAuthorizer.Interface, assetProcessor: AssetProcessor.Interface);
-    process(assetRequest: AssetProcessor.AssetRequest, asset: AssetProcessor.Asset): Promise<AssetProcessor.Asset>;
+    constructor(identityContext: IdentityContext.Interface, getFile: GetFileUseCase.Interface, assetAuthorizer: IAssetAuthorizer, assetProcessor: IAssetProcessor);
+    process(assetRequest: AssetRequest, asset: Asset): Promise<Asset>;
     private isPrivate;
     private requestedViaPrivateEndpoint;
     private requestedViaPublicEndpoint;
 }
-export declare const PrivateFilesAssetProcessor: typeof PrivateFilesAssetProcessorImpl & {
-    __abstraction: import("@webiny/di").Abstraction<import("../abstractions/AssetProcessor.js").IAssetProcessor>;
+export declare const PrivateFilesAssetProcessorDecorator: typeof PrivateFilesAssetProcessor & {
+    __abstraction: import("@webiny/di").Abstraction<IAssetProcessor>;
 };
-export {};

package/features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.js

@@ -5,9 +5,8 @@ import { RedirectToPublicUrlOutputStrategy } from "./RedirectToPublicUrlOutputSt
 import { RedirectToPrivateUrlOutputStrategy } from "./RedirectToPrivateUrlOutputStrategy.js";
 import { PrivateCache } from "./PrivateCache.js";
 import { PublicCache } from "./PublicCache.js";
-import { AssetAuthorizer } from "../abstractions/AssetAuthorizer.js";
-import { AssetProcessor } from "../abstractions/AssetProcessor.js";
-class PrivateFilesAssetProcessorImpl {
+import { AssetAuthorizer, AssetProcessor } from "../abstractions.js";
+class PrivateFilesAssetProcessor {
     constructor(identityContext, getFile, assetAuthorizer, assetProcessor){
         this.identityContext = identityContext;
         this.getFile = getFile;
@@ -23,11 +22,11 @@ class PrivateFilesAssetProcessorImpl {
         });
         const isPrivateFile = this.isPrivate(file);
         if (!isPrivateFile && this.requestedViaPrivateEndpoint(assetRequest)) {
-            asset.setOutputStrategy(RedirectToPublicUrlOutputStrategy.create(assetRequest));
+            asset.setOutputStrategy(new RedirectToPublicUrlOutputStrategy(assetRequest));
             return asset;
         }
         if (isPrivateFile && this.requestedViaPublicEndpoint(assetRequest)) {
-            asset.setOutputStrategy(RedirectToPrivateUrlOutputStrategy.create(assetRequest));
+            asset.setOutputStrategy(new RedirectToPrivateUrlOutputStrategy(assetRequest));
             return asset;
         }
         try {
@@ -53,14 +52,14 @@ class PrivateFilesAssetProcessorImpl {
         return !this.requestedViaPrivateEndpoint(assetRequest);
     }
 }
-const PrivateFilesAssetProcessor = AssetProcessor.createDecorator({
-    decorator: PrivateFilesAssetProcessorImpl,
+const PrivateFilesAssetProcessorDecorator = AssetProcessor.createDecorator({
+    decorator: PrivateFilesAssetProcessor,
     dependencies: [
         IdentityContext,
         GetFileUseCase,
         AssetAuthorizer
     ]
 });
-export { PrivateFilesAssetProcessor };
+export { PrivateFilesAssetProcessor, PrivateFilesAssetProcessorDecorator };
 
 //# sourceMappingURL=PrivateFilesAssetProcessor.js.map

package/features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.ts"],"sourcesContent":["import { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { GetFileUseCase } from \"~/features/file/GetFile/index.js\";\nimport { NotAuthorizedOutputStrategy } from \"./NotAuthorizedOutputStrategy.js\";\nimport { RedirectToPublicUrlOutputStrategy } from \"./RedirectToPublicUrlOutputStrategy.js\";\nimport { RedirectToPrivateUrlOutputStrategy } from \"./RedirectToPrivateUrlOutputStrategy.js\";\nimport { PrivateCache } from \"./PrivateCache.js\";\nimport { PublicCache } from \"./PublicCache.js\";\nimport { AssetAuthorizer } from \"../abstractions/AssetAuthorizer.js\";\nimport { AssetProcessor } from \"../abstractions/AssetProcessor.js\";\nimport type { File as IFile } from \"~/domain/file/types.js\";\n\ninterface MaybePrivate {\n    private?: boolean;\n}\n\nclass PrivateFilesAssetProcessorImpl implements AssetProcessor.Interface {\n    constructor(\n        private readonly identityContext: IdentityContext.Interface,\n        private readonly getFile: GetFileUseCase.Interface,\n        private readonly assetAuthorizer: AssetAuthorizer.Interface,\n        private readonly assetProcessor: AssetProcessor.Interface\n    ) {}\n\n    async process(\n        assetRequest: AssetProcessor.AssetRequest,\n        asset: AssetProcessor.Asset\n    ): Promise<AssetProcessor.Asset> {\n        const id = asset.getId();\n\n        const file = await this.identityContext.withoutAuthorization(async () => {\n            const fileResult = await this.getFile.execute(id);\n            if (fileResult.isFail()) {\n                throw fileResult.error;\n            }\n            return fileResult.value;\n        });\n\n        const isPrivateFile = this.isPrivate(file);\n\n        if (!isPrivateFile && this.requestedViaPrivateEndpoint(assetRequest)) {\n            asset.setOutputStrategy(RedirectToPublicUrlOutputStrategy.create(assetRequest));\n            return asset;\n        }\n\n        if (isPrivateFile && this.requestedViaPublicEndpoint(assetRequest)) {\n            asset.setOutputStrategy(RedirectToPrivateUrlOutputStrategy.create(assetRequest));\n            return asset;\n        }\n\n        try {\n            await this.assetAuthorizer.authorize(file);\n        } catch {\n            asset.setOutputStrategy(new NotAuthorizedOutputStrategy());\n            return asset;\n        }\n\n        const processedAsset = await this.assetProcessor.process(assetRequest, asset);\n\n        processedAsset.setOutputStrategy(strategy => {\n            if (!strategy) {\n                throw Error(`No asset output strategy is configured!`);\n            }\n            return isPrivateFile ? new PrivateCache(strategy) : new PublicCache(strategy);\n        });\n\n        return processedAsset;\n    }\n\n    private isPrivate(file: IFile) {\n        return file.accessControl && file.accessControl.type.startsWith(\"private-\");\n    }\n\n    private requestedViaPrivateEndpoint(assetRequest: AssetProcessor.AssetRequest) {\n        return assetRequest.getContext<MaybePrivate>().private;\n    }\n\n    private requestedViaPublicEndpoint(assetRequest: AssetProcessor.AssetRequest) {\n        return !this.requestedViaPrivateEndpoint(assetRequest);\n    }\n}\n\nexport const PrivateFilesAssetProcessor = AssetProcessor.createDecorator({\n    decorator: PrivateFilesAssetProcessorImpl,\n    dependencies: [IdentityContext, GetFileUseCase, AssetAuthorizer]\n});\n"],"names":["PrivateFilesAssetProcessorImpl","identityContext","getFile","assetAuthorizer","assetProcessor","assetRequest","asset","id","file","fileResult","isPrivateFile","RedirectToPublicUrlOutputStrategy","RedirectToPrivateUrlOutputStrategy","NotAuthorizedOutputStrategy","processedAsset","strategy","Error","PrivateCache","PublicCache","PrivateFilesAssetProcessor","AssetProcessor","IdentityContext","GetFileUseCase","AssetAuthorizer"],"mappings":";;;;;;;;;AAeA,MAAMA;IACF,YACqBC,eAA0C,EAC1CC,OAAiC,EACjCC,eAA0C,EAC1CC,cAAwC,CAC3D;aAJmBH,eAAe,GAAfA;aACAC,OAAO,GAAPA;aACAC,eAAe,GAAfA;aACAC,cAAc,GAAdA;IAClB;IAEH,MAAM,QACFC,YAAyC,EACzCC,KAA2B,EACE;QAC7B,MAAMC,KAAKD,MAAM,KAAK;QAEtB,MAAME,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC;YACzD,MAAMC,aAAa,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAACF;YAC9C,IAAIE,WAAW,MAAM,IACjB,MAAMA,WAAW,KAAK;YAE1B,OAAOA,WAAW,KAAK;QAC3B;QAEA,MAAMC,gBAAgB,IAAI,CAAC,SAAS,CAACF;QAErC,IAAI,CAACE,iBAAiB,IAAI,CAAC,2BAA2B,CAACL,eAAe;YAClEC,MAAM,iBAAiB,CAACK,kCAAkC,MAAM,CAACN;YACjE,OAAOC;QACX;QAEA,IAAII,iBAAiB,IAAI,CAAC,0BAA0B,CAACL,eAAe;YAChEC,MAAM,iBAAiB,CAACM,mCAAmC,MAAM,CAACP;YAClE,OAAOC;QACX;QAEA,IAAI;YACA,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAACE;QACzC,EAAE,OAAM;YACJF,MAAM,iBAAiB,CAAC,IAAIO;YAC5B,OAAOP;QACX;QAEA,MAAMQ,iBAAiB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAACT,cAAcC;QAEvEQ,eAAe,iBAAiB,CAACC,CAAAA;YAC7B,IAAI,CAACA,UACD,MAAMC,MAAM;YAEhB,OAAON,gBAAgB,IAAIO,aAAaF,YAAY,IAAIG,YAAYH;QACxE;QAEA,OAAOD;IACX;IAEQ,UAAUN,IAAW,EAAE;QAC3B,OAAOA,KAAK,aAAa,IAAIA,KAAK,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;IACpE;IAEQ,4BAA4BH,YAAyC,EAAE;QAC3E,OAAOA,aAAa,UAAU,GAAiB,OAAO;IAC1D;IAEQ,2BAA2BA,YAAyC,EAAE;QAC1E,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAACA;IAC7C;AACJ;AAEO,MAAMc,6BAA6BC,eAAe,eAAe,CAAC;IACrE,WAAWpB;IACX,cAAc;QAACqB;QAAiBC;QAAgBC;KAAgB;AACpE"}
+{"version":3,"file":"features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.ts"],"sourcesContent":["import type { File } from \"~/domain/file/types.js\";\nimport type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { GetFileUseCase } from \"~/features/file/GetFile/index.js\";\nimport { NotAuthorizedOutputStrategy } from \"./NotAuthorizedOutputStrategy.js\";\nimport { RedirectToPublicUrlOutputStrategy } from \"./RedirectToPublicUrlOutputStrategy.js\";\nimport { RedirectToPrivateUrlOutputStrategy } from \"./RedirectToPrivateUrlOutputStrategy.js\";\nimport { PrivateCache } from \"./PrivateCache.js\";\nimport { PublicCache } from \"./PublicCache.js\";\nimport {\n    AssetProcessor,\n    AssetAuthorizer,\n    type IAssetProcessor,\n    type IAssetAuthorizer\n} from \"../abstractions.js\";\n\ninterface MaybePrivate {\n    private?: boolean;\n}\n\nexport class PrivateFilesAssetProcessor implements IAssetProcessor {\n    private readonly identityContext: IdentityContext.Interface;\n    private readonly getFile: GetFileUseCase.Interface;\n    private readonly assetAuthorizer: IAssetAuthorizer;\n    private readonly assetProcessor: IAssetProcessor;\n\n    constructor(\n        identityContext: IdentityContext.Interface,\n        getFile: GetFileUseCase.Interface,\n        assetAuthorizer: IAssetAuthorizer,\n        assetProcessor: IAssetProcessor\n    ) {\n        this.identityContext = identityContext;\n        this.getFile = getFile;\n        this.assetAuthorizer = assetAuthorizer;\n        this.assetProcessor = assetProcessor;\n    }\n\n    async process(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        // Only registered when private files are licensed (register-time gate in AssetDeliveryFeature),\n        // so no per-request license guard is needed here.\n        const id = asset.getId();\n\n        const file = await this.identityContext.withoutAuthorization(async () => {\n            const fileResult = await this.getFile.execute(id);\n            if (fileResult.isFail()) {\n                throw fileResult.error;\n            }\n            return fileResult.value;\n        });\n\n        const isPrivateFile = this.isPrivate(file);\n\n        if (!isPrivateFile && this.requestedViaPrivateEndpoint(assetRequest)) {\n            asset.setOutputStrategy(new RedirectToPublicUrlOutputStrategy(assetRequest));\n            return asset;\n        }\n\n        if (isPrivateFile && this.requestedViaPublicEndpoint(assetRequest)) {\n            asset.setOutputStrategy(new RedirectToPrivateUrlOutputStrategy(assetRequest));\n            return asset;\n        }\n\n        try {\n            await this.assetAuthorizer.authorize(file);\n        } catch {\n            asset.setOutputStrategy(new NotAuthorizedOutputStrategy());\n            return asset;\n        }\n\n        const processedAsset = await this.assetProcessor.process(assetRequest, asset);\n\n        processedAsset.setOutputStrategy(strategy => {\n            if (!strategy) {\n                throw Error(`No asset output strategy is configured!`);\n            }\n            return isPrivateFile ? new PrivateCache(strategy) : new PublicCache(strategy);\n        });\n\n        return processedAsset;\n    }\n\n    private isPrivate(file: File) {\n        return file.accessControl && file.accessControl.type.startsWith(\"private-\");\n    }\n\n    private requestedViaPrivateEndpoint(assetRequest: AssetRequest) {\n        return assetRequest.getContext<MaybePrivate>().private;\n    }\n\n    private requestedViaPublicEndpoint(assetRequest: AssetRequest) {\n        return !this.requestedViaPrivateEndpoint(assetRequest);\n    }\n}\n\nexport const PrivateFilesAssetProcessorDecorator = AssetProcessor.createDecorator({\n    decorator: PrivateFilesAssetProcessor,\n    dependencies: [IdentityContext, GetFileUseCase, AssetAuthorizer]\n});\n"],"names":["PrivateFilesAssetProcessor","identityContext","getFile","assetAuthorizer","assetProcessor","assetRequest","asset","id","file","fileResult","isPrivateFile","RedirectToPublicUrlOutputStrategy","RedirectToPrivateUrlOutputStrategy","NotAuthorizedOutputStrategy","processedAsset","strategy","Error","PrivateCache","PublicCache","PrivateFilesAssetProcessorDecorator","AssetProcessor","IdentityContext","GetFileUseCase","AssetAuthorizer"],"mappings":";;;;;;;;AAqBO,MAAMA;IAMT,YACIC,eAA0C,EAC1CC,OAAiC,EACjCC,eAAiC,EACjCC,cAA+B,CACjC;QACE,IAAI,CAAC,eAAe,GAAGH;QACvB,IAAI,CAAC,OAAO,GAAGC;QACf,IAAI,CAAC,eAAe,GAAGC;QACvB,IAAI,CAAC,cAAc,GAAGC;IAC1B;IAEA,MAAM,QAAQC,YAA0B,EAAEC,KAAY,EAAkB;QAGpE,MAAMC,KAAKD,MAAM,KAAK;QAEtB,MAAME,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC;YACzD,MAAMC,aAAa,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAACF;YAC9C,IAAIE,WAAW,MAAM,IACjB,MAAMA,WAAW,KAAK;YAE1B,OAAOA,WAAW,KAAK;QAC3B;QAEA,MAAMC,gBAAgB,IAAI,CAAC,SAAS,CAACF;QAErC,IAAI,CAACE,iBAAiB,IAAI,CAAC,2BAA2B,CAACL,eAAe;YAClEC,MAAM,iBAAiB,CAAC,IAAIK,kCAAkCN;YAC9D,OAAOC;QACX;QAEA,IAAII,iBAAiB,IAAI,CAAC,0BAA0B,CAACL,eAAe;YAChEC,MAAM,iBAAiB,CAAC,IAAIM,mCAAmCP;YAC/D,OAAOC;QACX;QAEA,IAAI;YACA,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAACE;QACzC,EAAE,OAAM;YACJF,MAAM,iBAAiB,CAAC,IAAIO;YAC5B,OAAOP;QACX;QAEA,MAAMQ,iBAAiB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAACT,cAAcC;QAEvEQ,eAAe,iBAAiB,CAACC,CAAAA;YAC7B,IAAI,CAACA,UACD,MAAMC,MAAM;YAEhB,OAAON,gBAAgB,IAAIO,aAAaF,YAAY,IAAIG,YAAYH;QACxE;QAEA,OAAOD;IACX;IAEQ,UAAUN,IAAU,EAAE;QAC1B,OAAOA,KAAK,aAAa,IAAIA,KAAK,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;IACpE;IAEQ,4BAA4BH,YAA0B,EAAE;QAC5D,OAAOA,aAAa,UAAU,GAAiB,OAAO;IAC1D;IAEQ,2BAA2BA,YAA0B,EAAE;QAC3D,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAACA;IAC7C;AACJ;AAEO,MAAMc,sCAAsCC,eAAe,eAAe,CAAC;IAC9E,WAAWpB;IACX,cAAc;QAACqB;QAAiBC;QAAgBC;KAAgB;AACpE"}

package/features/assetDelivery/privateFiles/PublicCache.d.ts

@@ -1,8 +1,8 @@
 import type { Asset } from "../../../delivery/AssetDelivery/Asset.js";
 import type { AssetReply } from "../../../delivery/AssetDelivery/abstractions/AssetReply.js";
-import { AssetOutputStrategy } from "../abstractions/AssetOutputStrategy.js";
-export declare class PublicCache implements AssetOutputStrategy.Interface {
+import type { IAssetOutputStrategy } from "../abstractions.js";
+export declare class PublicCache implements IAssetOutputStrategy {
     private strategy;
-    constructor(strategy: AssetOutputStrategy.Interface);
+    constructor(strategy: IAssetOutputStrategy);
     output(asset: Asset): Promise<AssetReply>;
 }

package/features/assetDelivery/privateFiles/PublicCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/privateFiles/PublicCache.js","sources":["../../../../src/features/assetDelivery/privateFiles/PublicCache.ts"],"sourcesContent":["import { parse, stringify } from \"cache-control-parser\";\nimport type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetReply } from \"~/delivery/AssetDelivery/abstractions/AssetReply.js\";\nimport { AssetOutputStrategy } from \"../abstractions/AssetOutputStrategy.js\";\n\nexport class PublicCache implements AssetOutputStrategy.Interface {\n    private strategy: AssetOutputStrategy.Interface;\n\n    constructor(strategy: AssetOutputStrategy.Interface) {\n        this.strategy = strategy;\n    }\n\n    async output(asset: Asset): Promise<AssetReply> {\n        const reply = await this.strategy.output(asset);\n\n        reply.setHeaders(headers => {\n            headers.set(\"cache-control\", (value = \"\") => {\n                const cacheControl = parse(value);\n                cacheControl[\"private\"] = false;\n                cacheControl[\"public\"] = true;\n                return stringify(cacheControl);\n            });\n            return headers;\n        });\n\n        return reply;\n    }\n}\n"],"names":["PublicCache","strategy","asset","reply","headers","value","cacheControl","parse","stringify"],"mappings":";AAKO,MAAMA;IAGT,YAAYC,QAAuC,CAAE;QACjD,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAM,OAAOC,KAAY,EAAuB;QAC5C,MAAMC,QAAQ,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAACD;QAEzCC,MAAM,UAAU,CAACC,CAAAA;YACbA,QAAQ,GAAG,CAAC,iBAAiB,CAACC,QAAQ,EAAE;gBACpC,MAAMC,eAAeC,MAAMF;gBAC3BC,YAAY,CAAC,UAAU,GAAG;gBAC1BA,YAAY,CAAC,SAAS,GAAG;gBACzB,OAAOE,UAAUF;YACrB;YACA,OAAOF;QACX;QAEA,OAAOD;IACX;AACJ"}
+{"version":3,"file":"features/assetDelivery/privateFiles/PublicCache.js","sources":["../../../../src/features/assetDelivery/privateFiles/PublicCache.ts"],"sourcesContent":["import { parse, stringify } from \"cache-control-parser\";\nimport type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetReply } from \"~/delivery/AssetDelivery/abstractions/AssetReply.js\";\nimport type { IAssetOutputStrategy } from \"../abstractions.js\";\n\nexport class PublicCache implements IAssetOutputStrategy {\n    private strategy: IAssetOutputStrategy;\n\n    constructor(strategy: IAssetOutputStrategy) {\n        this.strategy = strategy;\n    }\n\n    async output(asset: Asset): Promise<AssetReply> {\n        const reply = await this.strategy.output(asset);\n\n        reply.setHeaders(headers => {\n            headers.set(\"cache-control\", (value = \"\") => {\n                const cacheControl = parse(value);\n                cacheControl[\"private\"] = false;\n                cacheControl[\"public\"] = true;\n                return stringify(cacheControl);\n            });\n            return headers;\n        });\n\n        return reply;\n    }\n}\n"],"names":["PublicCache","strategy","asset","reply","headers","value","cacheControl","parse","stringify"],"mappings":";AAKO,MAAMA;IAGT,YAAYC,QAA8B,CAAE;QACxC,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAM,OAAOC,KAAY,EAAuB;QAC5C,MAAMC,QAAQ,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAACD;QAEzCC,MAAM,UAAU,CAACC,CAAAA;YACbA,QAAQ,GAAG,CAAC,iBAAiB,CAACC,QAAQ,EAAE;gBACpC,MAAMC,eAAeC,MAAMF;gBAC3BC,YAAY,CAAC,UAAU,GAAG;gBAC1BA,YAAY,CAAC,SAAS,GAAG;gBACzB,OAAOE,UAAUF;YACrB;YACA,OAAOF;QACX;QAEA,OAAOD;IACX;AACJ"}

package/features/assetDelivery/privateFiles/RedirectToPrivateUrlOutputStrategy.d.ts

@@ -1,10 +1,9 @@
 import type { Asset } from "../../../delivery/AssetDelivery/Asset.js";
 import type { AssetRequest } from "../../../delivery/AssetDelivery/AssetRequest.js";
 import { AssetReply } from "../../../delivery/AssetDelivery/abstractions/AssetReply.js";
-import { AssetOutputStrategy } from "../abstractions/AssetOutputStrategy.js";
-export declare class RedirectToPrivateUrlOutputStrategy implements AssetOutputStrategy.Interface {
-    private readonly assetRequest;
-    static create(assetRequest: AssetRequest): RedirectToPrivateUrlOutputStrategy;
-    private constructor();
+import type { IAssetOutputStrategy } from "../abstractions.js";
+export declare class RedirectToPrivateUrlOutputStrategy implements IAssetOutputStrategy {
+    private assetRequest;
+    constructor(assetRequest: AssetRequest);
     output(asset: Asset): Promise<AssetReply>;
 }

package/features/assetDelivery/privateFiles/RedirectToPrivateUrlOutputStrategy.js

@@ -1,15 +1,12 @@
 import { AssetReply } from "../../../delivery/AssetDelivery/abstractions/AssetReply.js";
 import { ResponseHeaders } from "@webiny/handler";
 class RedirectToPrivateUrlOutputStrategy {
-    static create(assetRequest) {
-        return new RedirectToPrivateUrlOutputStrategy(assetRequest);
-    }
     constructor(assetRequest){
         this.assetRequest = assetRequest;
     }
     async output(asset) {
         const requestUrl = this.assetRequest.getContext().url;
-        return AssetReply.create({
+        return new AssetReply({
             code: 301,
             headers: ResponseHeaders.create({
                 location: requestUrl.replace("/files/", "/private/"),

package/features/assetDelivery/privateFiles/RedirectToPrivateUrlOutputStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/privateFiles/RedirectToPrivateUrlOutputStrategy.js","sources":["../../../../src/features/assetDelivery/privateFiles/RedirectToPrivateUrlOutputStrategy.ts"],"sourcesContent":["import type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport { AssetReply } from \"~/delivery/AssetDelivery/abstractions/AssetReply.js\";\nimport { ResponseHeaders } from \"@webiny/handler\";\nimport { AssetOutputStrategy } from \"../abstractions/AssetOutputStrategy.js\";\n\nexport class RedirectToPrivateUrlOutputStrategy implements AssetOutputStrategy.Interface {\n    private readonly assetRequest: AssetRequest;\n\n    public static create(assetRequest: AssetRequest) {\n        return new RedirectToPrivateUrlOutputStrategy(assetRequest);\n    }\n\n    private constructor(assetRequest: AssetRequest) {\n        this.assetRequest = assetRequest;\n    }\n\n    public async output(asset: Asset): Promise<AssetReply> {\n        const requestUrl = this.assetRequest.getContext().url;\n\n        return AssetReply.create({\n            code: 301,\n            headers: ResponseHeaders.create({\n                location: requestUrl.replace(\"/files/\", \"/private/\"),\n                \"content-type\": asset.getContentType(),\n                \"cache-control\": `public, max-age=${86400 * 30}`\n            })\n        });\n    }\n}\n"],"names":["RedirectToPrivateUrlOutputStrategy","assetRequest","asset","requestUrl","AssetReply","ResponseHeaders"],"mappings":";;AAMO,MAAMA;IAGT,OAAc,OAAOC,YAA0B,EAAE;QAC7C,OAAO,IAAID,mCAAmCC;IAClD;IAEA,YAAoBA,YAA0B,CAAE;QAC5C,IAAI,CAAC,YAAY,GAAGA;IACxB;IAEA,MAAa,OAAOC,KAAY,EAAuB;QACnD,MAAMC,aAAa,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,GAAG;QAErD,OAAOC,WAAW,MAAM,CAAC;YACrB,MAAM;YACN,SAASC,gBAAgB,MAAM,CAAC;gBAC5B,UAAUF,WAAW,OAAO,CAAC,WAAW;gBACxC,gBAAgBD,MAAM,cAAc;gBACpC,iBAAiB;YACrB;QACJ;IACJ;AACJ"}
+{"version":3,"file":"features/assetDelivery/privateFiles/RedirectToPrivateUrlOutputStrategy.js","sources":["../../../../src/features/assetDelivery/privateFiles/RedirectToPrivateUrlOutputStrategy.ts"],"sourcesContent":["import type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport { AssetReply } from \"~/delivery/AssetDelivery/abstractions/AssetReply.js\";\nimport { ResponseHeaders } from \"@webiny/handler\";\nimport type { IAssetOutputStrategy } from \"../abstractions.js\";\n\nexport class RedirectToPrivateUrlOutputStrategy implements IAssetOutputStrategy {\n    private assetRequest: AssetRequest;\n\n    constructor(assetRequest: AssetRequest) {\n        this.assetRequest = assetRequest;\n    }\n\n    async output(asset: Asset): Promise<AssetReply> {\n        const requestUrl = this.assetRequest.getContext().url;\n\n        return new AssetReply({\n            code: 301,\n            headers: ResponseHeaders.create({\n                location: requestUrl.replace(\"/files/\", \"/private/\"),\n                \"content-type\": asset.getContentType(),\n                \"cache-control\": `public, max-age=${86400 * 30}`\n            })\n        });\n    }\n}\n"],"names":["RedirectToPrivateUrlOutputStrategy","assetRequest","asset","requestUrl","AssetReply","ResponseHeaders"],"mappings":";;AAMO,MAAMA;IAGT,YAAYC,YAA0B,CAAE;QACpC,IAAI,CAAC,YAAY,GAAGA;IACxB;IAEA,MAAM,OAAOC,KAAY,EAAuB;QAC5C,MAAMC,aAAa,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,GAAG;QAErD,OAAO,IAAIC,WAAW;YAClB,MAAM;YACN,SAASC,gBAAgB,MAAM,CAAC;gBAC5B,UAAUF,WAAW,OAAO,CAAC,WAAW;gBACxC,gBAAgBD,MAAM,cAAc;gBACpC,iBAAiB;YACrB;QACJ;IACJ;AACJ"}

package/features/assetDelivery/privateFiles/RedirectToPublicUrlOutputStrategy.d.ts

@@ -1,10 +1,9 @@
 import type { Asset } from "../../../delivery/AssetDelivery/Asset.js";
 import type { AssetRequest } from "../../../delivery/AssetDelivery/AssetRequest.js";
 import { AssetReply } from "../../../delivery/AssetDelivery/abstractions/AssetReply.js";
-import { AssetOutputStrategy } from "../abstractions/AssetOutputStrategy.js";
-export declare class RedirectToPublicUrlOutputStrategy implements AssetOutputStrategy.Interface {
-    private readonly assetRequest;
-    static create(assetRequest: AssetRequest): RedirectToPublicUrlOutputStrategy;
-    private constructor();
+import type { IAssetOutputStrategy } from "../abstractions.js";
+export declare class RedirectToPublicUrlOutputStrategy implements IAssetOutputStrategy {
+    private assetRequest;
+    constructor(assetRequest: AssetRequest);
     output(asset: Asset): Promise<AssetReply>;
 }

package/features/assetDelivery/privateFiles/RedirectToPublicUrlOutputStrategy.js

@@ -1,15 +1,12 @@
 import { AssetReply } from "../../../delivery/AssetDelivery/abstractions/AssetReply.js";
 import { ResponseHeaders } from "@webiny/handler";
 class RedirectToPublicUrlOutputStrategy {
-    static create(assetRequest) {
-        return new RedirectToPublicUrlOutputStrategy(assetRequest);
-    }
     constructor(assetRequest){
         this.assetRequest = assetRequest;
     }
     async output(asset) {
         const requestUrl = this.assetRequest.getContext().url;
-        return AssetReply.create({
+        return new AssetReply({
             code: 301,
             headers: ResponseHeaders.create({
                 location: requestUrl.replace("/private/", "/files/"),

package/features/assetDelivery/privateFiles/RedirectToPublicUrlOutputStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/privateFiles/RedirectToPublicUrlOutputStrategy.js","sources":["../../../../src/features/assetDelivery/privateFiles/RedirectToPublicUrlOutputStrategy.ts"],"sourcesContent":["import type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport { AssetReply } from \"~/delivery/AssetDelivery/abstractions/AssetReply.js\";\nimport { ResponseHeaders } from \"@webiny/handler\";\nimport { AssetOutputStrategy } from \"../abstractions/AssetOutputStrategy.js\";\n\nexport class RedirectToPublicUrlOutputStrategy implements AssetOutputStrategy.Interface {\n    private readonly assetRequest: AssetRequest;\n\n    public static create(assetRequest: AssetRequest) {\n        return new RedirectToPublicUrlOutputStrategy(assetRequest);\n    }\n\n    private constructor(assetRequest: AssetRequest) {\n        this.assetRequest = assetRequest;\n    }\n\n    public async output(asset: Asset): Promise<AssetReply> {\n        const requestUrl = this.assetRequest.getContext().url;\n\n        return AssetReply.create({\n            code: 301,\n            headers: ResponseHeaders.create({\n                location: requestUrl.replace(\"/private/\", \"/files/\"),\n                \"content-type\": asset.getContentType(),\n                \"cache-control\": `public, max-age=${86400 * 30}`\n            })\n        });\n    }\n}\n"],"names":["RedirectToPublicUrlOutputStrategy","assetRequest","asset","requestUrl","AssetReply","ResponseHeaders"],"mappings":";;AAMO,MAAMA;IAGT,OAAc,OAAOC,YAA0B,EAAE;QAC7C,OAAO,IAAID,kCAAkCC;IACjD;IAEA,YAAoBA,YAA0B,CAAE;QAC5C,IAAI,CAAC,YAAY,GAAGA;IACxB;IAEA,MAAa,OAAOC,KAAY,EAAuB;QACnD,MAAMC,aAAa,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,GAAG;QAErD,OAAOC,WAAW,MAAM,CAAC;YACrB,MAAM;YACN,SAASC,gBAAgB,MAAM,CAAC;gBAC5B,UAAUF,WAAW,OAAO,CAAC,aAAa;gBAC1C,gBAAgBD,MAAM,cAAc;gBACpC,iBAAiB;YACrB;QACJ;IACJ;AACJ"}
+{"version":3,"file":"features/assetDelivery/privateFiles/RedirectToPublicUrlOutputStrategy.js","sources":["../../../../src/features/assetDelivery/privateFiles/RedirectToPublicUrlOutputStrategy.ts"],"sourcesContent":["import type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport { AssetReply } from \"~/delivery/AssetDelivery/abstractions/AssetReply.js\";\nimport { ResponseHeaders } from \"@webiny/handler\";\nimport type { IAssetOutputStrategy } from \"../abstractions.js\";\n\nexport class RedirectToPublicUrlOutputStrategy implements IAssetOutputStrategy {\n    private assetRequest: AssetRequest;\n\n    constructor(assetRequest: AssetRequest) {\n        this.assetRequest = assetRequest;\n    }\n\n    async output(asset: Asset): Promise<AssetReply> {\n        const requestUrl = this.assetRequest.getContext().url;\n\n        return new AssetReply({\n            code: 301,\n            headers: ResponseHeaders.create({\n                location: requestUrl.replace(\"/private/\", \"/files/\"),\n                \"content-type\": asset.getContentType(),\n                \"cache-control\": `public, max-age=${86400 * 30}`\n            })\n        });\n    }\n}\n"],"names":["RedirectToPublicUrlOutputStrategy","assetRequest","asset","requestUrl","AssetReply","ResponseHeaders"],"mappings":";;AAMO,MAAMA;IAGT,YAAYC,YAA0B,CAAE;QACpC,IAAI,CAAC,YAAY,GAAGA;IACxB;IAEA,MAAM,OAAOC,KAAY,EAAuB;QAC5C,MAAMC,aAAa,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,GAAG;QAErD,OAAO,IAAIC,WAAW;YAClB,MAAM;YACN,SAASC,gBAAgB,MAAM,CAAC;gBAC5B,UAAUF,WAAW,OAAO,CAAC,aAAa;gBAC1C,gBAAgBD,MAAM,cAAc;gBACpC,iBAAiB;YACrB;QACJ;IACJ;AACJ"}

package/features/assetDelivery/transformation/CallableContentsReader.d.ts

@@ -1,4 +1,4 @@
-import { AssetContentsReader } from "../../../features/assetDelivery/abstractions/AssetContentsReader.js";
+import { AssetContentsReader } from "../../../features/assetDelivery/abstractions.js";
 interface ContentsCallable {
     (): Promise<Buffer> | Buffer;
 }

package/features/assetDelivery/transformation/CallableContentsReader.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/transformation/CallableContentsReader.js","sources":["../../../../src/features/assetDelivery/transformation/CallableContentsReader.ts"],"sourcesContent":["import { AssetContentsReader } from \"~/features/assetDelivery/abstractions/AssetContentsReader.js\";\n\ninterface ContentsCallable {\n    (): Promise<Buffer> | Buffer;\n}\n\nexport class CallableContentsReader implements AssetContentsReader.Interface {\n    private readonly callable: ContentsCallable;\n\n    public static create(callable: ContentsCallable) {\n        return new CallableContentsReader(callable);\n    }\n\n    private constructor(callable: ContentsCallable) {\n        this.callable = callable;\n    }\n\n    public async read(): Promise<Buffer> {\n        return this.callable();\n    }\n}\n"],"names":["CallableContentsReader","callable"],"mappings":"AAMO,MAAMA;IAGT,OAAc,OAAOC,QAA0B,EAAE;QAC7C,OAAO,IAAID,uBAAuBC;IACtC;IAEA,YAAoBA,QAA0B,CAAE;QAC5C,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAa,OAAwB;QACjC,OAAO,IAAI,CAAC,QAAQ;IACxB;AACJ"}
+{"version":3,"file":"features/assetDelivery/transformation/CallableContentsReader.js","sources":["../../../../src/features/assetDelivery/transformation/CallableContentsReader.ts"],"sourcesContent":["import { AssetContentsReader } from \"~/features/assetDelivery/abstractions.js\";\n\ninterface ContentsCallable {\n    (): Promise<Buffer> | Buffer;\n}\n\nexport class CallableContentsReader implements AssetContentsReader.Interface {\n    private readonly callable: ContentsCallable;\n\n    public static create(callable: ContentsCallable) {\n        return new CallableContentsReader(callable);\n    }\n\n    private constructor(callable: ContentsCallable) {\n        this.callable = callable;\n    }\n\n    public async read(): Promise<Buffer> {\n        return this.callable();\n    }\n}\n"],"names":["CallableContentsReader","callable"],"mappings":"AAMO,MAAMA;IAGT,OAAc,OAAOC,QAA0B,EAAE;QAC7C,OAAO,IAAID,uBAAuBC;IACtC;IAEA,YAAoBA,QAA0B,CAAE;QAC5C,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAa,OAAwB;QACjC,OAAO,IAAI,CAAC,QAAQ;IACxB;AACJ"}

package/features/assetDelivery/transformation/TransformationAssetProcessor.d.ts

@@ -1,7 +1,9 @@
 import type { Container } from "@webiny/di";
-import { AssetProcessor } from "../abstractions/AssetProcessor.js";
-export declare class TransformationAssetProcessor implements AssetProcessor.Interface {
+import type { Asset } from "../../../delivery/AssetDelivery/Asset.js";
+import type { AssetRequest } from "../../../delivery/AssetDelivery/AssetRequest.js";
+import type { IAssetProcessor } from "../abstractions.js";
+export declare class TransformationAssetProcessor implements IAssetProcessor {
     private readonly container;
     constructor(container: Container);
-    process(assetRequest: AssetProcessor.AssetRequest, asset: AssetProcessor.Asset): Promise<AssetProcessor.Asset>;
+    process(assetRequest: AssetRequest, asset: Asset): Promise<Asset>;
 }

package/features/assetDelivery/transformation/TransformationAssetProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/transformation/TransformationAssetProcessor.js","sources":["../../../../src/features/assetDelivery/transformation/TransformationAssetProcessor.ts"],"sourcesContent":["import type { Container } from \"@webiny/di\";\nimport { AssetProcessor } from \"../abstractions/AssetProcessor.js\";\nimport { AssetType } from \"../abstractions/AssetType.js\";\n\nexport class TransformationAssetProcessor implements AssetProcessor.Interface {\n    constructor(private readonly container: Container) {}\n\n    async process(\n        assetRequest: AssetProcessor.AssetRequest,\n        asset: AssetProcessor.Asset\n    ): Promise<AssetProcessor.Asset> {\n        const { original } = assetRequest.getOptions();\n\n        if (original) {\n            console.log(\"Skip transformations; original asset was requested.\");\n            return asset;\n        }\n\n        const assetTypes = this.container.resolveAll(AssetType);\n        const match = assetTypes.find(assetType => assetType.canHandle(asset));\n\n        if (!match) {\n            return asset;\n        }\n\n        try {\n            const handler = this.container.resolve(match.getHandlerAbstraction());\n            return handler.handle(assetRequest, asset);\n        } catch {\n            return asset;\n        }\n    }\n}\n"],"names":["TransformationAssetProcessor","container","assetRequest","asset","original","console","assetTypes","AssetType","match","assetType","handler"],"mappings":";AAIO,MAAMA;IACT,YAA6BC,SAAoB,CAAE;aAAtBA,SAAS,GAATA;IAAuB;IAEpD,MAAM,QACFC,YAAyC,EACzCC,KAA2B,EACE;QAC7B,MAAM,EAAEC,QAAQ,EAAE,GAAGF,aAAa,UAAU;QAE5C,IAAIE,UAAU;YACVC,QAAQ,GAAG,CAAC;YACZ,OAAOF;QACX;QAEA,MAAMG,aAAa,IAAI,CAAC,SAAS,CAAC,UAAU,CAACC;QAC7C,MAAMC,QAAQF,WAAW,IAAI,CAACG,CAAAA,YAAaA,UAAU,SAAS,CAACN;QAE/D,IAAI,CAACK,OACD,OAAOL;QAGX,IAAI;YACA,MAAMO,UAAU,IAAI,CAAC,SAAS,CAAC,OAAO,CAACF,MAAM,qBAAqB;YAClE,OAAOE,QAAQ,MAAM,CAACR,cAAcC;QACxC,EAAE,OAAM;YACJ,OAAOA;QACX;IACJ;AACJ"}
+{"version":3,"file":"features/assetDelivery/transformation/TransformationAssetProcessor.js","sources":["../../../../src/features/assetDelivery/transformation/TransformationAssetProcessor.ts"],"sourcesContent":["import type { Container } from \"@webiny/di\";\nimport type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport type { IAssetProcessor } from \"../abstractions.js\";\nimport { AssetType } from \"../abstractions/AssetType.js\";\n\nexport class TransformationAssetProcessor implements IAssetProcessor {\n    constructor(private readonly container: Container) {}\n\n    async process(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        const { original } = assetRequest.getOptions();\n\n        if (original) {\n            console.log(\"Skip transformations; original asset was requested.\");\n            return asset;\n        }\n\n        const assetTypes = this.container.resolveAll(AssetType);\n        const match = assetTypes.find(assetType => assetType.canHandle(asset));\n\n        if (!match) {\n            return asset;\n        }\n\n        try {\n            const handler = this.container.resolve(match.getHandlerAbstraction());\n            return handler.handle(assetRequest, asset);\n        } catch {\n            return asset;\n        }\n    }\n}\n"],"names":["TransformationAssetProcessor","container","assetRequest","asset","original","console","assetTypes","AssetType","match","assetType","handler"],"mappings":";AAMO,MAAMA;IACT,YAA6BC,SAAoB,CAAE;aAAtBA,SAAS,GAATA;IAAuB;IAEpD,MAAM,QAAQC,YAA0B,EAAEC,KAAY,EAAkB;QACpE,MAAM,EAAEC,QAAQ,EAAE,GAAGF,aAAa,UAAU;QAE5C,IAAIE,UAAU;YACVC,QAAQ,GAAG,CAAC;YACZ,OAAOF;QACX;QAEA,MAAMG,aAAa,IAAI,CAAC,SAAS,CAAC,UAAU,CAACC;QAC7C,MAAMC,QAAQF,WAAW,IAAI,CAACG,CAAAA,YAAaA,UAAU,SAAS,CAACN;QAE/D,IAAI,CAACK,OACD,OAAOL;QAGX,IAAI;YACA,MAAMO,UAAU,IAAI,CAAC,SAAS,CAAC,OAAO,CAACF,MAAM,qBAAqB;YAClE,OAAOE,QAAQ,MAAM,CAACR,cAAcC;QACxC,EAAE,OAAM;YACJ,OAAOA;QACX;IACJ;AACJ"}

package/features/file/CreateFile/CreateFileRepository.d.ts

@@ -1,12 +1,12 @@
 import { Result } from "@webiny/feature/api";
 import { CreateFileRepository as RepositoryAbstraction } from "./abstractions.js";
 import { CreateEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/CreateEntry";
-import { FileModel } from "../../../domain/file/abstractions.js";
+import { FileModelProvider } from "../../../domain/file/abstractions.js";
 import type { File, FileInput } from "../../../domain/file/types.js";
 declare class CreateFileRepositoryImpl implements RepositoryAbstraction.Interface {
     private createEntry;
-    private fileModel;
-    constructor(createEntry: CreateEntryUseCase.Interface, fileModel: FileModel.Interface);
+    private fileModelProvider;
+    constructor(createEntry: CreateEntryUseCase.Interface, fileModelProvider: FileModelProvider.Interface);
     execute(data: FileInput): Promise<Result<File, RepositoryAbstraction.Error>>;
 }
 export declare const CreateFileRepository: typeof CreateFileRepositoryImpl & {

package/features/file/CreateFile/CreateFileRepository.js

@@ -1,17 +1,18 @@
 import { Result } from "@webiny/feature/api";
 import { CreateFileRepository } from "./abstractions.js";
 import { CreateEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/CreateEntry";
-import { FileModel } from "../../../domain/file/abstractions.js";
+import { FileModelProvider } from "../../../domain/file/abstractions.js";
 import { EntryToFileMapper } from "../shared/EntryToFileMapper.js";
 import { FileNotAuthorizedError, FilePersistenceError } from "../../../domain/file/errors.js";
 import { FileInputToEntryInputMapper } from "../shared/FileInputToEntryInputMapper.js";
 class CreateFileRepositoryImpl {
-    constructor(createEntry, fileModel){
+    constructor(createEntry, fileModelProvider){
         this.createEntry = createEntry;
-        this.fileModel = fileModel;
+        this.fileModelProvider = fileModelProvider;
     }
     async execute(data) {
-        const result = await this.createEntry.execute(this.fileModel, FileInputToEntryInputMapper.toEntry(data));
+        const fileModel = await this.fileModelProvider.get();
+        const result = await this.createEntry.execute(fileModel, FileInputToEntryInputMapper.toEntry(data));
         if (result.isFail()) {
             if ("Cms/Entry/NotAuthorized" === result.error.code) return Result.fail(new FileNotAuthorizedError());
             return Result.fail(new FilePersistenceError(result.error));
@@ -24,7 +25,7 @@ const CreateFileRepository_CreateFileRepository = CreateFileRepository.createImp
     implementation: CreateFileRepositoryImpl,
     dependencies: [
         CreateEntryUseCase,
-        FileModel
+        FileModelProvider
     ]
 });
 export { CreateFileRepository_CreateFileRepository as CreateFileRepository };

package/features/file/CreateFile/CreateFileRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/file/CreateFile/CreateFileRepository.js","sources":["../../../../src/features/file/CreateFile/CreateFileRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { CreateFileRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { CreateEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/CreateEntry\";\nimport { FileModel } from \"~/domain/file/abstractions.js\";\nimport type { File, FileInput } from \"~/domain/file/types.js\";\nimport { EntryToFileMapper } from \"../shared/EntryToFileMapper.js\";\nimport { FileNotAuthorizedError, FilePersistenceError } from \"~/domain/file/errors.js\";\nimport { FileInputToEntryInputMapper } from \"~/features/file/shared/FileInputToEntryInputMapper.js\";\n\nclass CreateFileRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private createEntry: CreateEntryUseCase.Interface,\n        private fileModel: FileModel.Interface\n    ) {}\n\n    async execute(data: FileInput): Promise<Result<File, RepositoryAbstraction.Error>> {\n        const result = await this.createEntry.execute(\n            this.fileModel,\n            FileInputToEntryInputMapper.toEntry(data)\n        );\n\n        if (result.isFail()) {\n            if (result.error.code === \"Cms/Entry/NotAuthorized\") {\n                return Result.fail(new FileNotAuthorizedError());\n            }\n\n            return Result.fail(new FilePersistenceError(result.error));\n        }\n\n        const file = EntryToFileMapper.toFile(result.value);\n        return Result.ok(file);\n    }\n}\n\nexport const CreateFileRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateFileRepositoryImpl,\n    dependencies: [CreateEntryUseCase, FileModel]\n});\n"],"names":["CreateFileRepositoryImpl","createEntry","fileModel","data","result","FileInputToEntryInputMapper","Result","FileNotAuthorizedError","FilePersistenceError","file","EntryToFileMapper","CreateFileRepository","RepositoryAbstraction","CreateEntryUseCase","FileModel"],"mappings":";;;;;;;AASA,MAAMA;IACF,YACYC,WAAyC,EACzCC,SAA8B,CACxC;aAFUD,WAAW,GAAXA;aACAC,SAAS,GAATA;IACT;IAEH,MAAM,QAAQC,IAAe,EAAsD;QAC/E,MAAMC,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CACzC,IAAI,CAAC,SAAS,EACdC,4BAA4B,OAAO,CAACF;QAGxC,IAAIC,OAAO,MAAM,IAAI;YACjB,IAAIA,AAAsB,8BAAtBA,OAAO,KAAK,CAAC,IAAI,EACjB,OAAOE,OAAO,IAAI,CAAC,IAAIC;YAG3B,OAAOD,OAAO,IAAI,CAAC,IAAIE,qBAAqBJ,OAAO,KAAK;QAC5D;QAEA,MAAMK,OAAOC,kBAAkB,MAAM,CAACN,OAAO,KAAK;QAClD,OAAOE,OAAO,EAAE,CAACG;IACrB;AACJ;AAEO,MAAME,4CAAuBC,qBAAAA,oBAA0C,CAAC;IAC3E,gBAAgBZ;IAChB,cAAc;QAACa;QAAoBC;KAAU;AACjD"}
+{"version":3,"file":"features/file/CreateFile/CreateFileRepository.js","sources":["../../../../src/features/file/CreateFile/CreateFileRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { CreateFileRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { CreateEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/CreateEntry\";\nimport { FileModelProvider } from \"~/domain/file/abstractions.js\";\nimport type { File, FileInput } from \"~/domain/file/types.js\";\nimport { EntryToFileMapper } from \"../shared/EntryToFileMapper.js\";\nimport { FileNotAuthorizedError, FilePersistenceError } from \"~/domain/file/errors.js\";\nimport { FileInputToEntryInputMapper } from \"~/features/file/shared/FileInputToEntryInputMapper.js\";\n\nclass CreateFileRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private createEntry: CreateEntryUseCase.Interface,\n        private fileModelProvider: FileModelProvider.Interface\n    ) {}\n\n    async execute(data: FileInput): Promise<Result<File, RepositoryAbstraction.Error>> {\n        const fileModel = await this.fileModelProvider.get();\n        const result = await this.createEntry.execute(\n            fileModel,\n            FileInputToEntryInputMapper.toEntry(data)\n        );\n\n        if (result.isFail()) {\n            if (result.error.code === \"Cms/Entry/NotAuthorized\") {\n                return Result.fail(new FileNotAuthorizedError());\n            }\n\n            return Result.fail(new FilePersistenceError(result.error));\n        }\n\n        const file = EntryToFileMapper.toFile(result.value);\n        return Result.ok(file);\n    }\n}\n\nexport const CreateFileRepository = RepositoryAbstraction.createImplementation({\n    implementation: CreateFileRepositoryImpl,\n    dependencies: [CreateEntryUseCase, FileModelProvider]\n});\n"],"names":["CreateFileRepositoryImpl","createEntry","fileModelProvider","data","fileModel","result","FileInputToEntryInputMapper","Result","FileNotAuthorizedError","FilePersistenceError","file","EntryToFileMapper","CreateFileRepository","RepositoryAbstraction","CreateEntryUseCase","FileModelProvider"],"mappings":";;;;;;;AASA,MAAMA;IACF,YACYC,WAAyC,EACzCC,iBAA8C,CACxD;aAFUD,WAAW,GAAXA;aACAC,iBAAiB,GAAjBA;IACT;IAEH,MAAM,QAAQC,IAAe,EAAsD;QAC/E,MAAMC,YAAY,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG;QAClD,MAAMC,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CACzCD,WACAE,4BAA4B,OAAO,CAACH;QAGxC,IAAIE,OAAO,MAAM,IAAI;YACjB,IAAIA,AAAsB,8BAAtBA,OAAO,KAAK,CAAC,IAAI,EACjB,OAAOE,OAAO,IAAI,CAAC,IAAIC;YAG3B,OAAOD,OAAO,IAAI,CAAC,IAAIE,qBAAqBJ,OAAO,KAAK;QAC5D;QAEA,MAAMK,OAAOC,kBAAkB,MAAM,CAACN,OAAO,KAAK;QAClD,OAAOE,OAAO,EAAE,CAACG;IACrB;AACJ;AAEO,MAAME,4CAAuBC,qBAAAA,oBAA0C,CAAC;IAC3E,gBAAgBb;IAChB,cAAc;QAACc;QAAoBC;KAAkB;AACzD"}

package/features/file/DeleteFile/DeleteFileRepository.d.ts

@@ -1,12 +1,12 @@
 import { Result } from "@webiny/feature/api";
 import { DeleteEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry";
 import { DeleteFileRepository as RepositoryAbstraction } from "./abstractions.js";
-import { FileModel } from "../../../domain/file/abstractions.js";
+import { FileModelProvider } from "../../../domain/file/abstractions.js";
 import { File } from "../../../domain/file/types.js";
 declare class DeleteFileRepositoryImpl implements RepositoryAbstraction.Interface {
     private deleteEntry;
-    private fileModel;
-    constructor(deleteEntry: DeleteEntryUseCase.Interface, fileModel: FileModel.Interface);
+    private fileModelProvider;
+    constructor(deleteEntry: DeleteEntryUseCase.Interface, fileModelProvider: FileModelProvider.Interface);
     delete(file: File): Promise<Result<void, RepositoryAbstraction.Error>>;
 }
 export declare const DeleteFileRepository: typeof DeleteFileRepositoryImpl & {

package/features/file/DeleteFile/DeleteFileRepository.js

@@ -1,16 +1,17 @@
 import { Result } from "@webiny/feature/api";
 import { DeleteEntryUseCase } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry";
 import { DeleteFileRepository } from "./abstractions.js";
-import { FileModel } from "../../../domain/file/abstractions.js";
+import { FileModelProvider } from "../../../domain/file/abstractions.js";
 import { FileNotFoundError, FilePersistenceError } from "../../../domain/file/errors.js";
 class DeleteFileRepositoryImpl {
-    constructor(deleteEntry, fileModel){
+    constructor(deleteEntry, fileModelProvider){
         this.deleteEntry = deleteEntry;
-        this.fileModel = fileModel;
+        this.fileModelProvider = fileModelProvider;
     }
     async delete(file) {
         const entryId = `${file.id}#0001`;
-        const result = await this.deleteEntry.execute(this.fileModel, entryId);
+        const fileModel = await this.fileModelProvider.get();
+        const result = await this.deleteEntry.execute(fileModel, entryId);
         if (result.isFail()) {
             const error = result.error;
             if ("Cms/Entry/NotFound" === error.code) return Result.fail(new FileNotFoundError(file.id));
@@ -23,7 +24,7 @@ const DeleteFileRepository_DeleteFileRepository = DeleteFileRepository.createImp
     implementation: DeleteFileRepositoryImpl,
     dependencies: [
         DeleteEntryUseCase,
-        FileModel
+        FileModelProvider
     ]
 });
 export { DeleteFileRepository_DeleteFileRepository as DeleteFileRepository };

package/features/file/DeleteFile/DeleteFileRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/file/DeleteFile/DeleteFileRepository.js","sources":["../../../../src/features/file/DeleteFile/DeleteFileRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { DeleteEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry\";\nimport { DeleteFileRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { FileModel } from \"~/domain/file/abstractions.js\";\nimport { FileNotFoundError, FilePersistenceError } from \"~/domain/file/errors.js\";\nimport { File } from \"~/domain/file/types.js\";\n\nclass DeleteFileRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private deleteEntry: DeleteEntryUseCase.Interface,\n        private fileModel: FileModel.Interface\n    ) {}\n\n    async delete(file: File): Promise<Result<void, RepositoryAbstraction.Error>> {\n        // Files are not versioned, so we're always deleting the same revision\n        const entryId = `${file.id}#0001`;\n\n        const result = await this.deleteEntry.execute(this.fileModel, entryId);\n\n        if (result.isFail()) {\n            const error = result.error;\n            if (error.code === \"Cms/Entry/NotFound\") {\n                return Result.fail(new FileNotFoundError(file.id));\n            }\n            return Result.fail(new FilePersistenceError(result.error));\n        }\n\n        return Result.ok();\n    }\n}\n\nexport const DeleteFileRepository = RepositoryAbstraction.createImplementation({\n    implementation: DeleteFileRepositoryImpl,\n    dependencies: [DeleteEntryUseCase, FileModel]\n});\n"],"names":["DeleteFileRepositoryImpl","deleteEntry","fileModel","file","entryId","result","error","Result","FileNotFoundError","FilePersistenceError","DeleteFileRepository","RepositoryAbstraction","DeleteEntryUseCase","FileModel"],"mappings":";;;;;AAOA,MAAMA;IACF,YACYC,WAAyC,EACzCC,SAA8B,CACxC;aAFUD,WAAW,GAAXA;aACAC,SAAS,GAATA;IACT;IAEH,MAAM,OAAOC,IAAU,EAAsD;QAEzE,MAAMC,UAAU,GAAGD,KAAK,EAAE,CAAC,KAAK,CAAC;QAEjC,MAAME,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAED;QAE9D,IAAIC,OAAO,MAAM,IAAI;YACjB,MAAMC,QAAQD,OAAO,KAAK;YAC1B,IAAIC,AAAe,yBAAfA,MAAM,IAAI,EACV,OAAOC,OAAO,IAAI,CAAC,IAAIC,kBAAkBL,KAAK,EAAE;YAEpD,OAAOI,OAAO,IAAI,CAAC,IAAIE,qBAAqBJ,OAAO,KAAK;QAC5D;QAEA,OAAOE,OAAO,EAAE;IACpB;AACJ;AAEO,MAAMG,4CAAuBC,qBAAAA,oBAA0C,CAAC;IAC3E,gBAAgBX;IAChB,cAAc;QAACY;QAAoBC;KAAU;AACjD"}
+{"version":3,"file":"features/file/DeleteFile/DeleteFileRepository.js","sources":["../../../../src/features/file/DeleteFile/DeleteFileRepository.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { DeleteEntryUseCase } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry\";\nimport { DeleteFileRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { FileModelProvider } from \"~/domain/file/abstractions.js\";\nimport { FileNotFoundError, FilePersistenceError } from \"~/domain/file/errors.js\";\nimport { File } from \"~/domain/file/types.js\";\n\nclass DeleteFileRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private deleteEntry: DeleteEntryUseCase.Interface,\n        private fileModelProvider: FileModelProvider.Interface\n    ) {}\n\n    async delete(file: File): Promise<Result<void, RepositoryAbstraction.Error>> {\n        // Files are not versioned, so we're always deleting the same revision\n        const entryId = `${file.id}#0001`;\n\n        const fileModel = await this.fileModelProvider.get();\n        const result = await this.deleteEntry.execute(fileModel, entryId);\n\n        if (result.isFail()) {\n            const error = result.error;\n            if (error.code === \"Cms/Entry/NotFound\") {\n                return Result.fail(new FileNotFoundError(file.id));\n            }\n            return Result.fail(new FilePersistenceError(result.error));\n        }\n\n        return Result.ok();\n    }\n}\n\nexport const DeleteFileRepository = RepositoryAbstraction.createImplementation({\n    implementation: DeleteFileRepositoryImpl,\n    dependencies: [DeleteEntryUseCase, FileModelProvider]\n});\n"],"names":["DeleteFileRepositoryImpl","deleteEntry","fileModelProvider","file","entryId","fileModel","result","error","Result","FileNotFoundError","FilePersistenceError","DeleteFileRepository","RepositoryAbstraction","DeleteEntryUseCase","FileModelProvider"],"mappings":";;;;;AAOA,MAAMA;IACF,YACYC,WAAyC,EACzCC,iBAA8C,CACxD;aAFUD,WAAW,GAAXA;aACAC,iBAAiB,GAAjBA;IACT;IAEH,MAAM,OAAOC,IAAU,EAAsD;QAEzE,MAAMC,UAAU,GAAGD,KAAK,EAAE,CAAC,KAAK,CAAC;QAEjC,MAAME,YAAY,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG;QAClD,MAAMC,SAAS,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAACD,WAAWD;QAEzD,IAAIE,OAAO,MAAM,IAAI;YACjB,MAAMC,QAAQD,OAAO,KAAK;YAC1B,IAAIC,AAAe,yBAAfA,MAAM,IAAI,EACV,OAAOC,OAAO,IAAI,CAAC,IAAIC,kBAAkBN,KAAK,EAAE;YAEpD,OAAOK,OAAO,IAAI,CAAC,IAAIE,qBAAqBJ,OAAO,KAAK;QAC5D;QAEA,OAAOE,OAAO,EAAE;IACpB;AACJ;AAEO,MAAMG,4CAAuBC,qBAAAA,oBAA0C,CAAC;IAC3E,gBAAgBZ;IAChB,cAAc;QAACa;QAAoBC;KAAkB;AACzD"}