@webiny/api-headless-cms-scheduler 6.5.1 → 6.5.2-beta.1

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnEntryDeleteEventHandler.d.ts

@@ -1,6 +1,7 @@
 import { EntryAfterDeleteEventHandler } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events";
 import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler/exports/api/scheduler.js";
 import { Logger } from "@webiny/api-core/exports/api/logger.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 /**
  * Cancels scheduled actions when an entry is deleted
  *
@@ -12,7 +13,8 @@ declare class CancelScheduledActionOnEntryDeleteHandlerImpl implements EntryAfte
     private listScheduledActions;
     private cancelScheduledAction;
     private logger;
-    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledAction: CancelScheduledActionUseCase.Interface, logger: Logger.Interface);
+    private identityContext;
+    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledAction: CancelScheduledActionUseCase.Interface, logger: Logger.Interface, identityContext: IdentityContext.Interface);
     handle(event: EntryAfterDeleteEventHandler.Event): Promise<void>;
     private listSchedules;
 }

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnEntryDeleteEventHandler.js

@@ -1,19 +1,21 @@
 import { EntryAfterDeleteEventHandler } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events";
 import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler/exports/api/scheduler.js";
 import { Logger } from "@webiny/api-core/exports/api/logger.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { createNamespace } from "../../utils/namespace.js";
 class CancelScheduledActionOnEntryDeleteHandlerImpl {
-    constructor(listScheduledActions, cancelScheduledAction, logger){
+    constructor(listScheduledActions, cancelScheduledAction, logger, identityContext){
         this.listScheduledActions = listScheduledActions;
         this.cancelScheduledAction = cancelScheduledAction;
         this.logger = logger;
+        this.identityContext = identityContext;
     }
     async handle(event) {
         const { entry, model } = event.payload;
         if (model.isPrivate) return;
-        const schedules = await this.listSchedules(model.modelId, entry.entryId);
+        const schedules = await this.identityContext.withoutAuthorization(()=>this.listSchedules(model.modelId, entry.entryId));
         for (const action of schedules){
-            const cancelRes = await this.cancelScheduledAction.execute(action);
+            const cancelRes = await this.identityContext.withoutAuthorization(()=>this.cancelScheduledAction.execute(action));
             cancelRes.isFail();
         }
     }
@@ -39,7 +41,8 @@ const CancelScheduledActionOnEntryDeleteEventHandler = EntryAfterDeleteEventHand
     dependencies: [
         ListScheduledActionsUseCase,
         CancelScheduledActionUseCase,
-        Logger
+        Logger,
+        IdentityContext
     ]
 });
 export { CancelScheduledActionOnEntryDeleteEventHandler };

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnEntryDeleteEventHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnEntryDeleteEventHandler.js","sources":["../../../src/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnEntryDeleteEventHandler.ts"],"sourcesContent":["import { EntryAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events\";\nimport {\n    CancelScheduledActionUseCase,\n    ListScheduledActionsUseCase\n} from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { Logger } from \"@webiny/api-core/exports/api/logger.js\";\nimport { createNamespace } from \"~/utils/namespace.js\";\n\n/**\n * Cancels scheduled actions when an entry is deleted\n *\n * When a user deletes an entry, any scheduled publish/unpublish\n * actions for all of its revisions should be canceled since the entry\n * no longer exists.\n */\nclass CancelScheduledActionOnEntryDeleteHandlerImpl\n    implements EntryAfterDeleteEventHandler.Interface\n{\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledAction: CancelScheduledActionUseCase.Interface,\n        private logger: Logger.Interface\n    ) {}\n\n    async handle(event: EntryAfterDeleteEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        const schedules = await this.listSchedules(model.modelId, entry.entryId);\n        for (const action of schedules) {\n            const cancelRes = await this.cancelScheduledAction.execute(action);\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // The entry was deleted successfully, cancelling scheduled actions is best-effort.\n            }\n        }\n    }\n\n    private async listSchedules(modelId: string, entryId: string) {\n        const actionsResult = await this.listScheduledActions.execute({\n            limit: 10000,\n            where: {\n                namespace: createNamespace({ modelId }),\n                targetId_startsWith: `${entryId}#`\n            }\n        });\n\n        if (actionsResult.isFail()) {\n            this.logger.error(actionsResult.error);\n            return [];\n        }\n\n        return actionsResult.value.items;\n    }\n}\n\nexport const CancelScheduledActionOnEntryDeleteEventHandler =\n    EntryAfterDeleteEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnEntryDeleteHandlerImpl,\n        dependencies: [ListScheduledActionsUseCase, CancelScheduledActionUseCase, Logger]\n    });\n"],"names":["CancelScheduledActionOnEntryDeleteHandlerImpl","listScheduledActions","cancelScheduledAction","logger","event","entry","model","schedules","action","cancelRes","modelId","entryId","actionsResult","createNamespace","CancelScheduledActionOnEntryDeleteEventHandler","EntryAfterDeleteEventHandler","ListScheduledActionsUseCase","CancelScheduledActionUseCase","Logger"],"mappings":";;;;AAeA,MAAMA;IAGF,YACYC,oBAA2D,EAC3DC,qBAA6D,EAC7DC,MAAwB,CAClC;aAHUF,oBAAoB,GAApBA;aACAC,qBAAqB,GAArBA;aACAC,MAAM,GAANA;IACT;IAEH,MAAM,OAAOC,KAAyC,EAAiB;QACnE,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGF,MAAM,OAAO;QAGtC,IAAIE,MAAM,SAAS,EACf;QAGJ,MAAMC,YAAY,MAAM,IAAI,CAAC,aAAa,CAACD,MAAM,OAAO,EAAED,MAAM,OAAO;QACvE,KAAK,MAAMG,UAAUD,UAAW;YAC5B,MAAME,YAAY,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAACD;YACvDC,UAAU,MAAM;QAIxB;IACJ;IAEA,MAAc,cAAcC,OAAe,EAAEC,OAAe,EAAE;QAC1D,MAAMC,gBAAgB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;YAC1D,OAAO;YACP,OAAO;gBACH,WAAWC,gBAAgB;oBAAEH;gBAAQ;gBACrC,qBAAqB,GAAGC,QAAQ,CAAC,CAAC;YACtC;QACJ;QAEA,IAAIC,cAAc,MAAM,IAAI;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAACA,cAAc,KAAK;YACrC,OAAO,EAAE;QACb;QAEA,OAAOA,cAAc,KAAK,CAAC,KAAK;IACpC;AACJ;AAEO,MAAME,iDACTC,6BAA6B,oBAAoB,CAAC;IAC9C,gBAAgBf;IAChB,cAAc;QAACgB;QAA6BC;QAA8BC;KAAO;AACrF"}
+{"version":3,"file":"features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnEntryDeleteEventHandler.js","sources":["../../../src/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnEntryDeleteEventHandler.ts"],"sourcesContent":["import { EntryAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events\";\nimport {\n    CancelScheduledActionUseCase,\n    ListScheduledActionsUseCase\n} from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { Logger } from \"@webiny/api-core/exports/api/logger.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { createNamespace } from \"~/utils/namespace.js\";\n\n/**\n * Cancels scheduled actions when an entry is deleted\n *\n * When a user deletes an entry, any scheduled publish/unpublish\n * actions for all of its revisions should be canceled since the entry\n * no longer exists.\n */\nclass CancelScheduledActionOnEntryDeleteHandlerImpl\n    implements EntryAfterDeleteEventHandler.Interface\n{\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledAction: CancelScheduledActionUseCase.Interface,\n        private logger: Logger.Interface,\n        private identityContext: IdentityContext.Interface\n    ) {}\n\n    async handle(event: EntryAfterDeleteEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        /**\n         * System cleanup after a delete the user was allowed to do: list and cancel every schedule\n         * for the deleted target, without the caller's permission checks (the target no longer exists).\n         */\n        const schedules = await this.identityContext.withoutAuthorization(() => {\n            return this.listSchedules(model.modelId, entry.entryId);\n        });\n        for (const action of schedules) {\n            const cancelRes = await this.identityContext.withoutAuthorization(() => {\n                return this.cancelScheduledAction.execute(action);\n            });\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // The entry was deleted successfully, cancelling scheduled actions is best-effort.\n            }\n        }\n    }\n\n    private async listSchedules(modelId: string, entryId: string) {\n        const actionsResult = await this.listScheduledActions.execute({\n            limit: 10000,\n            where: {\n                namespace: createNamespace({ modelId }),\n                targetId_startsWith: `${entryId}#`\n            }\n        });\n\n        if (actionsResult.isFail()) {\n            this.logger.error(actionsResult.error);\n            return [];\n        }\n\n        return actionsResult.value.items;\n    }\n}\n\nexport const CancelScheduledActionOnEntryDeleteEventHandler =\n    EntryAfterDeleteEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnEntryDeleteHandlerImpl,\n        dependencies: [\n            ListScheduledActionsUseCase,\n            CancelScheduledActionUseCase,\n            Logger,\n            IdentityContext\n        ]\n    });\n"],"names":["CancelScheduledActionOnEntryDeleteHandlerImpl","listScheduledActions","cancelScheduledAction","logger","identityContext","event","entry","model","schedules","action","cancelRes","modelId","entryId","actionsResult","createNamespace","CancelScheduledActionOnEntryDeleteEventHandler","EntryAfterDeleteEventHandler","ListScheduledActionsUseCase","CancelScheduledActionUseCase","Logger","IdentityContext"],"mappings":";;;;;AAgBA,MAAMA;IAGF,YACYC,oBAA2D,EAC3DC,qBAA6D,EAC7DC,MAAwB,EACxBC,eAA0C,CACpD;aAJUH,oBAAoB,GAApBA;aACAC,qBAAqB,GAArBA;aACAC,MAAM,GAANA;aACAC,eAAe,GAAfA;IACT;IAEH,MAAM,OAAOC,KAAyC,EAAiB;QACnE,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGF,MAAM,OAAO;QAGtC,IAAIE,MAAM,SAAS,EACf;QAOJ,MAAMC,YAAY,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,IACvD,IAAI,CAAC,aAAa,CAACD,MAAM,OAAO,EAAED,MAAM,OAAO;QAE1D,KAAK,MAAMG,UAAUD,UAAW;YAC5B,MAAME,YAAY,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,IACvD,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAACD;YAE1CC,UAAU,MAAM;QAIxB;IACJ;IAEA,MAAc,cAAcC,OAAe,EAAEC,OAAe,EAAE;QAC1D,MAAMC,gBAAgB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;YAC1D,OAAO;YACP,OAAO;gBACH,WAAWC,gBAAgB;oBAAEH;gBAAQ;gBACrC,qBAAqB,GAAGC,QAAQ,CAAC,CAAC;YACtC;QACJ;QAEA,IAAIC,cAAc,MAAM,IAAI;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAACA,cAAc,KAAK;YACrC,OAAO,EAAE;QACb;QAEA,OAAOA,cAAc,KAAK,CAAC,KAAK;IACpC;AACJ;AAEO,MAAME,iDACTC,6BAA6B,oBAAoB,CAAC;IAC9C,gBAAgBhB;IAChB,cAAc;QACViB;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnRevisionDeleteEventHandler.d.ts

@@ -1,6 +1,7 @@
 import { EntryAfterDeleteEventHandler } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events";
 import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler/exports/api/scheduler.js";
 import { Logger } from "@webiny/api-core/exports/api/logger.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 /**
  * Cancels scheduled actions when an entry revision is deleted
  *
@@ -12,7 +13,8 @@ declare class CancelScheduledActionOnDeleteHandlerImpl implements EntryAfterDele
     private listScheduledActions;
     private cancelScheduledAction;
     private logger;
-    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledAction: CancelScheduledActionUseCase.Interface, logger: Logger.Interface);
+    private identityContext;
+    constructor(listScheduledActions: ListScheduledActionsUseCase.Interface, cancelScheduledAction: CancelScheduledActionUseCase.Interface, logger: Logger.Interface, identityContext: IdentityContext.Interface);
     handle(event: EntryAfterDeleteEventHandler.Event): Promise<void>;
 }
 export declare const CancelScheduledActionOnRevisionDeleteEventHandler: typeof CancelScheduledActionOnDeleteHandlerImpl & {

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnRevisionDeleteEventHandler.js

@@ -1,26 +1,28 @@
 import { EntryAfterDeleteEventHandler } from "@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events";
 import { CancelScheduledActionUseCase, ListScheduledActionsUseCase } from "@webiny/api-scheduler/exports/api/scheduler.js";
 import { Logger } from "@webiny/api-core/exports/api/logger.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { createNamespace } from "../../utils/namespace.js";
 class CancelScheduledActionOnDeleteHandlerImpl {
-    constructor(listScheduledActions, cancelScheduledAction, logger){
+    constructor(listScheduledActions, cancelScheduledAction, logger, identityContext){
         this.listScheduledActions = listScheduledActions;
         this.cancelScheduledAction = cancelScheduledAction;
         this.logger = logger;
+        this.identityContext = identityContext;
     }
     async handle(event) {
         const { entry, model } = event.payload;
         if (model.isPrivate) return;
-        const actionsResult = await this.listScheduledActions.execute({
-            where: {
-                namespace: createNamespace(model),
-                targetId: entry.id
-            }
-        });
+        const actionsResult = await this.identityContext.withoutAuthorization(()=>this.listScheduledActions.execute({
+                where: {
+                    namespace: createNamespace(model),
+                    targetId: entry.id
+                }
+            }));
         if (actionsResult.isFail()) return void this.logger.error(actionsResult.error);
         const actions = actionsResult.value.items;
         for (const action of actions){
-            const cancelRes = await this.cancelScheduledAction.execute(action);
+            const cancelRes = await this.identityContext.withoutAuthorization(()=>this.cancelScheduledAction.execute(action));
             cancelRes.isFail();
         }
     }
@@ -30,7 +32,8 @@ const CancelScheduledActionOnRevisionDeleteEventHandler = EntryAfterDeleteEventH
     dependencies: [
         ListScheduledActionsUseCase,
         CancelScheduledActionUseCase,
-        Logger
+        Logger,
+        IdentityContext
     ]
 });
 export { CancelScheduledActionOnRevisionDeleteEventHandler };

package/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnRevisionDeleteEventHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnRevisionDeleteEventHandler.js","sources":["../../../src/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnRevisionDeleteEventHandler.ts"],"sourcesContent":["import { EntryAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events\";\nimport {\n    CancelScheduledActionUseCase,\n    ListScheduledActionsUseCase\n} from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { Logger } from \"@webiny/api-core/exports/api/logger.js\";\nimport { createNamespace } from \"~/utils/namespace.js\";\n\n/**\n * Cancels scheduled actions when an entry revision is deleted\n *\n * When a user deletes an entry revision, any scheduled publish/unpublish\n * action for that revision should be canceled since the revision\n * no longer exists.\n */\nclass CancelScheduledActionOnDeleteHandlerImpl implements EntryAfterDeleteEventHandler.Interface {\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledAction: CancelScheduledActionUseCase.Interface,\n        private logger: Logger.Interface\n    ) {}\n\n    async handle(event: EntryAfterDeleteEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        const actionsResult = await this.listScheduledActions.execute({\n            where: {\n                namespace: createNamespace(model),\n                targetId: entry.id\n            }\n        });\n\n        if (actionsResult.isFail()) {\n            this.logger.error(actionsResult.error);\n            return;\n        }\n\n        const actions = actionsResult.value.items;\n\n        for (const action of actions) {\n            const cancelRes = await this.cancelScheduledAction.execute(action);\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // Entry was deleted successfully, cancelling scheduled actions is best-effort.\n            }\n        }\n    }\n}\n\nexport const CancelScheduledActionOnRevisionDeleteEventHandler =\n    EntryAfterDeleteEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnDeleteHandlerImpl,\n        dependencies: [ListScheduledActionsUseCase, CancelScheduledActionUseCase, Logger]\n    });\n"],"names":["CancelScheduledActionOnDeleteHandlerImpl","listScheduledActions","cancelScheduledAction","logger","event","entry","model","actionsResult","createNamespace","actions","action","cancelRes","CancelScheduledActionOnRevisionDeleteEventHandler","EntryAfterDeleteEventHandler","ListScheduledActionsUseCase","CancelScheduledActionUseCase","Logger"],"mappings":";;;;AAeA,MAAMA;IACF,YACYC,oBAA2D,EAC3DC,qBAA6D,EAC7DC,MAAwB,CAClC;aAHUF,oBAAoB,GAApBA;aACAC,qBAAqB,GAArBA;aACAC,MAAM,GAANA;IACT;IAEH,MAAM,OAAOC,KAAyC,EAAiB;QACnE,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGF,MAAM,OAAO;QAGtC,IAAIE,MAAM,SAAS,EACf;QAGJ,MAAMC,gBAAgB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;YAC1D,OAAO;gBACH,WAAWC,gBAAgBF;gBAC3B,UAAUD,MAAM,EAAE;YACtB;QACJ;QAEA,IAAIE,cAAc,MAAM,IAAI,YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAACA,cAAc,KAAK;QAIzC,MAAME,UAAUF,cAAc,KAAK,CAAC,KAAK;QAEzC,KAAK,MAAMG,UAAUD,QAAS;YAC1B,MAAME,YAAY,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAACD;YACvDC,UAAU,MAAM;QAIxB;IACJ;AACJ;AAEO,MAAMC,oDACTC,6BAA6B,oBAAoB,CAAC;IAC9C,gBAAgBb;IAChB,cAAc;QAACc;QAA6BC;QAA8BC;KAAO;AACrF"}
+{"version":3,"file":"features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnRevisionDeleteEventHandler.js","sources":["../../../src/features/CancelScheduledActionOnEntryChange/CancelScheduledActionOnRevisionDeleteEventHandler.ts"],"sourcesContent":["import { EntryAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentEntry/DeleteEntry/events\";\nimport {\n    CancelScheduledActionUseCase,\n    ListScheduledActionsUseCase\n} from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { Logger } from \"@webiny/api-core/exports/api/logger.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { createNamespace } from \"~/utils/namespace.js\";\n\n/**\n * Cancels scheduled actions when an entry revision is deleted\n *\n * When a user deletes an entry revision, any scheduled publish/unpublish\n * action for that revision should be canceled since the revision\n * no longer exists.\n */\nclass CancelScheduledActionOnDeleteHandlerImpl implements EntryAfterDeleteEventHandler.Interface {\n    constructor(\n        private listScheduledActions: ListScheduledActionsUseCase.Interface,\n        private cancelScheduledAction: CancelScheduledActionUseCase.Interface,\n        private logger: Logger.Interface,\n        private identityContext: IdentityContext.Interface\n    ) {}\n\n    async handle(event: EntryAfterDeleteEventHandler.Event): Promise<void> {\n        const { entry, model } = event.payload;\n\n        // Skip private models\n        if (model.isPrivate) {\n            return;\n        }\n\n        /**\n         * System cleanup after a delete the user was allowed to do: list and cancel every schedule\n         * for the deleted target, without the caller's permission checks (the target no longer exists).\n         */\n        const actionsResult = await this.identityContext.withoutAuthorization(() => {\n            return this.listScheduledActions.execute({\n                where: {\n                    namespace: createNamespace(model),\n                    targetId: entry.id\n                }\n            });\n        });\n\n        if (actionsResult.isFail()) {\n            this.logger.error(actionsResult.error);\n            return;\n        }\n\n        const actions = actionsResult.value.items;\n\n        for (const action of actions) {\n            const cancelRes = await this.identityContext.withoutAuthorization(() => {\n                return this.cancelScheduledAction.execute(action);\n            });\n            if (cancelRes.isFail()) {\n                // Silently ignore errors - this is non-critical cleanup.\n                // Entry was deleted successfully, cancelling scheduled actions is best-effort.\n            }\n        }\n    }\n}\n\nexport const CancelScheduledActionOnRevisionDeleteEventHandler =\n    EntryAfterDeleteEventHandler.createImplementation({\n        implementation: CancelScheduledActionOnDeleteHandlerImpl,\n        dependencies: [\n            ListScheduledActionsUseCase,\n            CancelScheduledActionUseCase,\n            Logger,\n            IdentityContext\n        ]\n    });\n"],"names":["CancelScheduledActionOnDeleteHandlerImpl","listScheduledActions","cancelScheduledAction","logger","identityContext","event","entry","model","actionsResult","createNamespace","actions","action","cancelRes","CancelScheduledActionOnRevisionDeleteEventHandler","EntryAfterDeleteEventHandler","ListScheduledActionsUseCase","CancelScheduledActionUseCase","Logger","IdentityContext"],"mappings":";;;;;AAgBA,MAAMA;IACF,YACYC,oBAA2D,EAC3DC,qBAA6D,EAC7DC,MAAwB,EACxBC,eAA0C,CACpD;aAJUH,oBAAoB,GAApBA;aACAC,qBAAqB,GAArBA;aACAC,MAAM,GAANA;aACAC,eAAe,GAAfA;IACT;IAEH,MAAM,OAAOC,KAAyC,EAAiB;QACnE,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGF,MAAM,OAAO;QAGtC,IAAIE,MAAM,SAAS,EACf;QAOJ,MAAMC,gBAAgB,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,IAC3D,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;gBACrC,OAAO;oBACH,WAAWC,gBAAgBF;oBAC3B,UAAUD,MAAM,EAAE;gBACtB;YACJ;QAGJ,IAAIE,cAAc,MAAM,IAAI,YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAACA,cAAc,KAAK;QAIzC,MAAME,UAAUF,cAAc,KAAK,CAAC,KAAK;QAEzC,KAAK,MAAMG,UAAUD,QAAS;YAC1B,MAAME,YAAY,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,IACvD,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAACD;YAE1CC,UAAU,MAAM;QAIxB;IACJ;AACJ;AAEO,MAAMC,oDACTC,6BAA6B,oBAAoB,CAAC;IAC9C,gBAAgBd;IAChB,cAAc;QACVe;QACAC;QACAC;QACAC;KACH;AACL"}

