@webiny/api-aco 0.0.0-unstable.a4f3e4ea8b → 0.0.0-unstable.a85ef555b2

package/features/flp/CreateFlpOnFolderCreated/CreateFlpOnFolderCreatedHandler.js

@@ -1,35 +1,42 @@
-import { CreateFlpUseCase } from "../CreateFlp/abstractions.js";
 import { FolderAfterCreateEventHandler } from "../../folder/CreateFolder/abstractions.js";
 import { CREATE_FLP_TASK_ID } from "../../../flp/tasks/index.js";
 import { TaskService } from "@webiny/api-core/features/task/TaskService/index.js";
+import { Logger } from "@webiny/api-core/features/logger/index.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/abstractions.js";
 class CreateFlpOnFolderCreatedHandlerImpl {
-    constructor(createFlpUseCase, tasks){
-        this.createFlpUseCase = createFlpUseCase;
+    constructor(identityContext, tasks, logger){
+        this.identityContext = identityContext;
         this.tasks = tasks;
+        this.logger = logger;
     }
     async handle(event) {
         const { folder } = event.payload;
         try {
-            if (this.tasks) await this.tasks.trigger({
+            const result = await this.tasks.trigger({
                 definition: CREATE_FLP_TASK_ID,
                 input: {
-                    folder
+                    folder,
+                    notifyIdentityId: this.identityContext.getIdentity()?.id
                 }
             });
-            else await this.createFlpUseCase.execute(folder);
-        } catch  {}
+            if (result.isFail()) this.logFailure(folder.id, result.error);
+        } catch (error) {
+            this.logFailure(folder.id, error);
+        }
+    }
+    logFailure(folderId, error) {
+        this.logger.error({
+            error,
+            folderId
+        }, "Could not trigger the task that creates the folder's FLP record.");
     }
 }
 const CreateFlpOnFolderCreatedHandler = FolderAfterCreateEventHandler.createImplementation({
     implementation: CreateFlpOnFolderCreatedHandlerImpl,
     dependencies: [
-        CreateFlpUseCase,
-        [
-            TaskService,
-            {
-                optional: true
-            }
-        ]
+        IdentityContext,
+        TaskService,
+        Logger
     ]
 });
 export { CreateFlpOnFolderCreatedHandler };

package/features/flp/CreateFlpOnFolderCreated/CreateFlpOnFolderCreatedHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/flp/CreateFlpOnFolderCreated/CreateFlpOnFolderCreatedHandler.js","sources":["../../../../src/features/flp/CreateFlpOnFolderCreated/CreateFlpOnFolderCreatedHandler.ts"],"sourcesContent":["import { CreateFlpUseCase } from \"../CreateFlp/abstractions.js\";\nimport { FolderAfterCreateEventHandler } from \"~/features/folder/CreateFolder/abstractions.js\";\nimport type { FolderAfterCreateEvent } from \"~/features/folder/CreateFolder/events.js\";\nimport type { ICreateFlpTaskInput } from \"~/types.js\";\nimport { CREATE_FLP_TASK_ID } from \"~/flp/tasks/index.js\";\nimport { TaskService } from \"@webiny/api-core/features/task/TaskService/index.js\";\n\nclass CreateFlpOnFolderCreatedHandlerImpl implements FolderAfterCreateEventHandler.Interface {\n    constructor(\n        private createFlpUseCase: CreateFlpUseCase.Interface,\n        private tasks?: TaskService.Interface\n    ) {}\n\n    async handle(event: FolderAfterCreateEvent): Promise<void> {\n        const { folder } = event.payload;\n\n        try {\n            if (this.tasks) {\n                await this.tasks.trigger<ICreateFlpTaskInput>({\n                    definition: CREATE_FLP_TASK_ID,\n                    input: { folder }\n                });\n            } else {\n                await this.createFlpUseCase.execute(folder);\n            }\n        } catch {\n            // Ignore errors\n        }\n    }\n}\n\nexport const CreateFlpOnFolderCreatedHandler = FolderAfterCreateEventHandler.createImplementation({\n    implementation: CreateFlpOnFolderCreatedHandlerImpl,\n    dependencies: [CreateFlpUseCase, [TaskService, { optional: true }]]\n});\n"],"names":["CreateFlpOnFolderCreatedHandlerImpl","createFlpUseCase","tasks","event","folder","CREATE_FLP_TASK_ID","CreateFlpOnFolderCreatedHandler","FolderAfterCreateEventHandler","CreateFlpUseCase","TaskService"],"mappings":";;;;AAOA,MAAMA;IACF,YACYC,gBAA4C,EAC5CC,KAA6B,CACvC;aAFUD,gBAAgB,GAAhBA;aACAC,KAAK,GAALA;IACT;IAEH,MAAM,OAAOC,KAA6B,EAAiB;QACvD,MAAM,EAAEC,MAAM,EAAE,GAAGD,MAAM,OAAO;QAEhC,IAAI;YACA,IAAI,IAAI,CAAC,KAAK,EACV,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAsB;gBAC1C,YAAYE;gBACZ,OAAO;oBAAED;gBAAO;YACpB;iBAEA,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAACA;QAE5C,EAAE,OAAM,CAER;IACJ;AACJ;AAEO,MAAME,kCAAkCC,8BAA8B,oBAAoB,CAAC;IAC9F,gBAAgBP;IAChB,cAAc;QAACQ;QAAkB;YAACC;YAAa;gBAAE,UAAU;YAAK;SAAE;KAAC;AACvE"}
+{"version":3,"file":"features/flp/CreateFlpOnFolderCreated/CreateFlpOnFolderCreatedHandler.js","sources":["../../../../src/features/flp/CreateFlpOnFolderCreated/CreateFlpOnFolderCreatedHandler.ts"],"sourcesContent":["import { FolderAfterCreateEventHandler } from \"~/features/folder/CreateFolder/abstractions.js\";\nimport type { FolderAfterCreateEvent } from \"~/features/folder/CreateFolder/events.js\";\nimport type { ICreateFlpTaskInput } from \"~/types.js\";\nimport { CREATE_FLP_TASK_ID } from \"~/flp/tasks/index.js\";\nimport { TaskService } from \"@webiny/api-core/features/task/TaskService/index.js\";\nimport { Logger } from \"@webiny/api-core/features/logger/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/abstractions.js\";\n\n/*\n * Folder reads report permissions from the FLP record, which the task writes later. So the task,\n * not this handler, tells the admin about the new folder, and it needs to know whom to tell.\n */\nclass CreateFlpOnFolderCreatedHandlerImpl implements FolderAfterCreateEventHandler.Interface {\n    constructor(\n        private identityContext: IdentityContext.Interface,\n        private tasks: TaskService.Interface,\n        private logger: Logger.Interface\n    ) {}\n\n    async handle(event: FolderAfterCreateEvent): Promise<void> {\n        const { folder } = event.payload;\n\n        try {\n            const result = await this.tasks.trigger<ICreateFlpTaskInput>({\n                definition: CREATE_FLP_TASK_ID,\n                // Nobody to tell when there is no identity, as in some system calls.\n                input: { folder, notifyIdentityId: this.identityContext.getIdentity()?.id }\n            });\n            if (result.isFail()) {\n                this.logFailure(folder.id, result.error);\n            }\n        } catch (error) {\n            this.logFailure(folder.id, error);\n        }\n    }\n\n    /*\n     * The folder change is already saved, so it stands. But the folder is left without an FLP\n     * record, and this log is the only trace of why.\n     */\n    private logFailure(folderId: string, error: unknown): void {\n        this.logger.error(\n            { error, folderId },\n            \"Could not trigger the task that creates the folder's FLP record.\"\n        );\n    }\n}\n\nexport const CreateFlpOnFolderCreatedHandler = FolderAfterCreateEventHandler.createImplementation({\n    implementation: CreateFlpOnFolderCreatedHandlerImpl,\n    dependencies: [IdentityContext, TaskService, Logger]\n});\n"],"names":["CreateFlpOnFolderCreatedHandlerImpl","identityContext","tasks","logger","event","folder","result","CREATE_FLP_TASK_ID","error","folderId","CreateFlpOnFolderCreatedHandler","FolderAfterCreateEventHandler","IdentityContext","TaskService","Logger"],"mappings":";;;;;AAYA,MAAMA;IACF,YACYC,eAA0C,EAC1CC,KAA4B,EAC5BC,MAAwB,CAClC;aAHUF,eAAe,GAAfA;aACAC,KAAK,GAALA;aACAC,MAAM,GAANA;IACT;IAEH,MAAM,OAAOC,KAA6B,EAAiB;QACvD,MAAM,EAAEC,MAAM,EAAE,GAAGD,MAAM,OAAO;QAEhC,IAAI;YACA,MAAME,SAAS,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAsB;gBACzD,YAAYC;gBAEZ,OAAO;oBAAEF;oBAAQ,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW,IAAI;gBAAG;YAC9E;YACA,IAAIC,OAAO,MAAM,IACb,IAAI,CAAC,UAAU,CAACD,OAAO,EAAE,EAAEC,OAAO,KAAK;QAE/C,EAAE,OAAOE,OAAO;YACZ,IAAI,CAAC,UAAU,CAACH,OAAO,EAAE,EAAEG;QAC/B;IACJ;IAMQ,WAAWC,QAAgB,EAAED,KAAc,EAAQ;QACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CACb;YAAEA;YAAOC;QAAS,GAClB;IAER;AACJ;AAEO,MAAMC,kCAAkCC,8BAA8B,oBAAoB,CAAC;IAC9F,gBAAgBX;IAChB,cAAc;QAACY;QAAiBC;QAAaC;KAAO;AACxD"}

package/features/flp/DeleteFlp/DeleteFlpUseCase.d.ts

@@ -1,8 +1,8 @@
 import type { DeleteFlpUseCase as UseCaseAbstraction } from "./abstractions.js";
 import type { Folder } from "../../../folder/folder.types.js";
-import type { AcoContext } from "../../../types.js";
+import type { AcoFlpCrud } from "../../../features/folder/shared/abstractions.js";
 export declare class DeleteFlpUseCase implements UseCaseAbstraction.Interface {
-    private context;
-    constructor(context: AcoContext);
+    private flpCrud;
+    constructor(flpCrud: AcoFlpCrud.Interface);
     execute(folder: Folder): Promise<void>;
 }