package/features/NamespaceHandler/NamespaceHandler.d.ts

@@ -1,11 +1,13 @@
 import { NamespaceHandler as NamespaceHandlerAbstraction } from "@webiny/api-scheduler/exports/api/scheduler.js";
 import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
 import { GetEntryByIdUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetEntryById/index.js";
+import { AccessControl } from "@webiny/api-headless-cms/features/shared/abstractions.js";
 import type { GenericRecord } from "@webiny/api/types.js";
 declare class NamespaceHandlerImpl implements NamespaceHandlerAbstraction.Interface<GenericRecord> {
     private getModelUseCase;
     private getEntryByIdUseCase;
-    constructor(getModelUseCase: GetModelUseCase.Interface, getEntryByIdUseCase: GetEntryByIdUseCase.Interface);
+    private accessControl;
+    constructor(getModelUseCase: GetModelUseCase.Interface, getEntryByIdUseCase: GetEntryByIdUseCase.Interface, accessControl: AccessControl.Interface);
     canHandle(namespace: string): boolean;
     execute(params: NamespaceHandlerAbstraction.Params): NamespaceHandlerAbstraction.Response<GenericRecord>;
 }

package/features/NamespaceHandler/NamespaceHandler.js

@@ -1,12 +1,14 @@
-import { NamespaceHandler } from "@webiny/api-scheduler/exports/api/scheduler.js";
+import { NamespaceHandler, ScheduledActionTypePublish, SchedulerNotAuthorizedError } from "@webiny/api-scheduler/exports/api/scheduler.js";
 import { extractModelIdFromNamespace } from "../../utils/namespace.js";
 import { Result } from "@webiny/feature/exports/api.js";
 import { GetModelUseCase } from "@webiny/api-headless-cms/features/contentModel/GetModel/index.js";
 import { GetEntryByIdUseCase } from "@webiny/api-headless-cms/features/contentEntry/GetEntryById/index.js";
+import { AccessControl } from "@webiny/api-headless-cms/features/shared/abstractions.js";
 class NamespaceHandlerImpl {
-    constructor(getModelUseCase, getEntryByIdUseCase){
+    constructor(getModelUseCase, getEntryByIdUseCase, accessControl){
         this.getModelUseCase = getModelUseCase;
         this.getEntryByIdUseCase = getEntryByIdUseCase;
+        this.accessControl = accessControl;
     }
     canHandle(namespace) {
         const modelId = extractModelIdFromNamespace(namespace);
@@ -17,9 +19,16 @@ class NamespaceHandlerImpl {
         const modelResult = await this.getModelUseCase.execute(modelId);
         if (modelResult.isFail()) return Result.fail(modelResult.error);
         const model = modelResult.value;
+        if (model.isPrivate) return Result.fail(new SchedulerNotAuthorizedError());
         const entryResult = await this.getEntryByIdUseCase.execute(model, params.targetId);
         if (entryResult.isFail()) return Result.fail(entryResult.error);
         const entry = entryResult.value;
+        const canSchedule = await this.accessControl.canAccessEntry({
+            model,
+            entry,
+            pw: params.actionType === ScheduledActionTypePublish ? "p" : "u"
+        });
+        if (!canSchedule) return Result.fail(new SchedulerNotAuthorizedError());
         const title = entry.values[model.titleFieldId] || "Unknown entry title";
         return Result.ok({
             namespace: params.namespace,
@@ -36,7 +45,8 @@ const NamespaceHandler_NamespaceHandler = NamespaceHandler.createImplementation(
     implementation: NamespaceHandlerImpl,
     dependencies: [
         GetModelUseCase,
-        GetEntryByIdUseCase
+        GetEntryByIdUseCase,
+        AccessControl
     ]
 });
 export { NamespaceHandler_NamespaceHandler as NamespaceHandler };

package/features/NamespaceHandler/NamespaceHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/NamespaceHandler/NamespaceHandler.js","sources":["../../../src/features/NamespaceHandler/NamespaceHandler.ts"],"sourcesContent":["import { NamespaceHandler as NamespaceHandlerAbstraction } from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { extractModelIdFromNamespace } from \"~/utils/namespace.js\";\nimport { Result } from \"@webiny/feature/exports/api.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { GetEntryByIdUseCase } from \"@webiny/api-headless-cms/features/contentEntry/GetEntryById/index.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\nclass NamespaceHandlerImpl implements NamespaceHandlerAbstraction.Interface<GenericRecord> {\n    public constructor(\n        private getModelUseCase: GetModelUseCase.Interface,\n        private getEntryByIdUseCase: GetEntryByIdUseCase.Interface\n    ) {}\n\n    public canHandle(namespace: string): boolean {\n        const modelId = extractModelIdFromNamespace(namespace);\n\n        return !!modelId;\n    }\n\n    public async execute(\n        params: NamespaceHandlerAbstraction.Params\n    ): NamespaceHandlerAbstraction.Response<GenericRecord> {\n        /**\n         * We know that modelId is ok because of the canHandle() method, which is always called before execute() and must return true for this handler to be executed.\n         */\n        const modelId = extractModelIdFromNamespace(params.namespace)!;\n        // Fetch the target model\n        const modelResult = await this.getModelUseCase.execute(modelId);\n        if (modelResult.isFail()) {\n            return Result.fail(modelResult.error as any);\n        }\n\n        const model = modelResult.value;\n\n        // Fetch entry to get title\n        const entryResult = await this.getEntryByIdUseCase.execute(model, params.targetId);\n        if (entryResult.isFail()) {\n            return Result.fail(entryResult.error as any);\n        }\n\n        const entry = entryResult.value;\n        const title = entry.values[model.titleFieldId] || \"Unknown entry title\";\n\n        return Result.ok({\n            namespace: params.namespace,\n            title,\n            modelId,\n            actionType: params.actionType,\n            targetId: params.targetId,\n            scheduleId: params.scheduleId,\n            immediately: params.immediately || false\n        });\n    }\n}\n\nexport const NamespaceHandler = NamespaceHandlerAbstraction.createImplementation({\n    implementation: NamespaceHandlerImpl,\n    dependencies: [GetModelUseCase, GetEntryByIdUseCase]\n});\n"],"names":["NamespaceHandlerImpl","getModelUseCase","getEntryByIdUseCase","namespace","modelId","extractModelIdFromNamespace","params","modelResult","Result","model","entryResult","entry","title","NamespaceHandler","NamespaceHandlerAbstraction","GetModelUseCase","GetEntryByIdUseCase"],"mappings":";;;;;AAOA,MAAMA;IACF,YACYC,eAA0C,EAC1CC,mBAAkD,CAC5D;aAFUD,eAAe,GAAfA;aACAC,mBAAmB,GAAnBA;IACT;IAEI,UAAUC,SAAiB,EAAW;QACzC,MAAMC,UAAUC,4BAA4BF;QAE5C,OAAO,CAAC,CAACC;IACb;IAEA,MAAa,QACTE,MAA0C,EACS;QAInD,MAAMF,UAAUC,4BAA4BC,OAAO,SAAS;QAE5D,MAAMC,cAAc,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAACH;QACvD,IAAIG,YAAY,MAAM,IAClB,OAAOC,OAAO,IAAI,CAACD,YAAY,KAAK;QAGxC,MAAME,QAAQF,YAAY,KAAK;QAG/B,MAAMG,cAAc,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAACD,OAAOH,OAAO,QAAQ;QACjF,IAAII,YAAY,MAAM,IAClB,OAAOF,OAAO,IAAI,CAACE,YAAY,KAAK;QAGxC,MAAMC,QAAQD,YAAY,KAAK;QAC/B,MAAME,QAAQD,MAAM,MAAM,CAACF,MAAM,YAAY,CAAC,IAAI;QAElD,OAAOD,OAAO,EAAE,CAAC;YACb,WAAWF,OAAO,SAAS;YAC3BM;YACAR;YACA,YAAYE,OAAO,UAAU;YAC7B,UAAUA,OAAO,QAAQ;YACzB,YAAYA,OAAO,UAAU;YAC7B,aAAaA,OAAO,WAAW,IAAI;QACvC;IACJ;AACJ;AAEO,MAAMO,oCAAmBC,iBAAAA,oBAAgD,CAAC;IAC7E,gBAAgBd;IAChB,cAAc;QAACe;QAAiBC;KAAoB;AACxD"}
+{"version":3,"file":"features/NamespaceHandler/NamespaceHandler.js","sources":["../../../src/features/NamespaceHandler/NamespaceHandler.ts"],"sourcesContent":["import {\n    NamespaceHandler as NamespaceHandlerAbstraction,\n    SchedulerNotAuthorizedError,\n    ScheduledActionTypePublish\n} from \"@webiny/api-scheduler/exports/api/scheduler.js\";\nimport { extractModelIdFromNamespace } from \"~/utils/namespace.js\";\nimport { Result } from \"@webiny/feature/exports/api.js\";\nimport { GetModelUseCase } from \"@webiny/api-headless-cms/features/contentModel/GetModel/index.js\";\nimport { GetEntryByIdUseCase } from \"@webiny/api-headless-cms/features/contentEntry/GetEntryById/index.js\";\nimport { AccessControl } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\nclass NamespaceHandlerImpl implements NamespaceHandlerAbstraction.Interface<GenericRecord> {\n    public constructor(\n        private getModelUseCase: GetModelUseCase.Interface,\n        private getEntryByIdUseCase: GetEntryByIdUseCase.Interface,\n        private accessControl: AccessControl.Interface\n    ) {}\n\n    public canHandle(namespace: string): boolean {\n        const modelId = extractModelIdFromNamespace(namespace);\n\n        return !!modelId;\n    }\n\n    public async execute(\n        params: NamespaceHandlerAbstraction.Params\n    ): NamespaceHandlerAbstraction.Response<GenericRecord> {\n        /**\n         * We know that modelId is ok because of the canHandle() method, which is always called before execute() and must return true for this handler to be executed.\n         */\n        const modelId = extractModelIdFromNamespace(params.namespace)!;\n        // Fetch the target model\n        const modelResult = await this.getModelUseCase.execute(modelId);\n        if (modelResult.isFail()) {\n            return Result.fail(modelResult.error as any);\n        }\n\n        const model = modelResult.value;\n        // Private models are internal and cannot be scheduled.\n        if (model.isPrivate) {\n            return Result.fail(new SchedulerNotAuthorizedError());\n        }\n\n        // Fetch entry to get title\n        const entryResult = await this.getEntryByIdUseCase.execute(model, params.targetId);\n        if (entryResult.isFail()) {\n            return Result.fail(entryResult.error as any);\n        }\n\n        const entry = entryResult.value;\n        // Same check as publishing / unpublishing the entry directly, including \"own entries only\".\n        const canSchedule = await this.accessControl.canAccessEntry({\n            model,\n            entry,\n            pw: params.actionType === ScheduledActionTypePublish ? \"p\" : \"u\"\n        });\n        if (!canSchedule) {\n            return Result.fail(new SchedulerNotAuthorizedError());\n        }\n        const title = entry.values[model.titleFieldId] || \"Unknown entry title\";\n\n        return Result.ok({\n            namespace: params.namespace,\n            title,\n            modelId,\n            actionType: params.actionType,\n            targetId: params.targetId,\n            scheduleId: params.scheduleId,\n            immediately: params.immediately || false\n        });\n    }\n}\n\nexport const NamespaceHandler = NamespaceHandlerAbstraction.createImplementation({\n    implementation: NamespaceHandlerImpl,\n    dependencies: [GetModelUseCase, GetEntryByIdUseCase, AccessControl]\n});\n"],"names":["NamespaceHandlerImpl","getModelUseCase","getEntryByIdUseCase","accessControl","namespace","modelId","extractModelIdFromNamespace","params","modelResult","Result","model","SchedulerNotAuthorizedError","entryResult","entry","canSchedule","ScheduledActionTypePublish","title","NamespaceHandler","NamespaceHandlerAbstraction","GetModelUseCase","GetEntryByIdUseCase","AccessControl"],"mappings":";;;;;;AAYA,MAAMA;IACF,YACYC,eAA0C,EAC1CC,mBAAkD,EAClDC,aAAsC,CAChD;aAHUF,eAAe,GAAfA;aACAC,mBAAmB,GAAnBA;aACAC,aAAa,GAAbA;IACT;IAEI,UAAUC,SAAiB,EAAW;QACzC,MAAMC,UAAUC,4BAA4BF;QAE5C,OAAO,CAAC,CAACC;IACb;IAEA,MAAa,QACTE,MAA0C,EACS;QAInD,MAAMF,UAAUC,4BAA4BC,OAAO,SAAS;QAE5D,MAAMC,cAAc,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAACH;QACvD,IAAIG,YAAY,MAAM,IAClB,OAAOC,OAAO,IAAI,CAACD,YAAY,KAAK;QAGxC,MAAME,QAAQF,YAAY,KAAK;QAE/B,IAAIE,MAAM,SAAS,EACf,OAAOD,OAAO,IAAI,CAAC,IAAIE;QAI3B,MAAMC,cAAc,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAACF,OAAOH,OAAO,QAAQ;QACjF,IAAIK,YAAY,MAAM,IAClB,OAAOH,OAAO,IAAI,CAACG,YAAY,KAAK;QAGxC,MAAMC,QAAQD,YAAY,KAAK;QAE/B,MAAME,cAAc,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;YACxDJ;YACAG;YACA,IAAIN,OAAO,UAAU,KAAKQ,6BAA6B,MAAM;QACjE;QACA,IAAI,CAACD,aACD,OAAOL,OAAO,IAAI,CAAC,IAAIE;QAE3B,MAAMK,QAAQH,MAAM,MAAM,CAACH,MAAM,YAAY,CAAC,IAAI;QAElD,OAAOD,OAAO,EAAE,CAAC;YACb,WAAWF,OAAO,SAAS;YAC3BS;YACAX;YACA,YAAYE,OAAO,UAAU;YAC7B,UAAUA,OAAO,QAAQ;YACzB,YAAYA,OAAO,UAAU;YAC7B,aAAaA,OAAO,WAAW,IAAI;QACvC;IACJ;AACJ;AAEO,MAAMU,oCAAmBC,iBAAAA,oBAAgD,CAAC;IAC7E,gBAAgBlB;IAChB,cAAc;QAACmB;QAAiBC;QAAqBC;KAAc;AACvE"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms-scheduler",
-	"version": "6.5.1",
+	"version": "6.5.2-beta.1",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -17,21 +17,21 @@
 	},
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api": "6.5.1",
-		"@webiny/api-headless-cms": "6.5.1",
-		"@webiny/api-scheduler": "6.5.1",
-		"@webiny/feature": "6.5.1",
-		"@webiny/handler-graphql": "6.5.1"
+		"@webiny/api": "6.5.2-beta.1",
+		"@webiny/api-headless-cms": "6.5.2-beta.1",
+		"@webiny/api-scheduler": "6.5.2-beta.1",
+		"@webiny/feature": "6.5.2-beta.1",
+		"@webiny/handler-graphql": "6.5.2-beta.1"
 	},
 	"devDependencies": {
-		"@webiny/api-core": "6.5.1",
-		"@webiny/api-opensearch": "6.5.1",
-		"@webiny/build-tools": "6.5.1",
-		"@webiny/handler": "6.5.1",
-		"@webiny/handler-aws": "6.5.1",
-		"@webiny/plugins": "6.5.1",
-		"@webiny/project-utils": "6.5.1",
-		"@webiny/wcp": "6.5.1",
+		"@webiny/api-core": "6.5.2-beta.1",
+		"@webiny/api-opensearch": "6.5.2-beta.1",
+		"@webiny/build-tools": "6.5.2-beta.1",
+		"@webiny/handler": "6.5.2-beta.1",
+		"@webiny/handler-aws": "6.5.2-beta.1",
+		"@webiny/plugins": "6.5.2-beta.1",
+		"@webiny/project-utils": "6.5.2-beta.1",
+		"@webiny/wcp": "6.5.2-beta.1",
 		"typescript": "7.0.2",
 		"vitest": "5.0.5"
 	},