package/features/flp/DeleteFlp/DeleteFlpUseCase.js

@@ -1,14 +1,14 @@
 import { WebinyError } from "@webiny/error";
 class DeleteFlpUseCase {
-    constructor(context){
-        this.context = context;
+    constructor(flpCrud){
+        this.flpCrud = flpCrud;
     }
     async execute(folder) {
         try {
             if (!folder) throw new WebinyError("Missing `folder` from the task input, I can't delete the record from the FLP catalog.", "ERROR_DELETE_FLP_USE_CASE_FOLDER_NOT_PROVIDED", {
                 folder
             });
-            await this.context.aco.flp.delete(folder.id);
+            await this.flpCrud.delete(folder.id);
         } catch (error) {
             throw WebinyError.from(error, {
                 message: "Error while deleting FLP",

package/features/flp/DeleteFlp/DeleteFlpUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/flp/DeleteFlp/DeleteFlpUseCase.js","sources":["../../../../src/features/flp/DeleteFlp/DeleteFlpUseCase.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport type { DeleteFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport type { Folder } from \"~/folder/folder.types.js\";\nimport type { AcoContext } from \"~/types.js\";\n\nexport class DeleteFlpUseCase implements UseCaseAbstraction.Interface {\n    constructor(private context: AcoContext) {}\n\n    async execute(folder: Folder): Promise<void> {\n        try {\n            if (!folder) {\n                throw new WebinyError(\n                    \"Missing `folder` from the task input, I can't delete the record from the FLP catalog.\",\n                    \"ERROR_DELETE_FLP_USE_CASE_FOLDER_NOT_PROVIDED\",\n                    { folder }\n                );\n            }\n            await this.context.aco.flp.delete(folder.id);\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while deleting FLP\",\n                code: \"ERROR_DELETE_FLP_USE_CASE\"\n            });\n        }\n    }\n}\n"],"names":["DeleteFlpUseCase","context","folder","WebinyError","error"],"mappings":";AAKO,MAAMA;IACT,YAAoBC,OAAmB,CAAE;aAArBA,OAAO,GAAPA;IAAsB;IAE1C,MAAM,QAAQC,MAAc,EAAiB;QACzC,IAAI;YACA,IAAI,CAACA,QACD,MAAM,IAAIC,YACN,yFACA,iDACA;gBAAED;YAAO;YAGjB,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAACA,OAAO,EAAE;QAC/C,EAAE,OAAOE,OAAO;YACZ,MAAMD,YAAY,IAAI,CAACC,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ"}
+{"version":3,"file":"features/flp/DeleteFlp/DeleteFlpUseCase.js","sources":["../../../../src/features/flp/DeleteFlp/DeleteFlpUseCase.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport type { DeleteFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport type { Folder } from \"~/folder/folder.types.js\";\nimport type { AcoFlpCrud } from \"~/features/folder/shared/abstractions.js\";\n\nexport class DeleteFlpUseCase implements UseCaseAbstraction.Interface {\n    constructor(private flpCrud: AcoFlpCrud.Interface) {}\n\n    async execute(folder: Folder): Promise<void> {\n        try {\n            if (!folder) {\n                throw new WebinyError(\n                    \"Missing `folder` from the task input, I can't delete the record from the FLP catalog.\",\n                    \"ERROR_DELETE_FLP_USE_CASE_FOLDER_NOT_PROVIDED\",\n                    { folder }\n                );\n            }\n            await this.flpCrud.delete(folder.id);\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while deleting FLP\",\n                code: \"ERROR_DELETE_FLP_USE_CASE\"\n            });\n        }\n    }\n}\n"],"names":["DeleteFlpUseCase","flpCrud","folder","WebinyError","error"],"mappings":";AAKO,MAAMA;IACT,YAAoBC,OAA6B,CAAE;aAA/BA,OAAO,GAAPA;IAAgC;IAEpD,MAAM,QAAQC,MAAc,EAAiB;QACzC,IAAI;YACA,IAAI,CAACA,QACD,MAAM,IAAIC,YACN,yFACA,iDACA;gBAAED;YAAO;YAGjB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAACA,OAAO,EAAE;QACvC,EAAE,OAAOE,OAAO;YACZ,MAAMD,YAAY,IAAI,CAACC,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ"}

package/features/flp/DeleteFlp/feature.d.ts

@@ -1,10 +1,5 @@
 import type { Container } from "@webiny/di";
-import type { AcoContext } from "../../../types.js";
-interface LegacyDeps {
-    context: AcoContext;
-}
 export declare const DeleteFlpFeature: {
     name: string;
-    register(container: Container, context: LegacyDeps): void;
+    register(container: Container): void;
 };
-export {};

package/features/flp/DeleteFlp/feature.js

@@ -1,10 +1,11 @@
 import { createFeature } from "@webiny/feature/api";
 import { DeleteFlpUseCase } from "./DeleteFlpUseCase.js";
 import { DeleteFlpUseCase as external_abstractions_js_DeleteFlpUseCase } from "./abstractions.js";
+import { AcoFlpCrud } from "../../folder/shared/abstractions.js";
 const DeleteFlpFeature = createFeature({
     name: "DeleteFlp",
-    register (container, deps) {
-        container.registerFactory(external_abstractions_js_DeleteFlpUseCase, ()=>new DeleteFlpUseCase(deps.context));
+    register (container) {
+        container.registerFactory(external_abstractions_js_DeleteFlpUseCase, ()=>new DeleteFlpUseCase(container.resolve(AcoFlpCrud)));
     }
 });
 export { DeleteFlpFeature };

package/features/flp/DeleteFlp/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/flp/DeleteFlp/feature.js","sources":["../../../../src/features/flp/DeleteFlp/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport type { Container } from \"@webiny/di\";\nimport { DeleteFlpUseCase } from \"./DeleteFlpUseCase.js\";\nimport { DeleteFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport type { AcoContext } from \"~/types.js\";\n\ninterface LegacyDeps {\n    context: AcoContext;\n}\n\nexport const DeleteFlpFeature = createFeature({\n    name: \"DeleteFlp\",\n    register(container: Container, deps: LegacyDeps) {\n        container.registerFactory(UseCaseAbstraction, () => {\n            return new DeleteFlpUseCase(deps.context);\n        });\n    }\n});\n"],"names":["DeleteFlpFeature","createFeature","container","deps","UseCaseAbstraction","DeleteFlpUseCase"],"mappings":";;;AAUO,MAAMA,mBAAmBC,cAAc;IAC1C,MAAM;IACN,UAASC,SAAoB,EAAEC,IAAgB;QAC3CD,UAAU,eAAe,CAACE,2CAAoB,IACnC,IAAIC,iBAAiBF,KAAK,OAAO;IAEhD;AACJ"}
+{"version":3,"file":"features/flp/DeleteFlp/feature.js","sources":["../../../../src/features/flp/DeleteFlp/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport type { Container } from \"@webiny/di\";\nimport { DeleteFlpUseCase } from \"./DeleteFlpUseCase.js\";\nimport { DeleteFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { AcoFlpCrud } from \"~/features/folder/shared/abstractions.js\";\n\nexport const DeleteFlpFeature = createFeature({\n    name: \"DeleteFlp\",\n    register(container: Container) {\n        container.registerFactory(UseCaseAbstraction, () => {\n            return new DeleteFlpUseCase(container.resolve(AcoFlpCrud));\n        });\n    }\n});\n"],"names":["DeleteFlpFeature","createFeature","container","UseCaseAbstraction","DeleteFlpUseCase","AcoFlpCrud"],"mappings":";;;;AAMO,MAAMA,mBAAmBC,cAAc;IAC1C,MAAM;IACN,UAASC,SAAoB;QACzBA,UAAU,eAAe,CAACC,2CAAoB,IACnC,IAAIC,iBAAiBF,UAAU,OAAO,CAACG;IAEtD;AACJ"}

package/features/flp/DeleteFlpOnFolderDeleted/DeleteFlpOnFolderDeletedHandler.d.ts

@@ -1,14 +1,15 @@
-import { DeleteFlpUseCase } from "../DeleteFlp/abstractions.js";
 import { FolderAfterDeleteEventHandler } from "../../../features/folder/DeleteFolder/abstractions.js";
 import type { FolderAfterDeleteEvent } from "../../../features/folder/DeleteFolder/events.js";
 import { TaskService } from "@webiny/api-core/features/task/TaskService/index.js";
+import { Logger } from "@webiny/api-core/features/logger/index.js";
 declare class DeleteFlpOnFolderDeletedHandlerImpl implements FolderAfterDeleteEventHandler.Interface {
-    private deleteFlpUseCase;
-    private tasks?;
-    constructor(deleteFlpUseCase: DeleteFlpUseCase.Interface, tasks?: TaskService.Interface | undefined);
+    private tasks;
+    private logger;
+    constructor(tasks: TaskService.Interface, logger: Logger.Interface);
     handle(event: FolderAfterDeleteEvent): Promise<void>;
+    private logFailure;
 }
 export declare const DeleteFlpOnFolderDeletedHandler: typeof DeleteFlpOnFolderDeletedHandlerImpl & {
-    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-core/features/eventPublisher/abstractions.js").IEventHandler<import("@webiny/api-core/features/eventPublisher/abstractions.js").DomainEvent<import("~/features/folder/DeleteFolder/abstractions.js").FolderAfterDeletePayload>>>;
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-core/features/eventPublisher").IEventHandler<import("@webiny/api-core/features/eventPublisher").DomainEvent<import("~/features/folder/DeleteFolder/abstractions.js").FolderAfterDeletePayload>>>;
 };
 export {};

package/features/flp/DeleteFlpOnFolderDeleted/DeleteFlpOnFolderDeletedHandler.js

@@ -1,35 +1,38 @@
-import { DeleteFlpUseCase } from "../DeleteFlp/abstractions.js";
 import { FolderAfterDeleteEventHandler } from "../../folder/DeleteFolder/abstractions.js";
 import { DELETE_FLP_TASK_ID } from "../../../flp/tasks/index.js";
 import { TaskService } from "@webiny/api-core/features/task/TaskService/index.js";
+import { Logger } from "@webiny/api-core/features/logger/index.js";
 class DeleteFlpOnFolderDeletedHandlerImpl {
-    constructor(deleteFlpUseCase, tasks){
-        this.deleteFlpUseCase = deleteFlpUseCase;
+    constructor(tasks, logger){
         this.tasks = tasks;
+        this.logger = logger;
     }
     async handle(event) {
         const { folder } = event.payload;
         try {
-            if (this.tasks) await this.tasks.trigger({
+            const result = await this.tasks.trigger({
                 definition: DELETE_FLP_TASK_ID,
                 input: {
                     folder
                 }
             });
-            else await this.deleteFlpUseCase.execute(folder);
-        } catch  {}
+            if (result.isFail()) this.logFailure(folder.id, result.error);
+        } catch (error) {
+            this.logFailure(folder.id, error);
+        }
+    }
+    logFailure(folderId, error) {
+        this.logger.error({
+            error,
+            folderId
+        }, "Could not trigger the task that deletes the folder's FLP record.");
     }
 }
 const DeleteFlpOnFolderDeletedHandler = FolderAfterDeleteEventHandler.createImplementation({
     implementation: DeleteFlpOnFolderDeletedHandlerImpl,
     dependencies: [
-        DeleteFlpUseCase,
-        [
-            TaskService,
-            {
-                optional: true
-            }
-        ]
+        TaskService,
+        Logger
     ]
 });
 export { DeleteFlpOnFolderDeletedHandler };

package/features/flp/DeleteFlpOnFolderDeleted/DeleteFlpOnFolderDeletedHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/flp/DeleteFlpOnFolderDeleted/DeleteFlpOnFolderDeletedHandler.js","sources":["../../../../src/features/flp/DeleteFlpOnFolderDeleted/DeleteFlpOnFolderDeletedHandler.ts"],"sourcesContent":["import { DeleteFlpUseCase } from \"../DeleteFlp/abstractions.js\";\nimport { FolderAfterDeleteEventHandler } from \"~/features/folder/DeleteFolder/abstractions.js\";\nimport type { FolderAfterDeleteEvent } from \"~/features/folder/DeleteFolder/events.js\";\nimport type { IDeleteFlpTaskInput } from \"~/types.js\";\nimport { DELETE_FLP_TASK_ID } from \"~/flp/tasks/index.js\";\nimport { TaskService } from \"@webiny/api-core/features/task/TaskService/index.js\";\n\nclass DeleteFlpOnFolderDeletedHandlerImpl implements FolderAfterDeleteEventHandler.Interface {\n    constructor(\n        private deleteFlpUseCase: DeleteFlpUseCase.Interface,\n        private tasks?: TaskService.Interface\n    ) {}\n\n    async handle(event: FolderAfterDeleteEvent): Promise<void> {\n        const { folder } = event.payload;\n\n        try {\n            if (this.tasks) {\n                await this.tasks.trigger<IDeleteFlpTaskInput>({\n                    definition: DELETE_FLP_TASK_ID,\n                    input: { folder }\n                });\n            } else {\n                await this.deleteFlpUseCase.execute(folder);\n            }\n        } catch {\n            // Ignore errors\n        }\n    }\n}\n\nexport const DeleteFlpOnFolderDeletedHandler = FolderAfterDeleteEventHandler.createImplementation({\n    implementation: DeleteFlpOnFolderDeletedHandlerImpl,\n    dependencies: [DeleteFlpUseCase, [TaskService, { optional: true }]]\n});\n"],"names":["DeleteFlpOnFolderDeletedHandlerImpl","deleteFlpUseCase","tasks","event","folder","DELETE_FLP_TASK_ID","DeleteFlpOnFolderDeletedHandler","FolderAfterDeleteEventHandler","DeleteFlpUseCase","TaskService"],"mappings":";;;;AAOA,MAAMA;IACF,YACYC,gBAA4C,EAC5CC,KAA6B,CACvC;aAFUD,gBAAgB,GAAhBA;aACAC,KAAK,GAALA;IACT;IAEH,MAAM,OAAOC,KAA6B,EAAiB;QACvD,MAAM,EAAEC,MAAM,EAAE,GAAGD,MAAM,OAAO;QAEhC,IAAI;YACA,IAAI,IAAI,CAAC,KAAK,EACV,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAsB;gBAC1C,YAAYE;gBACZ,OAAO;oBAAED;gBAAO;YACpB;iBAEA,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAACA;QAE5C,EAAE,OAAM,CAER;IACJ;AACJ;AAEO,MAAME,kCAAkCC,8BAA8B,oBAAoB,CAAC;IAC9F,gBAAgBP;IAChB,cAAc;QAACQ;QAAkB;YAACC;YAAa;gBAAE,UAAU;YAAK;SAAE;KAAC;AACvE"}
+{"version":3,"file":"features/flp/DeleteFlpOnFolderDeleted/DeleteFlpOnFolderDeletedHandler.js","sources":["../../../../src/features/flp/DeleteFlpOnFolderDeleted/DeleteFlpOnFolderDeletedHandler.ts"],"sourcesContent":["import { FolderAfterDeleteEventHandler } from \"~/features/folder/DeleteFolder/abstractions.js\";\nimport type { FolderAfterDeleteEvent } from \"~/features/folder/DeleteFolder/events.js\";\nimport type { IDeleteFlpTaskInput } from \"~/types.js\";\nimport { DELETE_FLP_TASK_ID } from \"~/flp/tasks/index.js\";\nimport { TaskService } from \"@webiny/api-core/features/task/TaskService/index.js\";\nimport { Logger } from \"@webiny/api-core/features/logger/index.js\";\n\nclass DeleteFlpOnFolderDeletedHandlerImpl implements FolderAfterDeleteEventHandler.Interface {\n    constructor(\n        private tasks: TaskService.Interface,\n        private logger: Logger.Interface\n    ) {}\n\n    async handle(event: FolderAfterDeleteEvent): Promise<void> {\n        const { folder } = event.payload;\n\n        try {\n            const result = await this.tasks.trigger<IDeleteFlpTaskInput>({\n                definition: DELETE_FLP_TASK_ID,\n                input: { folder }\n            });\n            if (result.isFail()) {\n                this.logFailure(folder.id, result.error);\n            }\n        } catch (error) {\n            this.logFailure(folder.id, error);\n        }\n    }\n\n    /*\n     * The folder change is already saved, so it stands. But the folder's FLP record is left behind,\n     * and this log is the only trace of why.\n     */\n    private logFailure(folderId: string, error: unknown): void {\n        this.logger.error(\n            { error, folderId },\n            \"Could not trigger the task that deletes the folder's FLP record.\"\n        );\n    }\n}\n\nexport const DeleteFlpOnFolderDeletedHandler = FolderAfterDeleteEventHandler.createImplementation({\n    implementation: DeleteFlpOnFolderDeletedHandlerImpl,\n    dependencies: [TaskService, Logger]\n});\n"],"names":["DeleteFlpOnFolderDeletedHandlerImpl","tasks","logger","event","folder","result","DELETE_FLP_TASK_ID","error","folderId","DeleteFlpOnFolderDeletedHandler","FolderAfterDeleteEventHandler","TaskService","Logger"],"mappings":";;;;AAOA,MAAMA;IACF,YACYC,KAA4B,EAC5BC,MAAwB,CAClC;aAFUD,KAAK,GAALA;aACAC,MAAM,GAANA;IACT;IAEH,MAAM,OAAOC,KAA6B,EAAiB;QACvD,MAAM,EAAEC,MAAM,EAAE,GAAGD,MAAM,OAAO;QAEhC,IAAI;YACA,MAAME,SAAS,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAsB;gBACzD,YAAYC;gBACZ,OAAO;oBAAEF;gBAAO;YACpB;YACA,IAAIC,OAAO,MAAM,IACb,IAAI,CAAC,UAAU,CAACD,OAAO,EAAE,EAAEC,OAAO,KAAK;QAE/C,EAAE,OAAOE,OAAO;YACZ,IAAI,CAAC,UAAU,CAACH,OAAO,EAAE,EAAEG;QAC/B;IACJ;IAMQ,WAAWC,QAAgB,EAAED,KAAc,EAAQ;QACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CACb;YAAEA;YAAOC;QAAS,GAClB;IAER;AACJ;AAEO,MAAMC,kCAAkCC,8BAA8B,oBAAoB,CAAC;IAC9F,gBAAgBV;IAChB,cAAc;QAACW;QAAaC;KAAO;AACvC"}

package/features/flp/FolderLevelPermissions/FolderLevelPermissions.d.ts

@@ -1,5 +1,5 @@
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
-import { WcpContext } from "@webiny/api-core/features/wcp/WcpContext/index.js";
+import { FeatureFlags } from "@webiny/api-core/features/featureFlags/abstractions.js";
 import { ListUserTeamsUseCase } from "@webiny/api-core/features/users/ListUserTeams/index.js";
 import { type CanAccessFolderContentParams, type CanAccessFolderParams } from "./useCases/index.js";
 import { FolderLevelPermissions as FolderLevelPermissionsAbstraction } from "./abstractions.js";
@@ -8,11 +8,11 @@ import { ListFlpsUseCase } from "../../../features/flp/ListFlps/index.js";
 import { GetFlpUseCase } from "../../../features/flp/GetFlp/index.js";
 declare class FolderLevelPermissionsImpl implements FolderLevelPermissionsAbstraction.Interface {
     private identityContext;
-    private wcpContext;
+    private featureFlags;
     private listUserTeamsUseCase;
     private getFlpUseCase;
     private listFlpsUseCase;
-    constructor(identityContext: IdentityContext.Interface, wcpContext: WcpContext.Interface, listUserTeamsUseCase: ListUserTeamsUseCase.Interface, getFlpUseCase: GetFlpUseCase.Interface, listFlpsUseCase: ListFlpsUseCase.Interface);
+    constructor(identityContext: IdentityContext.Interface, featureFlags: FeatureFlags.Interface, listUserTeamsUseCase: ListUserTeamsUseCase.Interface, getFlpUseCase: GetFlpUseCase.Interface, listFlpsUseCase: ListFlpsUseCase.Interface);
     canUseFolderLevelPermissions(enabled?: boolean): boolean;
     canUseTeams(): boolean;
     canCreateFolderInRoot(): boolean;
@@ -29,6 +29,7 @@ declare class FolderLevelPermissionsImpl implements FolderLevelPermissionsAbstra
         id: string;
         permissions: FolderPermission[];
     }>>;
+    private createDefaultPermissions;
     getFolderLevelPermissions(id: string): Promise<FolderPermission[]>;
 }
 export declare const FolderLevelPermissions: import("@webiny/di").Implementation<typeof FolderLevelPermissionsImpl>;

package/features/flp/FolderLevelPermissions/FolderLevelPermissions.js

@@ -1,6 +1,6 @@
 import { createImplementation } from "@webiny/di";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
-import { WcpContext } from "@webiny/api-core/features/wcp/WcpContext/index.js";
+import { FeatureFlags } from "@webiny/api-core/features/featureFlags/abstractions.js";
 import { ListUserTeamsUseCase } from "@webiny/api-core/features/users/ListUserTeams/index.js";
 import { NotAuthorizedError } from "@webiny/api-core/features/security/shared/index.js";
 import { CanAccessFolder, CanAccessFolderContent, CanCreateFolderInRoot, CheckNotInheritedPermissions, GetDefaultPermissions, GetDefaultPermissionsWithTeams } from "./useCases/index.js";
@@ -8,9 +8,9 @@ import { FolderLevelPermissions } from "./abstractions.js";
 import { ListFlpsUseCase } from "../ListFlps/index.js";
 import { GetFlpUseCase } from "../GetFlp/index.js";
 class FolderLevelPermissionsImpl {
-    constructor(identityContext, wcpContext, listUserTeamsUseCase, getFlpUseCase, listFlpsUseCase){
+    constructor(identityContext, featureFlags, listUserTeamsUseCase, getFlpUseCase, listFlpsUseCase){
         this.identityContext = identityContext;
-        this.wcpContext = wcpContext;
+        this.featureFlags = featureFlags;
         this.listUserTeamsUseCase = listUserTeamsUseCase;
         this.getFlpUseCase = getFlpUseCase;
         this.listFlpsUseCase = listFlpsUseCase;
@@ -20,10 +20,10 @@ class FolderLevelPermissionsImpl {
         const identity = this.identityContext.getIdentity();
         if (!identity) return false;
         if ("admin" !== identity.type) return false;
-        return this.wcpContext.canUseFolderLevelPermissions();
+        return this.featureFlags.get().isEnabled("advancedAccessControlLayer.folderLevelPermissions");
     }
     canUseTeams() {
-        return this.wcpContext.canUseTeams();
+        return this.featureFlags.get().isEnabled("advancedAccessControlLayer.teams");
     }
     canCreateFolderInRoot() {
         const canCreateFolderInRootUseCase = new CanCreateFolderInRoot();
@@ -77,20 +77,21 @@ class FolderLevelPermissionsImpl {
         });
     }
     getDefaultPermissions(permissions) {
-        const getDefaultPermissionsUseCase = new GetDefaultPermissions(this.identityContext);
-        if (this.canUseTeams()) {
-            const getDefaultPermissionsWithTeams = new GetDefaultPermissionsWithTeams(this.identityContext, this.listUserTeamsUseCase, getDefaultPermissionsUseCase);
-            return getDefaultPermissionsWithTeams.execute(permissions);
-        }
-        return getDefaultPermissionsUseCase.execute(permissions);
+        return this.createDefaultPermissions().execute(permissions);
     }
     async listFolderLevelPermissions(params) {
         const flps = await this.listFlpsUseCase.execute(params);
+        const defaultPermissions = this.createDefaultPermissions();
         return Promise.all(flps.map(async (flp)=>({
                 id: flp.id,
-                permissions: await this.getDefaultPermissions(flp.permissions)
+                permissions: await defaultPermissions.execute(flp.permissions)
             })));
     }
+    createDefaultPermissions() {
+        const getDefaultPermissionsUseCase = new GetDefaultPermissions(this.identityContext);
+        if (!this.canUseTeams()) return getDefaultPermissionsUseCase;
+        return new GetDefaultPermissionsWithTeams(this.identityContext, this.listUserTeamsUseCase, getDefaultPermissionsUseCase);
+    }
     async getFolderLevelPermissions(id) {
         const flp = await this.getFlpUseCase.execute(id);
         return await this.getDefaultPermissions(flp?.permissions ?? []);
@@ -101,7 +102,7 @@ const FolderLevelPermissions_FolderLevelPermissions = createImplementation({
     implementation: FolderLevelPermissionsImpl,
     dependencies: [
         IdentityContext,
-        WcpContext,
+        FeatureFlags,
         ListUserTeamsUseCase,
         GetFlpUseCase,
         ListFlpsUseCase

package/features/flp/FolderLevelPermissions/FolderLevelPermissions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/flp/FolderLevelPermissions/FolderLevelPermissions.js","sources":["../../../../src/features/flp/FolderLevelPermissions/FolderLevelPermissions.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { WcpContext } from \"@webiny/api-core/features/wcp/WcpContext/index.js\";\nimport { ListUserTeamsUseCase } from \"@webiny/api-core/features/users/ListUserTeams/index.js\";\nimport { NotAuthorizedError } from \"@webiny/api-core/features/security/shared/index.js\";\nimport {\n    CanAccessFolder,\n    CanAccessFolderContent,\n    type CanAccessFolderContentParams,\n    type CanAccessFolderParams,\n    CanCreateFolderInRoot,\n    CheckNotInheritedPermissions,\n    GetDefaultPermissions,\n    GetDefaultPermissionsWithTeams\n} from \"./useCases/index.js\";\nimport { FolderLevelPermissions as FolderLevelPermissionsAbstraction } from \"./abstractions.js\";\nimport type { FolderLevelPermission, FolderPermission, ListFlpsParams } from \"~/types.js\";\nimport { ListFlpsUseCase } from \"~/features/flp/ListFlps/index.js\";\nimport { GetFlpUseCase } from \"~/features/flp/GetFlp/index.js\";\n\nclass FolderLevelPermissionsImpl implements FolderLevelPermissionsAbstraction.Interface {\n    constructor(\n        private identityContext: IdentityContext.Interface,\n        private wcpContext: WcpContext.Interface,\n        private listUserTeamsUseCase: ListUserTeamsUseCase.Interface,\n        private getFlpUseCase: GetFlpUseCase.Interface,\n        private listFlpsUseCase: ListFlpsUseCase.Interface\n    ) {}\n\n    public canUseFolderLevelPermissions(enabled?: boolean): boolean {\n        if (enabled === false) {\n            return false;\n        }\n\n        const identity = this.identityContext.getIdentity();\n\n        // FLPs only work with authenticated identities (logged-in users).\n        if (!identity) {\n            return false;\n        }\n\n        // At the moment, we only want FLP to be used with identities of type \"admin\".\n        // This temporarily addresses the issue of API keys not being able to access content, because\n        // FLPs doesn't work with them. Once we start adding FLPs to API keys, we can remove this check.\n        if (identity.type !== \"admin\") {\n            return false;\n        }\n\n        return this.wcpContext.canUseFolderLevelPermissions();\n    }\n\n    public canUseTeams(): boolean {\n        return this.wcpContext.canUseTeams();\n    }\n\n    public canCreateFolderInRoot(): boolean {\n        const canCreateFolderInRootUseCase = new CanCreateFolderInRoot();\n        return canCreateFolderInRootUseCase.execute();\n    }\n\n    public permissionsIncludeNonInheritedPermissions(permissions: FolderPermission[]): boolean {\n        const checkNotInheritedPermissionsUseCase = new CheckNotInheritedPermissions();\n        return checkNotInheritedPermissionsUseCase.execute(permissions);\n    }\n\n    public async canAccessFolder(params: CanAccessFolderParams): Promise<boolean> {\n        if (\n            !this.canUseFolderLevelPermissions() ||\n            !this.identityContext.isAuthorizationEnabled()\n        ) {\n            return true;\n        }\n\n        const canAccessFolderUseCase = new CanAccessFolder(this.identityContext);\n        return await canAccessFolderUseCase.execute(params);\n    }\n\n    public async canAccessFolderContent(params: CanAccessFolderContentParams): Promise<boolean> {\n        const canUseFlp = this.canUseFolderLevelPermissions();\n        const authEnabled = this.identityContext.isAuthorizationEnabled();\n\n        if (!canUseFlp || !authEnabled) {\n            return true;\n        }\n\n        const canAccessFolderContentUseCase = new CanAccessFolderContent(this.identityContext);\n        return await canAccessFolderContentUseCase.execute(params);\n    }\n\n    public async ensureCanAccessFolder(params: CanAccessFolderParams): Promise<void> {\n        const result = await this.canAccessFolder(params);\n        if (!result) {\n            throw new NotAuthorizedError();\n        }\n    }\n\n    public async ensureCanAccessFolderContent(params: CanAccessFolderContentParams): Promise<void> {\n        const result = await this.canAccessFolderContent(params);\n        if (!result) {\n            throw new NotAuthorizedError();\n        }\n    }\n\n    public async canManageFolderContent(flp: FolderLevelPermission): Promise<boolean> {\n        if (\n            !this.canUseFolderLevelPermissions() ||\n            !this.identityContext.isAuthorizationEnabled()\n        ) {\n            return true;\n        }\n\n        return await this.canAccessFolderContent({ permissions: flp.permissions, rwd: \"w\" });\n    }\n\n    public async canManageFolderStructure(flp: FolderLevelPermission): Promise<boolean> {\n        if (\n            !this.canUseFolderLevelPermissions() ||\n            !this.identityContext.isAuthorizationEnabled()\n        ) {\n            return true;\n        }\n\n        return await this.canAccessFolder({ permissions: flp.permissions, rwd: \"w\" });\n    }\n\n    public async canManageFolderPermissions(flp: FolderLevelPermission): Promise<boolean> {\n        if (!this.canUseFolderLevelPermissions()) {\n            return false;\n        }\n\n        if (!this.identityContext.isAuthorizationEnabled()) {\n            return true;\n        }\n\n        return await this.canAccessFolder({\n            permissions: flp.permissions,\n            rwd: \"w\",\n            managePermissions: true\n        });\n    }\n\n    public getDefaultPermissions(permissions: FolderPermission[]): Promise<FolderPermission[]> {\n        const getDefaultPermissionsUseCase = new GetDefaultPermissions(this.identityContext);\n\n        if (this.canUseTeams()) {\n            const getDefaultPermissionsWithTeams = new GetDefaultPermissionsWithTeams(\n                this.identityContext,\n                this.listUserTeamsUseCase,\n                getDefaultPermissionsUseCase\n            );\n\n            return getDefaultPermissionsWithTeams.execute(permissions);\n        }\n\n        return getDefaultPermissionsUseCase.execute(permissions);\n    }\n\n    public async listFolderLevelPermissions(params: ListFlpsParams): Promise<\n        Array<{\n            id: string;\n            permissions: FolderPermission[];\n        }>\n    > {\n        const flps = await this.listFlpsUseCase.execute(params);\n\n        return Promise.all(\n            flps.map(async flp => ({\n                id: flp.id,\n                permissions: await this.getDefaultPermissions(flp.permissions)\n            }))\n        );\n    }\n\n    public async getFolderLevelPermissions(id: string): Promise<FolderPermission[]> {\n        const flp = await this.getFlpUseCase.execute(id);\n        return await this.getDefaultPermissions(flp?.permissions ?? []);\n    }\n}\n\nexport const FolderLevelPermissions = createImplementation({\n    abstraction: FolderLevelPermissionsAbstraction,\n    implementation: FolderLevelPermissionsImpl,\n    dependencies: [\n        IdentityContext,\n        WcpContext,\n        ListUserTeamsUseCase,\n        GetFlpUseCase,\n        ListFlpsUseCase\n    ]\n});\n"],"names":["FolderLevelPermissionsImpl","identityContext","wcpContext","listUserTeamsUseCase","getFlpUseCase","listFlpsUseCase","enabled","identity","canCreateFolderInRootUseCase","CanCreateFolderInRoot","permissions","checkNotInheritedPermissionsUseCase","CheckNotInheritedPermissions","params","canAccessFolderUseCase","CanAccessFolder","canUseFlp","authEnabled","canAccessFolderContentUseCase","CanAccessFolderContent","result","NotAuthorizedError","flp","getDefaultPermissionsUseCase","GetDefaultPermissions","getDefaultPermissionsWithTeams","GetDefaultPermissionsWithTeams","flps","Promise","id","FolderLevelPermissions","createImplementation","FolderLevelPermissionsAbstraction","IdentityContext","WcpContext","ListUserTeamsUseCase","GetFlpUseCase","ListFlpsUseCase"],"mappings":"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"}
+{"version":3,"file":"features/flp/FolderLevelPermissions/FolderLevelPermissions.js","sources":["../../../../src/features/flp/FolderLevelPermissions/FolderLevelPermissions.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { FeatureFlags } from \"@webiny/api-core/features/featureFlags/abstractions.js\";\nimport { ListUserTeamsUseCase } from \"@webiny/api-core/features/users/ListUserTeams/index.js\";\nimport { NotAuthorizedError } from \"@webiny/api-core/features/security/shared/index.js\";\nimport {\n    CanAccessFolder,\n    CanAccessFolderContent,\n    type CanAccessFolderContentParams,\n    type CanAccessFolderParams,\n    CanCreateFolderInRoot,\n    CheckNotInheritedPermissions,\n    GetDefaultPermissions,\n    GetDefaultPermissionsWithTeams,\n    type IGetDefaultPermissions\n} from \"./useCases/index.js\";\nimport { FolderLevelPermissions as FolderLevelPermissionsAbstraction } from \"./abstractions.js\";\nimport type { FolderLevelPermission, FolderPermission, ListFlpsParams } from \"~/types.js\";\nimport { ListFlpsUseCase } from \"~/features/flp/ListFlps/index.js\";\nimport { GetFlpUseCase } from \"~/features/flp/GetFlp/index.js\";\n\nclass FolderLevelPermissionsImpl implements FolderLevelPermissionsAbstraction.Interface {\n    constructor(\n        private identityContext: IdentityContext.Interface,\n        private featureFlags: FeatureFlags.Interface,\n        private listUserTeamsUseCase: ListUserTeamsUseCase.Interface,\n        private getFlpUseCase: GetFlpUseCase.Interface,\n        private listFlpsUseCase: ListFlpsUseCase.Interface\n    ) {}\n\n    public canUseFolderLevelPermissions(enabled?: boolean): boolean {\n        if (enabled === false) {\n            return false;\n        }\n\n        const identity = this.identityContext.getIdentity();\n\n        // FLPs only work with authenticated identities (logged-in users).\n        if (!identity) {\n            return false;\n        }\n\n        // At the moment, we only want FLP to be used with identities of type \"admin\".\n        // This temporarily addresses the issue of API keys not being able to access content, because\n        // FLPs doesn't work with them. Once we start adding FLPs to API keys, we can remove this check.\n        if (identity.type !== \"admin\") {\n            return false;\n        }\n\n        return this.featureFlags\n            .get()\n            .isEnabled(\"advancedAccessControlLayer.folderLevelPermissions\");\n    }\n\n    public canUseTeams(): boolean {\n        return this.featureFlags.get().isEnabled(\"advancedAccessControlLayer.teams\");\n    }\n\n    public canCreateFolderInRoot(): boolean {\n        const canCreateFolderInRootUseCase = new CanCreateFolderInRoot();\n        return canCreateFolderInRootUseCase.execute();\n    }\n\n    public permissionsIncludeNonInheritedPermissions(permissions: FolderPermission[]): boolean {\n        const checkNotInheritedPermissionsUseCase = new CheckNotInheritedPermissions();\n        return checkNotInheritedPermissionsUseCase.execute(permissions);\n    }\n\n    public async canAccessFolder(params: CanAccessFolderParams): Promise<boolean> {\n        if (\n            !this.canUseFolderLevelPermissions() ||\n            !this.identityContext.isAuthorizationEnabled()\n        ) {\n            return true;\n        }\n\n        const canAccessFolderUseCase = new CanAccessFolder(this.identityContext);\n        return await canAccessFolderUseCase.execute(params);\n    }\n\n    public async canAccessFolderContent(params: CanAccessFolderContentParams): Promise<boolean> {\n        const canUseFlp = this.canUseFolderLevelPermissions();\n        const authEnabled = this.identityContext.isAuthorizationEnabled();\n\n        if (!canUseFlp || !authEnabled) {\n            return true;\n        }\n\n        const canAccessFolderContentUseCase = new CanAccessFolderContent(this.identityContext);\n        return await canAccessFolderContentUseCase.execute(params);\n    }\n\n    public async ensureCanAccessFolder(params: CanAccessFolderParams): Promise<void> {\n        const result = await this.canAccessFolder(params);\n        if (!result) {\n            throw new NotAuthorizedError();\n        }\n    }\n\n    public async ensureCanAccessFolderContent(params: CanAccessFolderContentParams): Promise<void> {\n        const result = await this.canAccessFolderContent(params);\n        if (!result) {\n            throw new NotAuthorizedError();\n        }\n    }\n\n    public async canManageFolderContent(flp: FolderLevelPermission): Promise<boolean> {\n        if (\n            !this.canUseFolderLevelPermissions() ||\n            !this.identityContext.isAuthorizationEnabled()\n        ) {\n            return true;\n        }\n\n        return await this.canAccessFolderContent({ permissions: flp.permissions, rwd: \"w\" });\n    }\n\n    public async canManageFolderStructure(flp: FolderLevelPermission): Promise<boolean> {\n        if (\n            !this.canUseFolderLevelPermissions() ||\n            !this.identityContext.isAuthorizationEnabled()\n        ) {\n            return true;\n        }\n\n        return await this.canAccessFolder({ permissions: flp.permissions, rwd: \"w\" });\n    }\n\n    public async canManageFolderPermissions(flp: FolderLevelPermission): Promise<boolean> {\n        if (!this.canUseFolderLevelPermissions()) {\n            return false;\n        }\n\n        if (!this.identityContext.isAuthorizationEnabled()) {\n            return true;\n        }\n\n        return await this.canAccessFolder({\n            permissions: flp.permissions,\n            rwd: \"w\",\n            managePermissions: true\n        });\n    }\n\n    // With teams enabled, every call loads the current user's teams through `ListUserTeamsUseCase`\n    // (an admin user read plus a team list). Nothing caches them between calls.\n    public getDefaultPermissions(permissions: FolderPermission[]): Promise<FolderPermission[]> {\n        return this.createDefaultPermissions().execute(permissions);\n    }\n\n    public async listFolderLevelPermissions(params: ListFlpsParams): Promise<\n        Array<{\n            id: string;\n            permissions: FolderPermission[];\n        }>\n    > {\n        const flps = await this.listFlpsUseCase.execute(params);\n\n        // One instance for every listed record: with teams enabled, the user's teams are loaded\n        // once per call, not once per record.\n        const defaultPermissions = this.createDefaultPermissions();\n        return Promise.all(\n            flps.map(async flp => ({\n                id: flp.id,\n                permissions: await defaultPermissions.execute(flp.permissions)\n            }))\n        );\n    }\n\n    private createDefaultPermissions(): IGetDefaultPermissions {\n        const getDefaultPermissionsUseCase = new GetDefaultPermissions(this.identityContext);\n        if (!this.canUseTeams()) {\n            return getDefaultPermissionsUseCase;\n        }\n        return new GetDefaultPermissionsWithTeams(\n            this.identityContext,\n            this.listUserTeamsUseCase,\n            getDefaultPermissionsUseCase\n        );\n    }\n\n    public async getFolderLevelPermissions(id: string): Promise<FolderPermission[]> {\n        const flp = await this.getFlpUseCase.execute(id);\n        return await this.getDefaultPermissions(flp?.permissions ?? []);\n    }\n}\n\nexport const FolderLevelPermissions = createImplementation({\n    abstraction: FolderLevelPermissionsAbstraction,\n    implementation: FolderLevelPermissionsImpl,\n    dependencies: [\n        IdentityContext,\n        FeatureFlags,\n        ListUserTeamsUseCase,\n        GetFlpUseCase,\n        ListFlpsUseCase\n    ]\n});\n"],"names":["FolderLevelPermissionsImpl","identityContext","featureFlags","listUserTeamsUseCase","getFlpUseCase","listFlpsUseCase","enabled","identity","canCreateFolderInRootUseCase","CanCreateFolderInRoot","permissions","checkNotInheritedPermissionsUseCase","CheckNotInheritedPermissions","params","canAccessFolderUseCase","CanAccessFolder","canUseFlp","authEnabled","canAccessFolderContentUseCase","CanAccessFolderContent","result","NotAuthorizedError","flp","flps","defaultPermissions","Promise","getDefaultPermissionsUseCase","GetDefaultPermissions","GetDefaultPermissionsWithTeams","id","FolderLevelPermissions","createImplementation","FolderLevelPermissionsAbstraction","IdentityContext","FeatureFlags","ListUserTeamsUseCase","GetFlpUseCase","ListFlpsUseCase"],"mappings":";;;;;;;;;AAqBA,MAAMA;IACF,YACYC,eAA0C,EAC1CC,YAAoC,EACpCC,oBAAoD,EACpDC,aAAsC,EACtCC,eAA0C,CACpD;aALUJ,eAAe,GAAfA;aACAC,YAAY,GAAZA;aACAC,oBAAoB,GAApBA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;IACT;IAEI,6BAA6BC,OAAiB,EAAW;QAC5D,IAAIA,AAAY,UAAZA,SACA,OAAO;QAGX,MAAMC,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;QAGjD,IAAI,CAACA,UACD,OAAO;QAMX,IAAIA,AAAkB,YAAlBA,SAAS,IAAI,EACb,OAAO;QAGX,OAAO,IAAI,CAAC,YAAY,CACnB,GAAG,GACH,SAAS,CAAC;IACnB;IAEO,cAAuB;QAC1B,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,GAAG,SAAS,CAAC;IAC7C;IAEO,wBAAiC;QACpC,MAAMC,+BAA+B,IAAIC;QACzC,OAAOD,6BAA6B,OAAO;IAC/C;IAEO,0CAA0CE,WAA+B,EAAW;QACvF,MAAMC,sCAAsC,IAAIC;QAChD,OAAOD,oCAAoC,OAAO,CAACD;IACvD;IAEA,MAAa,gBAAgBG,MAA6B,EAAoB;QAC1E,IACI,CAAC,IAAI,CAAC,4BAA4B,MAClC,CAAC,IAAI,CAAC,eAAe,CAAC,sBAAsB,IAE5C,OAAO;QAGX,MAAMC,yBAAyB,IAAIC,gBAAgB,IAAI,CAAC,eAAe;QACvE,OAAO,MAAMD,uBAAuB,OAAO,CAACD;IAChD;IAEA,MAAa,uBAAuBA,MAAoC,EAAoB;QACxF,MAAMG,YAAY,IAAI,CAAC,4BAA4B;QACnD,MAAMC,cAAc,IAAI,CAAC,eAAe,CAAC,sBAAsB;QAE/D,IAAI,CAACD,aAAa,CAACC,aACf,OAAO;QAGX,MAAMC,gCAAgC,IAAIC,uBAAuB,IAAI,CAAC,eAAe;QACrF,OAAO,MAAMD,8BAA8B,OAAO,CAACL;IACvD;IAEA,MAAa,sBAAsBA,MAA6B,EAAiB;QAC7E,MAAMO,SAAS,MAAM,IAAI,CAAC,eAAe,CAACP;QAC1C,IAAI,CAACO,QACD,MAAM,IAAIC;IAElB;IAEA,MAAa,6BAA6BR,MAAoC,EAAiB;QAC3F,MAAMO,SAAS,MAAM,IAAI,CAAC,sBAAsB,CAACP;QACjD,IAAI,CAACO,QACD,MAAM,IAAIC;IAElB;IAEA,MAAa,uBAAuBC,GAA0B,EAAoB;QAC9E,IACI,CAAC,IAAI,CAAC,4BAA4B,MAClC,CAAC,IAAI,CAAC,eAAe,CAAC,sBAAsB,IAE5C,OAAO;QAGX,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC;YAAE,aAAaA,IAAI,WAAW;YAAE,KAAK;QAAI;IACtF;IAEA,MAAa,yBAAyBA,GAA0B,EAAoB;QAChF,IACI,CAAC,IAAI,CAAC,4BAA4B,MAClC,CAAC,IAAI,CAAC,eAAe,CAAC,sBAAsB,IAE5C,OAAO;QAGX,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC;YAAE,aAAaA,IAAI,WAAW;YAAE,KAAK;QAAI;IAC/E;IAEA,MAAa,2BAA2BA,GAA0B,EAAoB;QAClF,IAAI,CAAC,IAAI,CAAC,4BAA4B,IAClC,OAAO;QAGX,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,sBAAsB,IAC5C,OAAO;QAGX,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC;YAC9B,aAAaA,IAAI,WAAW;YAC5B,KAAK;YACL,mBAAmB;QACvB;IACJ;IAIO,sBAAsBZ,WAA+B,EAA+B;QACvF,OAAO,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAACA;IACnD;IAEA,MAAa,2BAA2BG,MAAsB,EAK5D;QACE,MAAMU,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAACV;QAIhD,MAAMW,qBAAqB,IAAI,CAAC,wBAAwB;QACxD,OAAOC,QAAQ,GAAG,CACdF,KAAK,GAAG,CAAC,OAAMD,MAAQ;gBACnB,IAAIA,IAAI,EAAE;gBACV,aAAa,MAAME,mBAAmB,OAAO,CAACF,IAAI,WAAW;YACjE;IAER;IAEQ,2BAAmD;QACvD,MAAMI,+BAA+B,IAAIC,sBAAsB,IAAI,CAAC,eAAe;QACnF,IAAI,CAAC,IAAI,CAAC,WAAW,IACjB,OAAOD;QAEX,OAAO,IAAIE,+BACP,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,oBAAoB,EACzBF;IAER;IAEA,MAAa,0BAA0BG,EAAU,EAA+B;QAC5E,MAAMP,MAAM,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAACO;QAC7C,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAACP,KAAK,eAAe,EAAE;IAClE;AACJ;AAEO,MAAMQ,gDAAyBC,qBAAqB;IACvD,aAAaC;IACb,gBAAgBhC;IAChB,cAAc;QACViC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/flp/FolderLevelPermissions/useCases/GetDefaultPermissions/GetDefaultPermissionsWithTeams.d.ts

@@ -6,6 +6,12 @@ export declare class GetDefaultPermissionsWithTeams implements IGetDefaultPermis
     private identityContext;
     private listUserTeamsUseCase;
     private decoretee;
+    /**
+     * The identity's teams, loaded once per instance and identity. An instance lives for one
+     * `getDefaultPermissions` call or one `listFolderLevelPermissions` call, so nothing is kept
+     * between calls or requests.
+     */
+    private loaded;
     constructor(identityContext: IdentityContext.Interface, listUserTeamsUseCase: ListUserTeamsUseCase.Interface, decoretee: IGetDefaultPermissions);
     execute(originalPermissions: FolderPermission[]): Promise<FolderPermission[]>;
 }

package/features/flp/FolderLevelPermissions/useCases/GetDefaultPermissions/GetDefaultPermissionsWithTeams.js

@@ -1,13 +1,17 @@
 class GetDefaultPermissionsWithTeams {
     constructor(identityContext, listUserTeamsUseCase, decoretee){
+        this.loaded = null;
         this.identityContext = identityContext;
         this.listUserTeamsUseCase = listUserTeamsUseCase;
         this.decoretee = decoretee;
     }
     async execute(originalPermissions) {
         const identity = this.identityContext.getIdentity();
-        const listTeamsResult = await this.listUserTeamsUseCase.execute(identity.id);
-        const identityTeams = listTeamsResult.isOk() ? listTeamsResult.value : [];
+        if (!this.loaded || this.loaded.identityId !== identity.id) this.loaded = {
+            identityId: identity.id,
+            teams: this.listUserTeamsUseCase.execute(identity.id).then((result)=>result.isOk() ? result.value : [])
+        };
+        const identityTeams = await this.loaded.teams;
         const permissions = [
             ...originalPermissions
         ];

package/features/flp/FolderLevelPermissions/useCases/GetDefaultPermissions/GetDefaultPermissionsWithTeams.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/flp/FolderLevelPermissions/useCases/GetDefaultPermissions/GetDefaultPermissionsWithTeams.js","sources":["../../../../../../src/features/flp/FolderLevelPermissions/useCases/GetDefaultPermissions/GetDefaultPermissionsWithTeams.ts"],"sourcesContent":["import type { IGetDefaultPermissions } from \"./IGetDefaultPermissions.js\";\nimport type { FolderPermission } from \"~/flp/flp.types.js\";\nimport type { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { ListUserTeamsUseCase } from \"@webiny/api-core/features/users/ListUserTeams/index.js\";\nimport type { Team } from \"@webiny/api-core/types/security.js\";\n\nexport class GetDefaultPermissionsWithTeams implements IGetDefaultPermissions {\n    private identityContext: IdentityContext.Interface;\n    private listUserTeamsUseCase: ListUserTeamsUseCase.Interface;\n    private decoretee: IGetDefaultPermissions;\n\n    constructor(\n        identityContext: IdentityContext.Interface,\n        listUserTeamsUseCase: ListUserTeamsUseCase.Interface,\n        decoretee: IGetDefaultPermissions\n    ) {\n        this.identityContext = identityContext;\n        this.listUserTeamsUseCase = listUserTeamsUseCase;\n        this.decoretee = decoretee;\n    }\n\n    async execute(originalPermissions: FolderPermission[]) {\n        /**\n         * Retrieves the list of teams the current identity belongs to and checks if any of these teams\n         * have permissions for the folder. If a team has permissions, the current identity is granted\n         * the same permissions, inheriting them from the team.\n         */\n        const identity = this.identityContext.getIdentity();\n\n        // Get teams for current identity\n        const listTeamsResult = await this.listUserTeamsUseCase.execute(identity.id);\n        const identityTeams: Team[] = listTeamsResult.isOk() ? listTeamsResult.value : [];\n\n        const permissions = [...originalPermissions]; // Clone the original permissions to avoid mutation.\n\n        if (identity && identityTeams.length) {\n            for (const identityTeam of identityTeams) {\n                // Check if the team has permissions for the folder.\n                const teamPermission = permissions.find(\n                    p => p.target === `team:${identityTeam.slug}`\n                );\n\n                if (teamPermission) {\n                    // Grant the current identity the same permissions as the team, marking them as inherited.\n                    permissions.push({\n                        target: `admin:${identity.id}`,\n                        level: teamPermission.level,\n                        inheritedFrom: \"team:\" + identityTeam.slug\n                    });\n                }\n            }\n        }\n\n        return await this.decoretee.execute(permissions);\n    }\n}\n"],"names":["GetDefaultPermissionsWithTeams","identityContext","listUserTeamsUseCase","decoretee","originalPermissions","identity","listTeamsResult","identityTeams","permissions","identityTeam","teamPermission","p"],"mappings":"AAMO,MAAMA;IAKT,YACIC,eAA0C,EAC1CC,oBAAoD,EACpDC,SAAiC,CACnC;QACE,IAAI,CAAC,eAAe,GAAGF;QACvB,IAAI,CAAC,oBAAoB,GAAGC;QAC5B,IAAI,CAAC,SAAS,GAAGC;IACrB;IAEA,MAAM,QAAQC,mBAAuC,EAAE;QAMnD,MAAMC,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;QAGjD,MAAMC,kBAAkB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAACD,SAAS,EAAE;QAC3E,MAAME,gBAAwBD,gBAAgB,IAAI,KAAKA,gBAAgB,KAAK,GAAG,EAAE;QAEjF,MAAME,cAAc;eAAIJ;SAAoB;QAE5C,IAAIC,YAAYE,cAAc,MAAM,EAChC,KAAK,MAAME,gBAAgBF,cAAe;YAEtC,MAAMG,iBAAiBF,YAAY,IAAI,CACnCG,CAAAA,IAAKA,EAAE,MAAM,KAAK,CAAC,KAAK,EAAEF,aAAa,IAAI,EAAE;YAGjD,IAAIC,gBAEAF,YAAY,IAAI,CAAC;gBACb,QAAQ,CAAC,MAAM,EAAEH,SAAS,EAAE,EAAE;gBAC9B,OAAOK,eAAe,KAAK;gBAC3B,eAAe,UAAUD,aAAa,IAAI;YAC9C;QAER;QAGJ,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACD;IACxC;AACJ"}
+{"version":3,"file":"features/flp/FolderLevelPermissions/useCases/GetDefaultPermissions/GetDefaultPermissionsWithTeams.js","sources":["../../../../../../src/features/flp/FolderLevelPermissions/useCases/GetDefaultPermissions/GetDefaultPermissionsWithTeams.ts"],"sourcesContent":["import type { IGetDefaultPermissions } from \"./IGetDefaultPermissions.js\";\nimport type { FolderPermission } from \"~/flp/flp.types.js\";\nimport type { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { ListUserTeamsUseCase } from \"@webiny/api-core/features/users/ListUserTeams/index.js\";\nimport type { Team } from \"@webiny/api-core/types/security.js\";\n\ninterface LoadedTeams {\n    identityId: string;\n    teams: Promise<Team[]>;\n}\n\nexport class GetDefaultPermissionsWithTeams implements IGetDefaultPermissions {\n    private identityContext: IdentityContext.Interface;\n    private listUserTeamsUseCase: ListUserTeamsUseCase.Interface;\n    private decoretee: IGetDefaultPermissions;\n    /**\n     * The identity's teams, loaded once per instance and identity. An instance lives for one\n     * `getDefaultPermissions` call or one `listFolderLevelPermissions` call, so nothing is kept\n     * between calls or requests.\n     */\n    private loaded: LoadedTeams | null = null;\n\n    constructor(\n        identityContext: IdentityContext.Interface,\n        listUserTeamsUseCase: ListUserTeamsUseCase.Interface,\n        decoretee: IGetDefaultPermissions\n    ) {\n        this.identityContext = identityContext;\n        this.listUserTeamsUseCase = listUserTeamsUseCase;\n        this.decoretee = decoretee;\n    }\n\n    async execute(originalPermissions: FolderPermission[]) {\n        /**\n         * Retrieves the list of teams the current identity belongs to and checks if any of these teams\n         * have permissions for the folder. If a team has permissions, the current identity is granted\n         * the same permissions, inheriting them from the team.\n         */\n        const identity = this.identityContext.getIdentity();\n\n        // Get teams for current identity (once per instance and identity).\n        if (!this.loaded || this.loaded.identityId !== identity.id) {\n            this.loaded = {\n                identityId: identity.id,\n                teams: this.listUserTeamsUseCase.execute(identity.id).then(result => {\n                    return result.isOk() ? result.value : [];\n                })\n            };\n        }\n        const identityTeams: Team[] = await this.loaded.teams;\n\n        const permissions = [...originalPermissions]; // Clone the original permissions to avoid mutation.\n\n        if (identity && identityTeams.length) {\n            for (const identityTeam of identityTeams) {\n                // Check if the team has permissions for the folder.\n                const teamPermission = permissions.find(\n                    p => p.target === `team:${identityTeam.slug}`\n                );\n\n                if (teamPermission) {\n                    // Grant the current identity the same permissions as the team, marking them as inherited.\n                    permissions.push({\n                        target: `admin:${identity.id}`,\n                        level: teamPermission.level,\n                        inheritedFrom: \"team:\" + identityTeam.slug\n                    });\n                }\n            }\n        }\n\n        return await this.decoretee.execute(permissions);\n    }\n}\n"],"names":["GetDefaultPermissionsWithTeams","identityContext","listUserTeamsUseCase","decoretee","originalPermissions","identity","result","identityTeams","permissions","identityTeam","teamPermission","p"],"mappings":"AAWO,MAAMA;IAWT,YACIC,eAA0C,EAC1CC,oBAAoD,EACpDC,SAAiC,CACnC;QAPD,KACO,MAAM,GAAuB;QAOjC,IAAI,CAAC,eAAe,GAAGF;QACvB,IAAI,CAAC,oBAAoB,GAAGC;QAC5B,IAAI,CAAC,SAAS,GAAGC;IACrB;IAEA,MAAM,QAAQC,mBAAuC,EAAE;QAMnD,MAAMC,WAAW,IAAI,CAAC,eAAe,CAAC,WAAW;QAGjD,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,KAAKA,SAAS,EAAE,EACtD,IAAI,CAAC,MAAM,GAAG;YACV,YAAYA,SAAS,EAAE;YACvB,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAACA,SAAS,EAAE,EAAE,IAAI,CAACC,CAAAA,SAChDA,OAAO,IAAI,KAAKA,OAAO,KAAK,GAAG,EAAE;QAEhD;QAEJ,MAAMC,gBAAwB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK;QAErD,MAAMC,cAAc;eAAIJ;SAAoB;QAE5C,IAAIC,YAAYE,cAAc,MAAM,EAChC,KAAK,MAAME,gBAAgBF,cAAe;YAEtC,MAAMG,iBAAiBF,YAAY,IAAI,CACnCG,CAAAA,IAAKA,EAAE,MAAM,KAAK,CAAC,KAAK,EAAEF,aAAa,IAAI,EAAE;YAGjD,IAAIC,gBAEAF,YAAY,IAAI,CAAC;gBACb,QAAQ,CAAC,MAAM,EAAEH,SAAS,EAAE,EAAE;gBAC9B,OAAOK,eAAe,KAAK;gBAC3B,eAAe,UAAUD,aAAa,IAAI;YAC9C;QAER;QAGJ,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACD;IACxC;AACJ"}

package/features/flp/GetFlp/decorators/GetFlpWithCodeFlps.d.ts

@@ -0,0 +1,13 @@
+import { GetFlpUseCase } from "../abstractions.js";
+import { CodeFlpsProvider } from "../../../../features/flp/shared/index.js";
+import type { FolderLevelPermission } from "../../../../flp/flp.types.js";
+declare class GetFlpWithCodeFlpsImpl implements GetFlpUseCase.Interface {
+    private codeFlpsProvider;
+    private decoratee;
+    constructor(codeFlpsProvider: CodeFlpsProvider.Interface, decoratee: GetFlpUseCase.Interface);
+    execute(id: string): Promise<FolderLevelPermission | null>;
+}
+export declare const GetFlpWithCodeFlps: typeof GetFlpWithCodeFlpsImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("../abstractions.js").IGetFolderPermission>;
+};
+export {};

package/features/flp/GetFlp/decorators/GetFlpWithCodeFlps.js

@@ -0,0 +1,26 @@
+import { GetFlpUseCase } from "../abstractions.js";
+import { CodeFlpMerger, CodeFlpsProvider } from "../../shared/index.js";
+class GetFlpWithCodeFlpsImpl {
+    constructor(codeFlpsProvider, decoratee){
+        this.codeFlpsProvider = codeFlpsProvider;
+        this.decoratee = decoratee;
+    }
+    async execute(id) {
+        const flp = await this.decoratee.execute(id);
+        if (!flp) return null;
+        const codePermissions = await this.codeFlpsProvider.getPermissions({
+            type: flp.type,
+            path: flp.path
+        });
+        return CodeFlpMerger.merge(flp, codePermissions);
+    }
+}
+const GetFlpWithCodeFlps = GetFlpUseCase.createDecorator({
+    decorator: GetFlpWithCodeFlpsImpl,
+    dependencies: [
+        CodeFlpsProvider
+    ]
+});
+export { GetFlpWithCodeFlps };
+
+//# sourceMappingURL=GetFlpWithCodeFlps.js.map

package/features/flp/GetFlp/decorators/GetFlpWithCodeFlps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/flp/GetFlp/decorators/GetFlpWithCodeFlps.js","sources":["../../../../../src/features/flp/GetFlp/decorators/GetFlpWithCodeFlps.ts"],"sourcesContent":["import { GetFlpUseCase } from \"../abstractions.js\";\nimport { CodeFlpMerger, CodeFlpsProvider } from \"~/features/flp/shared/index.js\";\nimport type { FolderLevelPermission } from \"~/flp/flp.types.js\";\n\nclass GetFlpWithCodeFlpsImpl implements GetFlpUseCase.Interface {\n    constructor(\n        private codeFlpsProvider: CodeFlpsProvider.Interface,\n        private decoratee: GetFlpUseCase.Interface\n    ) {}\n\n    async execute(id: string): Promise<FolderLevelPermission | null> {\n        const flp = await this.decoratee.execute(id);\n\n        if (!flp) {\n            return null;\n        }\n\n        const codePermissions = await this.codeFlpsProvider.getPermissions({\n            type: flp.type,\n            path: flp.path\n        });\n\n        return CodeFlpMerger.merge(flp, codePermissions);\n    }\n}\n\nexport const GetFlpWithCodeFlps = GetFlpUseCase.createDecorator({\n    decorator: GetFlpWithCodeFlpsImpl,\n    dependencies: [CodeFlpsProvider]\n});\n"],"names":["GetFlpWithCodeFlpsImpl","codeFlpsProvider","decoratee","id","flp","codePermissions","CodeFlpMerger","GetFlpWithCodeFlps","GetFlpUseCase","CodeFlpsProvider"],"mappings":";;AAIA,MAAMA;IACF,YACYC,gBAA4C,EAC5CC,SAAkC,CAC5C;aAFUD,gBAAgB,GAAhBA;aACAC,SAAS,GAATA;IACT;IAEH,MAAM,QAAQC,EAAU,EAAyC;QAC7D,MAAMC,MAAM,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACD;QAEzC,IAAI,CAACC,KACD,OAAO;QAGX,MAAMC,kBAAkB,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC;YAC/D,MAAMD,IAAI,IAAI;YACd,MAAMA,IAAI,IAAI;QAClB;QAEA,OAAOE,cAAc,KAAK,CAACF,KAAKC;IACpC;AACJ;AAEO,MAAME,qBAAqBC,cAAc,eAAe,CAAC;IAC5D,WAAWR;IACX,cAAc;QAACS;KAAiB;AACpC"}

package/features/flp/GetFlp/feature.d.ts

@@ -1,4 +1,4 @@
 export declare const GetFlpFeature: {
     name: string;
-    register(container: import("@webiny/di").Container, context: import("~/types.js").AcoFolderLevelPermissionsCrud): void;
+    register(container: import("@webiny/di").Container): void;
 };

package/features/flp/GetFlp/feature.js

@@ -1,10 +1,11 @@
 import { createFeature } from "@webiny/feature/api";
 import { GetFlpUseCase } from "./GetFlpUseCase.js";
 import { GetFlpUseCase as external_abstractions_js_GetFlpUseCase } from "./abstractions.js";
+import { AcoFlpCrud } from "../../folder/shared/abstractions.js";
 const GetFlpFeature = createFeature({
     name: "GetFlpFeature",
-    register (container, context) {
-        container.registerFactory(external_abstractions_js_GetFlpUseCase, ()=>new GetFlpUseCase(context.get));
+    register (container) {
+        container.registerFactory(external_abstractions_js_GetFlpUseCase, ()=>new GetFlpUseCase(container.resolve(AcoFlpCrud).get));
     }
 });
 export { GetFlpFeature };

package/features/flp/GetFlp/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/flp/GetFlp/feature.js","sources":["../../../../src/features/flp/GetFlp/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { GetFlpUseCase } from \"./GetFlpUseCase.js\";\nimport { GetFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport type { AcoContext } from \"~/types.js\";\n\nexport const GetFlpFeature = createFeature<AcoContext[\"aco\"][\"flp\"]>({\n    name: \"GetFlpFeature\",\n    register(container, context) {\n        container.registerFactory(UseCaseAbstraction, () => {\n            return new GetFlpUseCase(context.get);\n        });\n    }\n});\n"],"names":["GetFlpFeature","createFeature","container","context","UseCaseAbstraction","GetFlpUseCase"],"mappings":";;;AAKO,MAAMA,gBAAgBC,cAAwC;IACjE,MAAM;IACN,UAASC,SAAS,EAAEC,OAAO;QACvBD,UAAU,eAAe,CAACE,wCAAoB,IACnC,IAAIC,cAAcF,QAAQ,GAAG;IAE5C;AACJ"}
+{"version":3,"file":"features/flp/GetFlp/feature.js","sources":["../../../../src/features/flp/GetFlp/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { GetFlpUseCase } from \"./GetFlpUseCase.js\";\nimport { GetFlpUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { AcoFlpCrud } from \"~/features/folder/shared/abstractions.js\";\n\nexport const GetFlpFeature = createFeature({\n    name: \"GetFlpFeature\",\n    register(container) {\n        container.registerFactory(UseCaseAbstraction, () => {\n            return new GetFlpUseCase(container.resolve(AcoFlpCrud).get);\n        });\n    }\n});\n"],"names":["GetFlpFeature","createFeature","container","UseCaseAbstraction","GetFlpUseCase","AcoFlpCrud"],"mappings":";;;;AAKO,MAAMA,gBAAgBC,cAAc;IACvC,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,eAAe,CAACC,wCAAoB,IACnC,IAAIC,cAAcF,UAAU,OAAO,CAACG,YAAY,GAAG;IAElE;AACJ"}

package/features/flp/ListFlps/decorators/ListFlpsWithCodeFlps.d.ts

@@ -0,0 +1,13 @@
+import { ListFlpsUseCase } from "../abstractions.js";
+import { CodeFlpsProvider } from "../../../../features/flp/shared/index.js";
+import type { FolderLevelPermission, ListFlpsParams } from "../../../../flp/flp.types.js";
+declare class ListFlpsWithCodeFlpsImpl implements ListFlpsUseCase.Interface {
+    private codeFlpsProvider;
+    private decoratee;
+    constructor(codeFlpsProvider: CodeFlpsProvider.Interface, decoratee: ListFlpsUseCase.Interface);
+    execute(params: ListFlpsParams): Promise<FolderLevelPermission[]>;
+}
+export declare const ListFlpsWithCodeFlps: typeof ListFlpsWithCodeFlpsImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("../abstractions.js").IListFlps>;
+};
+export {};

package/features/flp/ListFlps/decorators/ListFlpsWithCodeFlps.js

@@ -0,0 +1,27 @@
+import { ListFlpsUseCase } from "../abstractions.js";
+import { CodeFlpMerger, CodeFlpsProvider } from "../../shared/index.js";
+class ListFlpsWithCodeFlpsImpl {
+    constructor(codeFlpsProvider, decoratee){
+        this.codeFlpsProvider = codeFlpsProvider;
+        this.decoratee = decoratee;
+    }
+    async execute(params) {
+        const flps = await this.decoratee.execute(params);
+        return Promise.all(flps.map(async (flp)=>{
+            const codePermissions = await this.codeFlpsProvider.getPermissions({
+                type: flp.type,
+                path: flp.path
+            });
+            return CodeFlpMerger.merge(flp, codePermissions);
+        }));
+    }
+}
+const ListFlpsWithCodeFlps = ListFlpsUseCase.createDecorator({
+    decorator: ListFlpsWithCodeFlpsImpl,
+    dependencies: [
+        CodeFlpsProvider
+    ]
+});
+export { ListFlpsWithCodeFlps };
+
+//# sourceMappingURL=ListFlpsWithCodeFlps.js.map

package/features/flp/ListFlps/decorators/ListFlpsWithCodeFlps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/flp/ListFlps/decorators/ListFlpsWithCodeFlps.js","sources":["../../../../../src/features/flp/ListFlps/decorators/ListFlpsWithCodeFlps.ts"],"sourcesContent":["import { ListFlpsUseCase } from \"../abstractions.js\";\nimport { CodeFlpMerger, CodeFlpsProvider } from \"~/features/flp/shared/index.js\";\nimport type { FolderLevelPermission, ListFlpsParams } from \"~/flp/flp.types.js\";\n\nclass ListFlpsWithCodeFlpsImpl implements ListFlpsUseCase.Interface {\n    constructor(\n        private codeFlpsProvider: CodeFlpsProvider.Interface,\n        private decoratee: ListFlpsUseCase.Interface\n    ) {}\n\n    async execute(params: ListFlpsParams): Promise<FolderLevelPermission[]> {\n        const flps = await this.decoratee.execute(params);\n\n        return Promise.all(\n            flps.map(async flp => {\n                const codePermissions = await this.codeFlpsProvider.getPermissions({\n                    type: flp.type,\n                    path: flp.path\n                });\n\n                return CodeFlpMerger.merge(flp, codePermissions);\n            })\n        );\n    }\n}\n\nexport const ListFlpsWithCodeFlps = ListFlpsUseCase.createDecorator({\n    decorator: ListFlpsWithCodeFlpsImpl,\n    dependencies: [CodeFlpsProvider]\n});\n"],"names":["ListFlpsWithCodeFlpsImpl","codeFlpsProvider","decoratee","params","flps","Promise","flp","codePermissions","CodeFlpMerger","ListFlpsWithCodeFlps","ListFlpsUseCase","CodeFlpsProvider"],"mappings":";;AAIA,MAAMA;IACF,YACYC,gBAA4C,EAC5CC,SAAoC,CAC9C;aAFUD,gBAAgB,GAAhBA;aACAC,SAAS,GAATA;IACT;IAEH,MAAM,QAAQC,MAAsB,EAAoC;QACpE,MAAMC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACD;QAE1C,OAAOE,QAAQ,GAAG,CACdD,KAAK,GAAG,CAAC,OAAME;YACX,MAAMC,kBAAkB,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC;gBAC/D,MAAMD,IAAI,IAAI;gBACd,MAAMA,IAAI,IAAI;YAClB;YAEA,OAAOE,cAAc,KAAK,CAACF,KAAKC;QACpC;IAER;AACJ;AAEO,MAAME,uBAAuBC,gBAAgB,eAAe,CAAC;IAChE,WAAWV;IACX,cAAc;QAACW;KAAiB;AACpC"}

package/features/flp/ListFlps/feature.d.ts

@@ -1,4 +1,4 @@
 export declare const ListFlpsFeature: {
     name: string;
-    register(container: import("@webiny/di").Container, context: import("~/types.js").AcoFolderLevelPermissionsCrud): void;
+    register(container: import("@webiny/di").Container): void;
 };