@webiny/webhooks 6.4.0-beta.2 → 6.4.0-beta.3

package/api/features/ResendWebhookDelivery/ResendWebhookDeliveryUseCase.d.ts

@@ -6,11 +6,11 @@ import { CreateWebhookDeliveryRepository } from "../../../api/features/CreateWeb
 import { WebhookPermissions } from "../../../api/features/WebhookPermissions/abstractions.js";
 import { TaskService } from "@webiny/api-core/exports/api/tasks.js";
 declare class ResendWebhookDeliveryUseCaseImpl implements UseCaseAbstraction.Interface {
-    private permissions;
-    private getDeliveryRepository;
-    private getWebhookRepository;
-    private createDeliveryRepository;
-    private taskService;
+    private readonly permissions;
+    private readonly getDeliveryRepository;
+    private readonly getWebhookRepository;
+    private readonly createDeliveryRepository;
+    private readonly taskService;
     constructor(permissions: WebhookPermissions.Interface, getDeliveryRepository: GetWebhookDeliveryRepository.Interface, getWebhookRepository: GetWebhookRepository.Interface, createDeliveryRepository: CreateWebhookDeliveryRepository.Interface, taskService: TaskService.Interface);
     execute(deliveryId: string): Promise<Result<boolean, UseCaseAbstraction.Error>>;
 }

package/api/features/ResendWebhookDelivery/ResendWebhookDeliveryUseCase.js

@@ -1,10 +1,11 @@
 import { Result } from "@webiny/feature/api";
 import { ResendWebhookDeliveryUseCase } from "./abstractions.js";
+import { ResendWebhookDeliveryInputSchema } from "./schema.js";
 import { GetWebhookDeliveryRepository } from "../GetWebhookDelivery/abstractions.js";
 import { GetWebhookRepository } from "../GetWebhook/abstractions.js";
 import { CreateWebhookDeliveryRepository } from "../CreateWebhookDelivery/abstractions.js";
 import { WebhookPermissions } from "../WebhookPermissions/abstractions.js";
-import { WebhookNotAuthorizedError } from "../../domain/errors.js";
+import { WebhookNotAuthorizedError, WebhookValidationError } from "../../domain/errors.js";
 import { TaskService } from "@webiny/api-core/exports/api/tasks.js";
 import { SEND_WEBHOOK_TASK, WEBHOOK_DELIVERY_RETENTION_DAYS } from "../../domain/constants.js";
 class ResendWebhookDeliveryUseCaseImpl {
@@ -17,7 +18,11 @@ class ResendWebhookDeliveryUseCaseImpl {
     }
     async execute(deliveryId) {
         if (!await this.permissions.canEdit("webhook")) return Result.fail(new WebhookNotAuthorizedError());
-        const deliveryResult = await this.getDeliveryRepository.execute(deliveryId);
+        const parsed = ResendWebhookDeliveryInputSchema.safeParse({
+            deliveryId
+        });
+        if (!parsed.success) return Result.fail(new WebhookValidationError(parsed.error));
+        const deliveryResult = await this.getDeliveryRepository.execute(parsed.data.deliveryId);
         if (deliveryResult.isFail()) return Result.fail(deliveryResult.error);
         const delivery = deliveryResult.value;
         const webhookResult = await this.getWebhookRepository.execute(delivery.webhookId);

package/api/features/ResendWebhookDelivery/ResendWebhookDeliveryUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/features/ResendWebhookDelivery/ResendWebhookDeliveryUseCase.js","sources":["../../../../src/api/features/ResendWebhookDelivery/ResendWebhookDeliveryUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { ResendWebhookDeliveryUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { GetWebhookDeliveryRepository } from \"~/api/features/GetWebhookDelivery/abstractions.js\";\nimport { GetWebhookRepository } from \"~/api/features/GetWebhook/abstractions.js\";\nimport { CreateWebhookDeliveryRepository } from \"~/api/features/CreateWebhookDelivery/abstractions.js\";\nimport { WebhookPermissions } from \"~/api/features/WebhookPermissions/abstractions.js\";\nimport { WebhookNotAuthorizedError } from \"~/api/domain/errors.js\";\nimport { TaskService } from \"@webiny/api-core/exports/api/tasks.js\";\nimport { SEND_WEBHOOK_TASK, WEBHOOK_DELIVERY_RETENTION_DAYS } from \"~/api/domain/constants.js\";\nimport type { IWebhookPayload } from \"~/api/features/SendWebhookTask/types.js\";\n\nclass ResendWebhookDeliveryUseCaseImpl implements UseCaseAbstraction.Interface {\n    constructor(\n        private permissions: WebhookPermissions.Interface,\n        private getDeliveryRepository: GetWebhookDeliveryRepository.Interface,\n        private getWebhookRepository: GetWebhookRepository.Interface,\n        private createDeliveryRepository: CreateWebhookDeliveryRepository.Interface,\n        private taskService: TaskService.Interface\n    ) {}\n\n    async execute(deliveryId: string): Promise<Result<boolean, UseCaseAbstraction.Error>> {\n        if (!(await this.permissions.canEdit(\"webhook\"))) {\n            return Result.fail(new WebhookNotAuthorizedError());\n        }\n\n        const deliveryResult = await this.getDeliveryRepository.execute(deliveryId);\n        if (deliveryResult.isFail()) {\n            return Result.fail(deliveryResult.error);\n        }\n\n        const delivery = deliveryResult.value;\n\n        const webhookResult = await this.getWebhookRepository.execute(delivery.webhookId);\n        if (webhookResult.isFail()) {\n            return Result.fail(webhookResult.error);\n        }\n\n        const originalPayload = delivery.payload as IWebhookPayload | null;\n        const data = originalPayload?.data ?? {};\n\n        const expiresAt = new Date(\n            Date.now() + WEBHOOK_DELIVERY_RETENTION_DAYS * 24 * 60 * 60 * 1000\n        ).toISOString();\n\n        const newDeliveryResult = await this.createDeliveryRepository.execute({\n            webhookId: delivery.webhookId,\n            eventType: delivery.eventType,\n            status: \"pending\",\n            payload: data as Record<string, unknown>,\n            expiresAt\n        });\n\n        if (newDeliveryResult.isFail()) {\n            return Result.fail(newDeliveryResult.error);\n        }\n\n        await this.taskService.trigger({\n            definition: SEND_WEBHOOK_TASK,\n            name: `Resend webhook: ${delivery.eventType}`,\n            input: {\n                webhookId: delivery.webhookId,\n                eventName: delivery.eventType,\n                deliveryId: newDeliveryResult.value.id\n            }\n        });\n\n        return Result.ok(true);\n    }\n}\n\nexport const ResendWebhookDeliveryUseCase = UseCaseAbstraction.createImplementation({\n    implementation: ResendWebhookDeliveryUseCaseImpl,\n    dependencies: [\n        WebhookPermissions,\n        GetWebhookDeliveryRepository,\n        GetWebhookRepository,\n        CreateWebhookDeliveryRepository,\n        TaskService\n    ]\n});\n"],"names":["ResendWebhookDeliveryUseCaseImpl","permissions","getDeliveryRepository","getWebhookRepository","createDeliveryRepository","taskService","deliveryId","Result","WebhookNotAuthorizedError","deliveryResult","delivery","webhookResult","originalPayload","data","expiresAt","Date","WEBHOOK_DELIVERY_RETENTION_DAYS","newDeliveryResult","SEND_WEBHOOK_TASK","ResendWebhookDeliveryUseCase","UseCaseAbstraction","WebhookPermissions","GetWebhookDeliveryRepository","GetWebhookRepository","CreateWebhookDeliveryRepository","TaskService"],"mappings":";;;;;;;;;AAWA,MAAMA;IACF,YACYC,WAAyC,EACzCC,qBAA6D,EAC7DC,oBAAoD,EACpDC,wBAAmE,EACnEC,WAAkC,CAC5C;aALUJ,WAAW,GAAXA;aACAC,qBAAqB,GAArBA;aACAC,oBAAoB,GAApBA;aACAC,wBAAwB,GAAxBA;aACAC,WAAW,GAAXA;IACT;IAEH,MAAM,QAAQC,UAAkB,EAAsD;QAClF,IAAI,CAAE,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,YACjC,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAG3B,MAAMC,iBAAiB,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAACH;QAChE,IAAIG,eAAe,MAAM,IACrB,OAAOF,OAAO,IAAI,CAACE,eAAe,KAAK;QAG3C,MAAMC,WAAWD,eAAe,KAAK;QAErC,MAAME,gBAAgB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAACD,SAAS,SAAS;QAChF,IAAIC,cAAc,MAAM,IACpB,OAAOJ,OAAO,IAAI,CAACI,cAAc,KAAK;QAG1C,MAAMC,kBAAkBF,SAAS,OAAO;QACxC,MAAMG,OAAOD,iBAAiB,QAAQ,CAAC;QAEvC,MAAME,YAAY,IAAIC,KAClBA,KAAK,GAAG,KAAKC,AAAkC,KAAlCA,kCAAAA,SACf,WAAW;QAEb,MAAMC,oBAAoB,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC;YAClE,WAAWP,SAAS,SAAS;YAC7B,WAAWA,SAAS,SAAS;YAC7B,QAAQ;YACR,SAASG;YACTC;QACJ;QAEA,IAAIG,kBAAkB,MAAM,IACxB,OAAOV,OAAO,IAAI,CAACU,kBAAkB,KAAK;QAG9C,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;YAC3B,YAAYC;YACZ,MAAM,CAAC,gBAAgB,EAAER,SAAS,SAAS,EAAE;YAC7C,OAAO;gBACH,WAAWA,SAAS,SAAS;gBAC7B,WAAWA,SAAS,SAAS;gBAC7B,YAAYO,kBAAkB,KAAK,CAAC,EAAE;YAC1C;QACJ;QAEA,OAAOV,OAAO,EAAE,CAAC;IACrB;AACJ;AAEO,MAAMY,4DAA+BC,6BAAAA,oBAAuC,CAAC;IAChF,gBAAgBpB;IAChB,cAAc;QACVqB;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"api/features/ResendWebhookDelivery/ResendWebhookDeliveryUseCase.js","sources":["../../../../src/api/features/ResendWebhookDelivery/ResendWebhookDeliveryUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { ResendWebhookDeliveryUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { ResendWebhookDeliveryInputSchema } from \"./schema.js\";\nimport { GetWebhookDeliveryRepository } from \"~/api/features/GetWebhookDelivery/abstractions.js\";\nimport { GetWebhookRepository } from \"~/api/features/GetWebhook/abstractions.js\";\nimport { CreateWebhookDeliveryRepository } from \"~/api/features/CreateWebhookDelivery/abstractions.js\";\nimport { WebhookPermissions } from \"~/api/features/WebhookPermissions/abstractions.js\";\nimport { WebhookNotAuthorizedError, WebhookValidationError } from \"~/api/domain/errors.js\";\nimport { TaskService } from \"@webiny/api-core/exports/api/tasks.js\";\nimport { SEND_WEBHOOK_TASK, WEBHOOK_DELIVERY_RETENTION_DAYS } from \"~/api/domain/constants.js\";\nimport type { IWebhookPayload } from \"~/api/features/SendWebhookTask/types.js\";\n\nclass ResendWebhookDeliveryUseCaseImpl implements UseCaseAbstraction.Interface {\n    constructor(\n        private readonly permissions: WebhookPermissions.Interface,\n        private readonly getDeliveryRepository: GetWebhookDeliveryRepository.Interface,\n        private readonly getWebhookRepository: GetWebhookRepository.Interface,\n        private readonly createDeliveryRepository: CreateWebhookDeliveryRepository.Interface,\n        private readonly taskService: TaskService.Interface\n    ) {}\n\n    async execute(deliveryId: string): Promise<Result<boolean, UseCaseAbstraction.Error>> {\n        if (!(await this.permissions.canEdit(\"webhook\"))) {\n            return Result.fail(new WebhookNotAuthorizedError());\n        }\n\n        const parsed = ResendWebhookDeliveryInputSchema.safeParse({ deliveryId });\n        if (!parsed.success) {\n            return Result.fail(new WebhookValidationError(parsed.error));\n        }\n\n        const deliveryResult = await this.getDeliveryRepository.execute(parsed.data.deliveryId);\n        if (deliveryResult.isFail()) {\n            return Result.fail(deliveryResult.error);\n        }\n\n        const delivery = deliveryResult.value;\n\n        const webhookResult = await this.getWebhookRepository.execute(delivery.webhookId);\n        if (webhookResult.isFail()) {\n            return Result.fail(webhookResult.error);\n        }\n\n        const originalPayload = delivery.payload as IWebhookPayload | null;\n        const data = originalPayload?.data ?? {};\n\n        const expiresAt = new Date(\n            Date.now() + WEBHOOK_DELIVERY_RETENTION_DAYS * 24 * 60 * 60 * 1000\n        ).toISOString();\n\n        const newDeliveryResult = await this.createDeliveryRepository.execute({\n            webhookId: delivery.webhookId,\n            eventType: delivery.eventType,\n            status: \"pending\",\n            payload: data as Record<string, unknown>,\n            expiresAt\n        });\n\n        if (newDeliveryResult.isFail()) {\n            return Result.fail(newDeliveryResult.error);\n        }\n\n        await this.taskService.trigger({\n            definition: SEND_WEBHOOK_TASK,\n            name: `Resend webhook: ${delivery.eventType}`,\n            input: {\n                webhookId: delivery.webhookId,\n                eventName: delivery.eventType,\n                deliveryId: newDeliveryResult.value.id\n            }\n        });\n\n        return Result.ok(true);\n    }\n}\n\nexport const ResendWebhookDeliveryUseCase = UseCaseAbstraction.createImplementation({\n    implementation: ResendWebhookDeliveryUseCaseImpl,\n    dependencies: [\n        WebhookPermissions,\n        GetWebhookDeliveryRepository,\n        GetWebhookRepository,\n        CreateWebhookDeliveryRepository,\n        TaskService\n    ]\n});\n"],"names":["ResendWebhookDeliveryUseCaseImpl","permissions","getDeliveryRepository","getWebhookRepository","createDeliveryRepository","taskService","deliveryId","Result","WebhookNotAuthorizedError","parsed","ResendWebhookDeliveryInputSchema","WebhookValidationError","deliveryResult","delivery","webhookResult","originalPayload","data","expiresAt","Date","WEBHOOK_DELIVERY_RETENTION_DAYS","newDeliveryResult","SEND_WEBHOOK_TASK","ResendWebhookDeliveryUseCase","UseCaseAbstraction","WebhookPermissions","GetWebhookDeliveryRepository","GetWebhookRepository","CreateWebhookDeliveryRepository","TaskService"],"mappings":";;;;;;;;;;AAYA,MAAMA;IACF,YACqBC,WAAyC,EACzCC,qBAA6D,EAC7DC,oBAAoD,EACpDC,wBAAmE,EACnEC,WAAkC,CACrD;aALmBJ,WAAW,GAAXA;aACAC,qBAAqB,GAArBA;aACAC,oBAAoB,GAApBA;aACAC,wBAAwB,GAAxBA;aACAC,WAAW,GAAXA;IAClB;IAEH,MAAM,QAAQC,UAAkB,EAAsD;QAClF,IAAI,CAAE,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,YACjC,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAG3B,MAAMC,SAASC,iCAAiC,SAAS,CAAC;YAAEJ;QAAW;QACvE,IAAI,CAACG,OAAO,OAAO,EACf,OAAOF,OAAO,IAAI,CAAC,IAAII,uBAAuBF,OAAO,KAAK;QAG9D,MAAMG,iBAAiB,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAACH,OAAO,IAAI,CAAC,UAAU;QACtF,IAAIG,eAAe,MAAM,IACrB,OAAOL,OAAO,IAAI,CAACK,eAAe,KAAK;QAG3C,MAAMC,WAAWD,eAAe,KAAK;QAErC,MAAME,gBAAgB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAACD,SAAS,SAAS;QAChF,IAAIC,cAAc,MAAM,IACpB,OAAOP,OAAO,IAAI,CAACO,cAAc,KAAK;QAG1C,MAAMC,kBAAkBF,SAAS,OAAO;QACxC,MAAMG,OAAOD,iBAAiB,QAAQ,CAAC;QAEvC,MAAME,YAAY,IAAIC,KAClBA,KAAK,GAAG,KAAKC,AAAkC,KAAlCA,kCAAAA,SACf,WAAW;QAEb,MAAMC,oBAAoB,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC;YAClE,WAAWP,SAAS,SAAS;YAC7B,WAAWA,SAAS,SAAS;YAC7B,QAAQ;YACR,SAASG;YACTC;QACJ;QAEA,IAAIG,kBAAkB,MAAM,IACxB,OAAOb,OAAO,IAAI,CAACa,kBAAkB,KAAK;QAG9C,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;YAC3B,YAAYC;YACZ,MAAM,CAAC,gBAAgB,EAAER,SAAS,SAAS,EAAE;YAC7C,OAAO;gBACH,WAAWA,SAAS,SAAS;gBAC7B,WAAWA,SAAS,SAAS;gBAC7B,YAAYO,kBAAkB,KAAK,CAAC,EAAE;YAC1C;QACJ;QAEA,OAAOb,OAAO,EAAE,CAAC;IACrB;AACJ;AAEO,MAAMe,4DAA+BC,6BAAAA,oBAAuC,CAAC;IAChF,gBAAgBvB;IAChB,cAAc;QACVwB;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/api/features/ResendWebhookDelivery/abstractions.d.ts

@@ -1,6 +1,6 @@
 import { type Result } from "@webiny/feature/api";
-import type { WebhookDeliveryNotFoundError, WebhookNotFoundError, WebhookPersistenceError, WebhookModelNotFoundError, WebhookNotAuthorizedError } from "../../../api/domain/errors.js";
-type IError = WebhookDeliveryNotFoundError | WebhookNotFoundError | WebhookPersistenceError | WebhookModelNotFoundError | WebhookNotAuthorizedError;
+import type { WebhookDeliveryNotFoundError, WebhookNotFoundError, WebhookPersistenceError, WebhookModelNotFoundError, WebhookNotAuthorizedError, WebhookValidationError } from "../../../api/domain/errors.js";
+type IError = WebhookDeliveryNotFoundError | WebhookNotFoundError | WebhookPersistenceError | WebhookModelNotFoundError | WebhookNotAuthorizedError | WebhookValidationError;
 export interface IResendWebhookDeliveryUseCase {
     execute(deliveryId: string): Promise<Result<boolean, IError>>;
 }

package/api/features/ResendWebhookDelivery/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/features/ResendWebhookDelivery/abstractions.js","sources":["../../../../src/api/features/ResendWebhookDelivery/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type {\n    WebhookDeliveryNotFoundError,\n    WebhookNotFoundError,\n    WebhookPersistenceError,\n    WebhookModelNotFoundError,\n    WebhookNotAuthorizedError\n} from \"~/api/domain/errors.js\";\n\ntype IError =\n    | WebhookDeliveryNotFoundError\n    | WebhookNotFoundError\n    | WebhookPersistenceError\n    | WebhookModelNotFoundError\n    | WebhookNotAuthorizedError;\n\nexport interface IResendWebhookDeliveryUseCase {\n    execute(deliveryId: string): Promise<Result<boolean, IError>>;\n}\n\nexport const ResendWebhookDeliveryUseCase = createAbstraction<IResendWebhookDeliveryUseCase>(\n    \"Webhooks/ResendWebhookDeliveryUseCase\"\n);\n\nexport namespace ResendWebhookDeliveryUseCase {\n    export type Interface = IResendWebhookDeliveryUseCase;\n    export type Error = IError;\n}\n"],"names":["ResendWebhookDeliveryUseCase","createAbstraction"],"mappings":";AAoBO,MAAMA,+BAA+BC,kBACxC"}
+{"version":3,"file":"api/features/ResendWebhookDelivery/abstractions.js","sources":["../../../../src/api/features/ResendWebhookDelivery/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type {\n    WebhookDeliveryNotFoundError,\n    WebhookNotFoundError,\n    WebhookPersistenceError,\n    WebhookModelNotFoundError,\n    WebhookNotAuthorizedError,\n    WebhookValidationError\n} from \"~/api/domain/errors.js\";\n\ntype IError =\n    | WebhookDeliveryNotFoundError\n    | WebhookNotFoundError\n    | WebhookPersistenceError\n    | WebhookModelNotFoundError\n    | WebhookNotAuthorizedError\n    | WebhookValidationError;\n\nexport interface IResendWebhookDeliveryUseCase {\n    execute(deliveryId: string): Promise<Result<boolean, IError>>;\n}\n\nexport const ResendWebhookDeliveryUseCase = createAbstraction<IResendWebhookDeliveryUseCase>(\n    \"Webhooks/ResendWebhookDeliveryUseCase\"\n);\n\nexport namespace ResendWebhookDeliveryUseCase {\n    export type Interface = IResendWebhookDeliveryUseCase;\n    export type Error = IError;\n}\n"],"names":["ResendWebhookDeliveryUseCase","createAbstraction"],"mappings":";AAsBO,MAAMA,+BAA+BC,kBACxC"}

package/api/features/ResendWebhookDelivery/schema.d.ts

@@ -0,0 +1,4 @@
+import { z } from "zod";
+export declare const ResendWebhookDeliveryInputSchema: z.ZodObject<{
+    deliveryId: z.ZodString;
+}, z.core.$strip>;

package/api/features/ResendWebhookDelivery/schema.js

@@ -0,0 +1,7 @@
+import { z } from "zod";
+const ResendWebhookDeliveryInputSchema = z.object({
+    deliveryId: z.string().min(1, "Delivery ID is required.")
+});
+export { ResendWebhookDeliveryInputSchema };
+
+//# sourceMappingURL=schema.js.map

package/api/features/ResendWebhookDelivery/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api/features/ResendWebhookDelivery/schema.js","sources":["../../../../src/api/features/ResendWebhookDelivery/schema.ts"],"sourcesContent":["import { z } from \"zod\";\n\nexport const ResendWebhookDeliveryInputSchema = z.object({\n    deliveryId: z.string().min(1, \"Delivery ID is required.\")\n});\n"],"names":["ResendWebhookDeliveryInputSchema","z"],"mappings":";AAEO,MAAMA,mCAAmCC,EAAE,MAAM,CAAC;IACrD,YAAYA,EAAE,MAAM,GAAG,GAAG,CAAC,GAAG;AAClC"}

package/api/features/SendWebhookTask/SendWebhookTask.d.ts

@@ -5,6 +5,8 @@ import { WebhookSignPayload } from "@webiny/api-core/features/webhooks/index.js"
 import { GetWebhookRepository } from "../../../api/features/GetWebhook/abstractions.js";
 import { GetWebhookDeliveryRepository } from "../../../api/features/GetWebhookDelivery/abstractions.js";
 import { UpdateWebhookDeliveryRepository } from "../../../api/features/UpdateWebhookDelivery/abstractions.js";
+import { GetWebhookSettingsRepository } from "../../../api/features/GetWebhookSettings/abstractions.js";
+import { WebhookDeliver } from "../../../api/features/WebhookDeliver/abstractions.js";
 import type { ISendWebhookTaskInput, ISendWebhookTaskOutput } from "./types.js";
 type IRunParams = TaskDefinition.RunParams<ISendWebhookTaskInput, ISendWebhookTaskOutput>;
 declare class SendWebhookTaskDefinition implements TaskDefinition.Interface<ISendWebhookTaskInput, ISendWebhookTaskOutput> {
@@ -13,14 +15,16 @@ declare class SendWebhookTaskDefinition implements TaskDefinition.Interface<ISen
     private readonly updateDeliveryRepository;
     private readonly signPayload;
     private readonly tenantContext;
+    private readonly getWebhookSettingsRepository;
+    private readonly deliver;
     readonly id = "sendWebhook";
     readonly title = "Send Webhook";
     readonly maxIterations = 1;
     readonly isPrivate = true;
     readonly databaseLogs = false;
     readonly description = "POST a signed event payload to a webhook endpoint and log the delivery.";
-    readonly selfCleanup: ("onAbort" | "onSuccess")[];
-    constructor(getWebhookRepository: GetWebhookRepository.Interface, getWebhookDeliveryRepository: GetWebhookDeliveryRepository.Interface, updateDeliveryRepository: UpdateWebhookDeliveryRepository.Interface, signPayload: WebhookSignPayload.Interface, tenantContext: TenantContext.Interface);
+    readonly selfCleanup = "always";
+    constructor(getWebhookRepository: GetWebhookRepository.Interface, getWebhookDeliveryRepository: GetWebhookDeliveryRepository.Interface, updateDeliveryRepository: UpdateWebhookDeliveryRepository.Interface, signPayload: WebhookSignPayload.Interface, tenantContext: TenantContext.Interface, getWebhookSettingsRepository: GetWebhookSettingsRepository.Interface, deliver: WebhookDeliver.Interface);
     run(params: IRunParams): Promise<import("@webiny/api-core/features/task/TaskDefinition/abstractions.js").ITaskResultError | TaskDefinition.ResultDone<ISendWebhookTaskOutput>>;
 }
 export declare const SendWebhookTask: typeof SendWebhookTaskDefinition & {

package/api/features/SendWebhookTask/SendWebhookTask.js

@@ -5,30 +5,31 @@ import { WebhookSignPayload } from "@webiny/api-core/features/webhooks/index.js"
 import { GetWebhookRepository } from "../GetWebhook/abstractions.js";
 import { GetWebhookDeliveryRepository } from "../GetWebhookDelivery/abstractions.js";
 import { UpdateWebhookDeliveryRepository } from "../UpdateWebhookDelivery/abstractions.js";
+import { GetWebhookSettingsRepository } from "../GetWebhookSettings/abstractions.js";
+import { WebhookDeliver } from "../WebhookDeliver/abstractions.js";
 import { SEND_WEBHOOK_TASK } from "../../domain/constants.js";
 class SendWebhookTaskDefinition {
-    constructor(getWebhookRepository, getWebhookDeliveryRepository, updateDeliveryRepository, signPayload, tenantContext){
+    constructor(getWebhookRepository, getWebhookDeliveryRepository, updateDeliveryRepository, signPayload, tenantContext, getWebhookSettingsRepository, deliver){
         this.getWebhookRepository = getWebhookRepository;
         this.getWebhookDeliveryRepository = getWebhookDeliveryRepository;
         this.updateDeliveryRepository = updateDeliveryRepository;
         this.signPayload = signPayload;
         this.tenantContext = tenantContext;
+        this.getWebhookSettingsRepository = getWebhookSettingsRepository;
+        this.deliver = deliver;
         this.id = SEND_WEBHOOK_TASK;
         this.title = "Send Webhook";
         this.maxIterations = 1;
         this.isPrivate = true;
         this.databaseLogs = false;
         this.description = "POST a signed event payload to a webhook endpoint and log the delivery.";
-        this.selfCleanup = [
-            "onSuccess",
-            "onAbort"
-        ];
+        this.selfCleanup = "always";
     }
     async run(params) {
-        const { input } = params;
-        const taskId = params.controller.state.getTask().id;
+        const { input, controller } = params;
+        const taskId = controller.state.getTask().id;
         const delivery = await this.getWebhookDeliveryRepository.execute(input.deliveryId);
-        if (delivery.isFail()) return params.controller.response.error(delivery.error);
+        if (delivery.isFail()) return controller.response.error(delivery.error);
         await this.updateDeliveryRepository.execute(input.deliveryId, {
             backgroundTaskId: taskId,
             status: "delivering"
@@ -38,7 +39,7 @@ class SendWebhookTaskDefinition {
             await this.updateDeliveryRepository.execute(input.deliveryId, {
                 status: "failed"
             });
-            return params.controller.response.error(webhookResult.error);
+            return controller.response.error(webhookResult.error);
         }
         const webhook = webhookResult.value;
         const now = new Date();
@@ -47,41 +48,50 @@ class SendWebhookTaskDefinition {
             event: input.eventName,
             timestamp: now.toISOString(),
             webhookId: input.webhookId,
+            deliveryId: input.deliveryId,
             tenant: this.tenantContext.getTenant().id,
             data: delivery.value.payload
         };
         const rawBody = JSON.stringify(payload);
-        const signHeaders = await this.signPayload.sign(taskId, now, rawBody, webhook.signingSecret ?? "");
+        let signHeaders;
+        const settingsResult = await this.getWebhookSettingsRepository.execute();
+        if (settingsResult.isFail()) {
+            await this.updateDeliveryRepository.execute(input.deliveryId, {
+                status: "failed"
+            });
+            return controller.response.error(settingsResult.error);
+        }
+        const signingSecret = webhook.signingSecret || settingsResult.value.signingSecret || "";
+        try {
+            signHeaders = await this.signPayload.sign(taskId, now, rawBody, signingSecret);
+        } catch (ex) {
+            await this.updateDeliveryRepository.execute(input.deliveryId, {
+                status: "failed"
+            });
+            return controller.response.error(ex);
+        }
         const requestHeaders = {
             "Content-Type": "application/json",
             ...signHeaders
         };
-        const startTime = Date.now();
-        let responseStatus = 0;
-        let responseBody = "";
-        try {
-            const response = await fetch(webhook.endpointUrl, {
-                method: "POST",
-                headers: requestHeaders,
-                body: rawBody,
-                signal: AbortSignal.timeout(600000)
-            });
-            responseStatus = response.status;
-            responseBody = await response.text();
-        } catch (error) {
-            responseStatus = 0;
-            responseBody = error.message;
-        }
-        const responseTime = Date.now() - startTime;
+        const result = await this.deliver.execute({
+            url: webhook.endpointUrl,
+            headers: requestHeaders,
+            body: rawBody,
+            timeout: 600000,
+            maxRetries: 3,
+            initialDelay: 1000,
+            maxDelay: 30000
+        });
         await this.updateDeliveryRepository.execute(input.deliveryId, {
             payload,
             requestHeaders,
-            responseTime,
-            responseStatus,
-            responseBody,
-            status: responseStatus > 0 ? "delivered" : "failed"
+            responseTime: result.responseTime,
+            responseStatus: result.status,
+            responseBody: result.body,
+            status: result.status > 0 ? "delivered" : "failed"
         });
-        return params.controller.response.done();
+        return controller.response.done();
     }
 }
 const SendWebhookTask = TaskDefinition.createImplementation({
@@ -91,7 +101,9 @@ const SendWebhookTask = TaskDefinition.createImplementation({
         GetWebhookDeliveryRepository,
         UpdateWebhookDeliveryRepository,
         WebhookSignPayload,
-        TenantContext
+        TenantContext,
+        GetWebhookSettingsRepository,
+        WebhookDeliver
     ]
 });
 export { SendWebhookTask };

package/api/features/SendWebhookTask/SendWebhookTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/features/SendWebhookTask/SendWebhookTask.js","sources":["../../../../src/api/features/SendWebhookTask/SendWebhookTask.ts"],"sourcesContent":["import \"@webiny/tasks/types.js\";\nimport { TaskDefinition } from \"@webiny/api-core/exports/api/tasks.js\";\nimport { TenantContext } from \"@webiny/api-core/exports/api/tenancy.js\";\nimport { WebhookSignPayload } from \"@webiny/api-core/features/webhooks/index.js\";\nimport { GetWebhookRepository } from \"~/api/features/GetWebhook/abstractions.js\";\nimport { GetWebhookDeliveryRepository } from \"~/api/features/GetWebhookDelivery/abstractions.js\";\nimport { UpdateWebhookDeliveryRepository } from \"~/api/features/UpdateWebhookDelivery/abstractions.js\";\nimport { SEND_WEBHOOK_TASK } from \"~/api/domain/constants.js\";\nimport type { ISendWebhookTaskInput, ISendWebhookTaskOutput, IWebhookPayload } from \"./types.js\";\n\ntype IRunParams = TaskDefinition.RunParams<ISendWebhookTaskInput, ISendWebhookTaskOutput>;\n\nclass SendWebhookTaskDefinition implements TaskDefinition.Interface<\n    ISendWebhookTaskInput,\n    ISendWebhookTaskOutput\n> {\n    public readonly id = SEND_WEBHOOK_TASK;\n    public readonly title = \"Send Webhook\";\n    public readonly maxIterations = 1;\n    public readonly isPrivate = true;\n    public readonly databaseLogs = false;\n    public readonly description =\n        \"POST a signed event payload to a webhook endpoint and log the delivery.\";\n    public readonly selfCleanup = [\"onSuccess\" as const, \"onAbort\" as const];\n\n    public constructor(\n        private readonly getWebhookRepository: GetWebhookRepository.Interface,\n        private readonly getWebhookDeliveryRepository: GetWebhookDeliveryRepository.Interface,\n        private readonly updateDeliveryRepository: UpdateWebhookDeliveryRepository.Interface,\n        private readonly signPayload: WebhookSignPayload.Interface,\n        private readonly tenantContext: TenantContext.Interface\n    ) {}\n\n    public async run(params: IRunParams) {\n        const { input } = params;\n        const taskId = params.controller.state.getTask().id;\n\n        const delivery = await this.getWebhookDeliveryRepository.execute(input.deliveryId);\n        if (delivery.isFail()) {\n            return params.controller.response.error(delivery.error);\n        }\n\n        await this.updateDeliveryRepository.execute(input.deliveryId, {\n            backgroundTaskId: taskId,\n            status: \"delivering\"\n        });\n\n        const webhookResult = await this.getWebhookRepository.execute(input.webhookId);\n        if (webhookResult.isFail()) {\n            await this.updateDeliveryRepository.execute(input.deliveryId, { status: \"failed\" });\n            return params.controller.response.error(webhookResult.error);\n        }\n        const webhook = webhookResult.value;\n\n        const now = new Date();\n        const payload: IWebhookPayload = {\n            id: taskId,\n            event: input.eventName,\n            timestamp: now.toISOString(),\n            webhookId: input.webhookId,\n            tenant: this.tenantContext.getTenant().id,\n            data: delivery.value.payload\n        };\n        const rawBody = JSON.stringify(payload);\n        const signHeaders = await this.signPayload.sign(\n            taskId,\n            now,\n            rawBody,\n            webhook.signingSecret ?? \"\"\n        );\n\n        const requestHeaders: Record<string, string> = {\n            \"Content-Type\": \"application/json\",\n            ...signHeaders\n        };\n\n        const startTime = Date.now();\n        let responseStatus = 0;\n        let responseBody = \"\";\n\n        try {\n            const response = await fetch(webhook.endpointUrl, {\n                method: \"POST\",\n                headers: requestHeaders,\n                body: rawBody,\n                signal: AbortSignal.timeout(600_000)\n            });\n            responseStatus = response.status;\n            responseBody = await response.text();\n        } catch (error) {\n            responseStatus = 0;\n            responseBody = (error as Error).message;\n        }\n\n        const responseTime = Date.now() - startTime;\n\n        await this.updateDeliveryRepository.execute(input.deliveryId, {\n            payload,\n            requestHeaders,\n            responseTime,\n            responseStatus,\n            responseBody,\n            status: responseStatus > 0 ? \"delivered\" : \"failed\"\n        });\n\n        return params.controller.response.done();\n    }\n}\n\nexport const SendWebhookTask = TaskDefinition.createImplementation({\n    implementation: SendWebhookTaskDefinition,\n    dependencies: [\n        GetWebhookRepository,\n        GetWebhookDeliveryRepository,\n        UpdateWebhookDeliveryRepository,\n        WebhookSignPayload,\n        TenantContext\n    ]\n});\n"],"names":["SendWebhookTaskDefinition","getWebhookRepository","getWebhookDeliveryRepository","updateDeliveryRepository","signPayload","tenantContext","SEND_WEBHOOK_TASK","params","input","taskId","delivery","webhookResult","webhook","now","Date","payload","rawBody","JSON","signHeaders","requestHeaders","startTime","responseStatus","responseBody","response","fetch","AbortSignal","error","responseTime","SendWebhookTask","TaskDefinition","GetWebhookRepository","GetWebhookDeliveryRepository","UpdateWebhookDeliveryRepository","WebhookSignPayload","TenantContext"],"mappings":";;;;;;;;AAYA,MAAMA;IAaF,YACqBC,oBAAoD,EACpDC,4BAAoE,EACpEC,wBAAmE,EACnEC,WAAyC,EACzCC,aAAsC,CACzD;aALmBJ,oBAAoB,GAApBA;aACAC,4BAA4B,GAA5BA;aACAC,wBAAwB,GAAxBA;aACAC,WAAW,GAAXA;aACAC,aAAa,GAAbA;aAdL,EAAE,GAAGC;aACL,KAAK,GAAG;aACR,aAAa,GAAG;aAChB,SAAS,GAAG;aACZ,YAAY,GAAG;aACf,WAAW,GACvB;aACY,WAAW,GAAG;YAAC;YAAsB;SAAmB;IAQrE;IAEH,MAAa,IAAIC,MAAkB,EAAE;QACjC,MAAM,EAAEC,KAAK,EAAE,GAAGD;QAClB,MAAME,SAASF,OAAO,UAAU,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE;QAEnD,MAAMG,WAAW,MAAM,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAACF,MAAM,UAAU;QACjF,IAAIE,SAAS,MAAM,IACf,OAAOH,OAAO,UAAU,CAAC,QAAQ,CAAC,KAAK,CAACG,SAAS,KAAK;QAG1D,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACF,MAAM,UAAU,EAAE;YAC1D,kBAAkBC;YAClB,QAAQ;QACZ;QAEA,MAAME,gBAAgB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAACH,MAAM,SAAS;QAC7E,IAAIG,cAAc,MAAM,IAAI;YACxB,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACH,MAAM,UAAU,EAAE;gBAAE,QAAQ;YAAS;YACjF,OAAOD,OAAO,UAAU,CAAC,QAAQ,CAAC,KAAK,CAACI,cAAc,KAAK;QAC/D;QACA,MAAMC,UAAUD,cAAc,KAAK;QAEnC,MAAME,MAAM,IAAIC;QAChB,MAAMC,UAA2B;YAC7B,IAAIN;YACJ,OAAOD,MAAM,SAAS;YACtB,WAAWK,IAAI,WAAW;YAC1B,WAAWL,MAAM,SAAS;YAC1B,QAAQ,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,EAAE;YACzC,MAAME,SAAS,KAAK,CAAC,OAAO;QAChC;QACA,MAAMM,UAAUC,KAAK,SAAS,CAACF;QAC/B,MAAMG,cAAc,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAC3CT,QACAI,KACAG,SACAJ,QAAQ,aAAa,IAAI;QAG7B,MAAMO,iBAAyC;YAC3C,gBAAgB;YAChB,GAAGD,WAAW;QAClB;QAEA,MAAME,YAAYN,KAAK,GAAG;QAC1B,IAAIO,iBAAiB;QACrB,IAAIC,eAAe;QAEnB,IAAI;YACA,MAAMC,WAAW,MAAMC,MAAMZ,QAAQ,WAAW,EAAE;gBAC9C,QAAQ;gBACR,SAASO;gBACT,MAAMH;gBACN,QAAQS,YAAY,OAAO,CAAC;YAChC;YACAJ,iBAAiBE,SAAS,MAAM;YAChCD,eAAe,MAAMC,SAAS,IAAI;QACtC,EAAE,OAAOG,OAAO;YACZL,iBAAiB;YACjBC,eAAgBI,MAAgB,OAAO;QAC3C;QAEA,MAAMC,eAAeb,KAAK,GAAG,KAAKM;QAElC,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACZ,MAAM,UAAU,EAAE;YAC1DO;YACAI;YACAQ;YACAN;YACAC;YACA,QAAQD,iBAAiB,IAAI,cAAc;QAC/C;QAEA,OAAOd,OAAO,UAAU,CAAC,QAAQ,CAAC,IAAI;IAC1C;AACJ;AAEO,MAAMqB,kBAAkBC,eAAe,oBAAoB,CAAC;IAC/D,gBAAgB7B;IAChB,cAAc;QACV8B;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"api/features/SendWebhookTask/SendWebhookTask.js","sources":["../../../../src/api/features/SendWebhookTask/SendWebhookTask.ts"],"sourcesContent":["import \"@webiny/tasks/types.js\";\nimport { TaskDefinition } from \"@webiny/api-core/exports/api/tasks.js\";\nimport { TenantContext } from \"@webiny/api-core/exports/api/tenancy.js\";\nimport { WebhookSignPayload } from \"@webiny/api-core/features/webhooks/index.js\";\nimport { GetWebhookRepository } from \"~/api/features/GetWebhook/abstractions.js\";\nimport { GetWebhookDeliveryRepository } from \"~/api/features/GetWebhookDelivery/abstractions.js\";\nimport { UpdateWebhookDeliveryRepository } from \"~/api/features/UpdateWebhookDelivery/abstractions.js\";\nimport { GetWebhookSettingsRepository } from \"~/api/features/GetWebhookSettings/abstractions.js\";\nimport { WebhookDeliver } from \"~/api/features/WebhookDeliver/abstractions.js\";\nimport { SEND_WEBHOOK_TASK } from \"~/api/domain/constants.js\";\nimport type { ISendWebhookTaskInput, ISendWebhookTaskOutput, IWebhookPayload } from \"./types.js\";\nimport type { IWebhookSignPayloadHeaders } from \"@webiny/api-core/features/webhooks/WebhookSignPayload/abstractions.js\";\n\ntype IRunParams = TaskDefinition.RunParams<ISendWebhookTaskInput, ISendWebhookTaskOutput>;\n\nclass SendWebhookTaskDefinition implements TaskDefinition.Interface<\n    ISendWebhookTaskInput,\n    ISendWebhookTaskOutput\n> {\n    public readonly id = SEND_WEBHOOK_TASK;\n    public readonly title = \"Send Webhook\";\n    public readonly maxIterations = 1;\n    public readonly isPrivate = true;\n    public readonly databaseLogs = false;\n    public readonly description =\n        \"POST a signed event payload to a webhook endpoint and log the delivery.\";\n    public readonly selfCleanup = \"always\";\n\n    public constructor(\n        private readonly getWebhookRepository: GetWebhookRepository.Interface,\n        private readonly getWebhookDeliveryRepository: GetWebhookDeliveryRepository.Interface,\n        private readonly updateDeliveryRepository: UpdateWebhookDeliveryRepository.Interface,\n        private readonly signPayload: WebhookSignPayload.Interface,\n        private readonly tenantContext: TenantContext.Interface,\n        private readonly getWebhookSettingsRepository: GetWebhookSettingsRepository.Interface,\n        private readonly deliver: WebhookDeliver.Interface\n    ) {}\n\n    public async run(params: IRunParams) {\n        const { input, controller } = params;\n        const taskId = controller.state.getTask().id;\n\n        const delivery = await this.getWebhookDeliveryRepository.execute(input.deliveryId);\n        if (delivery.isFail()) {\n            return controller.response.error(delivery.error);\n        }\n\n        await this.updateDeliveryRepository.execute(input.deliveryId, {\n            backgroundTaskId: taskId,\n            status: \"delivering\"\n        });\n\n        const webhookResult = await this.getWebhookRepository.execute(input.webhookId);\n        if (webhookResult.isFail()) {\n            await this.updateDeliveryRepository.execute(input.deliveryId, { status: \"failed\" });\n            return controller.response.error(webhookResult.error);\n        }\n        const webhook = webhookResult.value;\n\n        const now = new Date();\n        const payload: IWebhookPayload = {\n            id: taskId,\n            event: input.eventName,\n            timestamp: now.toISOString(),\n            webhookId: input.webhookId,\n            deliveryId: input.deliveryId,\n            tenant: this.tenantContext.getTenant().id,\n            data: delivery.value.payload\n        };\n        const rawBody = JSON.stringify(payload);\n        let signHeaders: IWebhookSignPayloadHeaders;\n\n        const settingsResult = await this.getWebhookSettingsRepository.execute();\n        if (settingsResult.isFail()) {\n            await this.updateDeliveryRepository.execute(input.deliveryId, { status: \"failed\" });\n            return controller.response.error(settingsResult.error);\n        }\n        const signingSecret = webhook.signingSecret || settingsResult.value.signingSecret || \"\";\n\n        try {\n            signHeaders = await this.signPayload.sign(taskId, now, rawBody, signingSecret);\n        } catch (ex) {\n            await this.updateDeliveryRepository.execute(input.deliveryId, { status: \"failed\" });\n            return controller.response.error(ex);\n        }\n\n        const requestHeaders: Record<string, string> = {\n            \"Content-Type\": \"application/json\",\n            ...signHeaders\n        };\n\n        const result = await this.deliver.execute({\n            url: webhook.endpointUrl,\n            headers: requestHeaders,\n            body: rawBody,\n            timeout: 600_000,\n            maxRetries: 3,\n            initialDelay: 1000,\n            maxDelay: 30_000\n        });\n\n        await this.updateDeliveryRepository.execute(input.deliveryId, {\n            payload,\n            requestHeaders,\n            responseTime: result.responseTime,\n            responseStatus: result.status,\n            responseBody: result.body,\n            status: result.status > 0 ? \"delivered\" : \"failed\"\n        });\n\n        return controller.response.done();\n    }\n}\n\nexport const SendWebhookTask = TaskDefinition.createImplementation({\n    implementation: SendWebhookTaskDefinition,\n    dependencies: [\n        GetWebhookRepository,\n        GetWebhookDeliveryRepository,\n        UpdateWebhookDeliveryRepository,\n        WebhookSignPayload,\n        TenantContext,\n        GetWebhookSettingsRepository,\n        WebhookDeliver\n    ]\n});\n"],"names":["SendWebhookTaskDefinition","getWebhookRepository","getWebhookDeliveryRepository","updateDeliveryRepository","signPayload","tenantContext","getWebhookSettingsRepository","deliver","SEND_WEBHOOK_TASK","params","input","controller","taskId","delivery","webhookResult","webhook","now","Date","payload","rawBody","JSON","signHeaders","settingsResult","signingSecret","ex","requestHeaders","result","SendWebhookTask","TaskDefinition","GetWebhookRepository","GetWebhookDeliveryRepository","UpdateWebhookDeliveryRepository","WebhookSignPayload","TenantContext","GetWebhookSettingsRepository","WebhookDeliver"],"mappings":";;;;;;;;;;AAeA,MAAMA;IAaF,YACqBC,oBAAoD,EACpDC,4BAAoE,EACpEC,wBAAmE,EACnEC,WAAyC,EACzCC,aAAsC,EACtCC,4BAAoE,EACpEC,OAAiC,CACpD;aAPmBN,oBAAoB,GAApBA;aACAC,4BAA4B,GAA5BA;aACAC,wBAAwB,GAAxBA;aACAC,WAAW,GAAXA;aACAC,aAAa,GAAbA;aACAC,4BAA4B,GAA5BA;aACAC,OAAO,GAAPA;aAhBL,EAAE,GAAGC;aACL,KAAK,GAAG;aACR,aAAa,GAAG;aAChB,SAAS,GAAG;aACZ,YAAY,GAAG;aACf,WAAW,GACvB;aACY,WAAW,GAAG;IAU3B;IAEH,MAAa,IAAIC,MAAkB,EAAE;QACjC,MAAM,EAAEC,KAAK,EAAEC,UAAU,EAAE,GAAGF;QAC9B,MAAMG,SAASD,WAAW,KAAK,CAAC,OAAO,GAAG,EAAE;QAE5C,MAAME,WAAW,MAAM,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAACH,MAAM,UAAU;QACjF,IAAIG,SAAS,MAAM,IACf,OAAOF,WAAW,QAAQ,CAAC,KAAK,CAACE,SAAS,KAAK;QAGnD,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACH,MAAM,UAAU,EAAE;YAC1D,kBAAkBE;YAClB,QAAQ;QACZ;QAEA,MAAME,gBAAgB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAACJ,MAAM,SAAS;QAC7E,IAAII,cAAc,MAAM,IAAI;YACxB,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACJ,MAAM,UAAU,EAAE;gBAAE,QAAQ;YAAS;YACjF,OAAOC,WAAW,QAAQ,CAAC,KAAK,CAACG,cAAc,KAAK;QACxD;QACA,MAAMC,UAAUD,cAAc,KAAK;QAEnC,MAAME,MAAM,IAAIC;QAChB,MAAMC,UAA2B;YAC7B,IAAIN;YACJ,OAAOF,MAAM,SAAS;YACtB,WAAWM,IAAI,WAAW;YAC1B,WAAWN,MAAM,SAAS;YAC1B,YAAYA,MAAM,UAAU;YAC5B,QAAQ,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,EAAE;YACzC,MAAMG,SAAS,KAAK,CAAC,OAAO;QAChC;QACA,MAAMM,UAAUC,KAAK,SAAS,CAACF;QAC/B,IAAIG;QAEJ,MAAMC,iBAAiB,MAAM,IAAI,CAAC,4BAA4B,CAAC,OAAO;QACtE,IAAIA,eAAe,MAAM,IAAI;YACzB,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACZ,MAAM,UAAU,EAAE;gBAAE,QAAQ;YAAS;YACjF,OAAOC,WAAW,QAAQ,CAAC,KAAK,CAACW,eAAe,KAAK;QACzD;QACA,MAAMC,gBAAgBR,QAAQ,aAAa,IAAIO,eAAe,KAAK,CAAC,aAAa,IAAI;QAErF,IAAI;YACAD,cAAc,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAACT,QAAQI,KAAKG,SAASI;QACpE,EAAE,OAAOC,IAAI;YACT,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACd,MAAM,UAAU,EAAE;gBAAE,QAAQ;YAAS;YACjF,OAAOC,WAAW,QAAQ,CAAC,KAAK,CAACa;QACrC;QAEA,MAAMC,iBAAyC;YAC3C,gBAAgB;YAChB,GAAGJ,WAAW;QAClB;QAEA,MAAMK,SAAS,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YACtC,KAAKX,QAAQ,WAAW;YACxB,SAASU;YACT,MAAMN;YACN,SAAS;YACT,YAAY;YACZ,cAAc;YACd,UAAU;QACd;QAEA,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACT,MAAM,UAAU,EAAE;YAC1DQ;YACAO;YACA,cAAcC,OAAO,YAAY;YACjC,gBAAgBA,OAAO,MAAM;YAC7B,cAAcA,OAAO,IAAI;YACzB,QAAQA,OAAO,MAAM,GAAG,IAAI,cAAc;QAC9C;QAEA,OAAOf,WAAW,QAAQ,CAAC,IAAI;IACnC;AACJ;AAEO,MAAMgB,kBAAkBC,eAAe,oBAAoB,CAAC;IAC/D,gBAAgB5B;IAChB,cAAc;QACV6B;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/api/features/SendWebhookTask/types.d.ts

@@ -10,6 +10,7 @@ export interface IWebhookPayload {
     event: string;
     timestamp: string;
     webhookId: string;
+    deliveryId: string;
     tenant: string;
     data: unknown;
 }

package/api/features/TriggerWebhook/TriggerWebhookUseCase.js

@@ -1,10 +1,11 @@
 import { Result } from "@webiny/feature/api";
 import { TaskService } from "@webiny/api-core/exports/api/tasks.js";
 import { TriggerWebhookUseCase } from "./abstractions.js";
+import { TriggerWebhookInputSchema } from "./schema.js";
 import { GetWebhookRepository } from "../GetWebhook/abstractions.js";
 import { CreateWebhookDeliveryRepository } from "../CreateWebhookDelivery/abstractions.js";
 import { WebhookPermissions } from "../WebhookPermissions/abstractions.js";
-import { WebhookNotAuthorizedError } from "../../domain/errors.js";
+import { WebhookNotAuthorizedError, WebhookValidationError } from "../../domain/errors.js";
 import { SEND_WEBHOOK_TASK, WEBHOOK_DELIVERY_RETENTION_DAYS } from "../../domain/constants.js";
 class TriggerWebhookUseCaseImpl {
     constructor(permissions, getWebhookRepository, createDeliveryRepository, taskService){
@@ -15,7 +16,12 @@ class TriggerWebhookUseCaseImpl {
     }
     async execute(webhookId, payload) {
         if (!await this.permissions.canEdit("webhook")) return Result.fail(new WebhookNotAuthorizedError());
-        const webhookResult = await this.getWebhookRepository.execute(webhookId);
+        const parsed = TriggerWebhookInputSchema.safeParse({
+            webhookId,
+            payload
+        });
+        if (!parsed.success) return Result.fail(new WebhookValidationError(parsed.error));
+        const webhookResult = await this.getWebhookRepository.execute(parsed.data.webhookId);
         if (webhookResult.isFail()) return Result.fail(webhookResult.error);
         const webhook = webhookResult.value;
         const expiresAt = new Date(Date.now() + 24 * WEBHOOK_DELIVERY_RETENTION_DAYS * 3600000).toISOString();

package/api/features/TriggerWebhook/TriggerWebhookUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/features/TriggerWebhook/TriggerWebhookUseCase.js","sources":["../../../../src/api/features/TriggerWebhook/TriggerWebhookUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { TaskService } from \"@webiny/api-core/exports/api/tasks.js\";\nimport { TriggerWebhookUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { GetWebhookRepository } from \"~/api/features/GetWebhook/abstractions.js\";\nimport { CreateWebhookDeliveryRepository } from \"~/api/features/CreateWebhookDelivery/abstractions.js\";\nimport { WebhookPermissions } from \"~/api/features/WebhookPermissions/abstractions.js\";\nimport { WebhookNotAuthorizedError } from \"~/api/domain/errors.js\";\nimport { SEND_WEBHOOK_TASK, WEBHOOK_DELIVERY_RETENTION_DAYS } from \"~/api/domain/constants.js\";\nimport type { ISendWebhookTaskInput } from \"~/api/features/SendWebhookTask/types.js\";\nimport type { WebhookDelivery } from \"~/api/domain/WebhookDelivery.js\";\n\nclass TriggerWebhookUseCaseImpl implements UseCaseAbstraction.Interface {\n    constructor(\n        private readonly permissions: WebhookPermissions.Interface,\n        private readonly getWebhookRepository: GetWebhookRepository.Interface,\n        private readonly createDeliveryRepository: CreateWebhookDeliveryRepository.Interface,\n        private readonly taskService: TaskService.Interface\n    ) {}\n\n    async execute(\n        webhookId: string,\n        payload: Record<string, unknown>\n    ): Promise<Result<WebhookDelivery, UseCaseAbstraction.Error>> {\n        if (!(await this.permissions.canEdit(\"webhook\"))) {\n            return Result.fail(new WebhookNotAuthorizedError());\n        }\n\n        const webhookResult = await this.getWebhookRepository.execute(webhookId);\n        if (webhookResult.isFail()) {\n            return Result.fail(webhookResult.error);\n        }\n\n        const webhook = webhookResult.value;\n\n        const expiresAt = new Date(\n            Date.now() + WEBHOOK_DELIVERY_RETENTION_DAYS * 24 * 60 * 60 * 1000\n        ).toISOString();\n\n        const deliveryResult = await this.createDeliveryRepository.execute({\n            webhookId: webhook.id,\n            eventType: \"webhook.test\",\n            status: \"pending\",\n            payload,\n            expiresAt\n        });\n\n        if (deliveryResult.isFail()) {\n            return Result.fail(deliveryResult.error);\n        }\n\n        const delivery = deliveryResult.value;\n\n        await this.taskService.trigger<ISendWebhookTaskInput>({\n            definition: SEND_WEBHOOK_TASK,\n            name: `Test webhook: ${webhook.slug}`,\n            input: {\n                webhookId: webhook.id,\n                eventName: \"webhook.test\",\n                deliveryId: delivery.id\n            }\n        });\n\n        return Result.ok(delivery);\n    }\n}\n\nexport const TriggerWebhookUseCase = UseCaseAbstraction.createImplementation({\n    implementation: TriggerWebhookUseCaseImpl,\n    dependencies: [\n        WebhookPermissions,\n        GetWebhookRepository,\n        CreateWebhookDeliveryRepository,\n        TaskService\n    ]\n});\n"],"names":["TriggerWebhookUseCaseImpl","permissions","getWebhookRepository","createDeliveryRepository","taskService","webhookId","payload","Result","WebhookNotAuthorizedError","webhookResult","webhook","expiresAt","Date","WEBHOOK_DELIVERY_RETENTION_DAYS","deliveryResult","delivery","SEND_WEBHOOK_TASK","TriggerWebhookUseCase","UseCaseAbstraction","WebhookPermissions","GetWebhookRepository","CreateWebhookDeliveryRepository","TaskService"],"mappings":";;;;;;;;AAWA,MAAMA;IACF,YACqBC,WAAyC,EACzCC,oBAAoD,EACpDC,wBAAmE,EACnEC,WAAkC,CACrD;aAJmBH,WAAW,GAAXA;aACAC,oBAAoB,GAApBA;aACAC,wBAAwB,GAAxBA;aACAC,WAAW,GAAXA;IAClB;IAEH,MAAM,QACFC,SAAiB,EACjBC,OAAgC,EAC0B;QAC1D,IAAI,CAAE,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,YACjC,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAG3B,MAAMC,gBAAgB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAACJ;QAC9D,IAAII,cAAc,MAAM,IACpB,OAAOF,OAAO,IAAI,CAACE,cAAc,KAAK;QAG1C,MAAMC,UAAUD,cAAc,KAAK;QAEnC,MAAME,YAAY,IAAIC,KAClBA,KAAK,GAAG,KAAKC,AAAkC,KAAlCA,kCAAAA,SACf,WAAW;QAEb,MAAMC,iBAAiB,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC;YAC/D,WAAWJ,QAAQ,EAAE;YACrB,WAAW;YACX,QAAQ;YACRJ;YACAK;QACJ;QAEA,IAAIG,eAAe,MAAM,IACrB,OAAOP,OAAO,IAAI,CAACO,eAAe,KAAK;QAG3C,MAAMC,WAAWD,eAAe,KAAK;QAErC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAwB;YAClD,YAAYE;YACZ,MAAM,CAAC,cAAc,EAAEN,QAAQ,IAAI,EAAE;YACrC,OAAO;gBACH,WAAWA,QAAQ,EAAE;gBACrB,WAAW;gBACX,YAAYK,SAAS,EAAE;YAC3B;QACJ;QAEA,OAAOR,OAAO,EAAE,CAACQ;IACrB;AACJ;AAEO,MAAME,8CAAwBC,sBAAAA,oBAAuC,CAAC;IACzE,gBAAgBlB;IAChB,cAAc;QACVmB;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"api/features/TriggerWebhook/TriggerWebhookUseCase.js","sources":["../../../../src/api/features/TriggerWebhook/TriggerWebhookUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { TaskService } from \"@webiny/api-core/exports/api/tasks.js\";\nimport { TriggerWebhookUseCase as UseCaseAbstraction } from \"./abstractions.js\";\nimport { TriggerWebhookInputSchema } from \"./schema.js\";\nimport { GetWebhookRepository } from \"~/api/features/GetWebhook/abstractions.js\";\nimport { CreateWebhookDeliveryRepository } from \"~/api/features/CreateWebhookDelivery/abstractions.js\";\nimport { WebhookPermissions } from \"~/api/features/WebhookPermissions/abstractions.js\";\nimport { WebhookNotAuthorizedError, WebhookValidationError } from \"~/api/domain/errors.js\";\nimport { SEND_WEBHOOK_TASK, WEBHOOK_DELIVERY_RETENTION_DAYS } from \"~/api/domain/constants.js\";\nimport type { ISendWebhookTaskInput } from \"~/api/features/SendWebhookTask/types.js\";\nimport type { WebhookDelivery } from \"~/api/domain/WebhookDelivery.js\";\n\nclass TriggerWebhookUseCaseImpl implements UseCaseAbstraction.Interface {\n    constructor(\n        private readonly permissions: WebhookPermissions.Interface,\n        private readonly getWebhookRepository: GetWebhookRepository.Interface,\n        private readonly createDeliveryRepository: CreateWebhookDeliveryRepository.Interface,\n        private readonly taskService: TaskService.Interface\n    ) {}\n\n    async execute(\n        webhookId: string,\n        payload: Record<string, unknown>\n    ): Promise<Result<WebhookDelivery, UseCaseAbstraction.Error>> {\n        if (!(await this.permissions.canEdit(\"webhook\"))) {\n            return Result.fail(new WebhookNotAuthorizedError());\n        }\n\n        const parsed = TriggerWebhookInputSchema.safeParse({ webhookId, payload });\n        if (!parsed.success) {\n            return Result.fail(new WebhookValidationError(parsed.error));\n        }\n\n        const webhookResult = await this.getWebhookRepository.execute(parsed.data.webhookId);\n        if (webhookResult.isFail()) {\n            return Result.fail(webhookResult.error);\n        }\n\n        const webhook = webhookResult.value;\n\n        const expiresAt = new Date(\n            Date.now() + WEBHOOK_DELIVERY_RETENTION_DAYS * 24 * 60 * 60 * 1000\n        ).toISOString();\n\n        const deliveryResult = await this.createDeliveryRepository.execute({\n            webhookId: webhook.id,\n            eventType: \"webhook.test\",\n            status: \"pending\",\n            payload,\n            expiresAt\n        });\n\n        if (deliveryResult.isFail()) {\n            return Result.fail(deliveryResult.error);\n        }\n\n        const delivery = deliveryResult.value;\n\n        await this.taskService.trigger<ISendWebhookTaskInput>({\n            definition: SEND_WEBHOOK_TASK,\n            name: `Test webhook: ${webhook.slug}`,\n            input: {\n                webhookId: webhook.id,\n                eventName: \"webhook.test\",\n                deliveryId: delivery.id\n            }\n        });\n\n        return Result.ok(delivery);\n    }\n}\n\nexport const TriggerWebhookUseCase = UseCaseAbstraction.createImplementation({\n    implementation: TriggerWebhookUseCaseImpl,\n    dependencies: [\n        WebhookPermissions,\n        GetWebhookRepository,\n        CreateWebhookDeliveryRepository,\n        TaskService\n    ]\n});\n"],"names":["TriggerWebhookUseCaseImpl","permissions","getWebhookRepository","createDeliveryRepository","taskService","webhookId","payload","Result","WebhookNotAuthorizedError","parsed","TriggerWebhookInputSchema","WebhookValidationError","webhookResult","webhook","expiresAt","Date","WEBHOOK_DELIVERY_RETENTION_DAYS","deliveryResult","delivery","SEND_WEBHOOK_TASK","TriggerWebhookUseCase","UseCaseAbstraction","WebhookPermissions","GetWebhookRepository","CreateWebhookDeliveryRepository","TaskService"],"mappings":";;;;;;;;;AAYA,MAAMA;IACF,YACqBC,WAAyC,EACzCC,oBAAoD,EACpDC,wBAAmE,EACnEC,WAAkC,CACrD;aAJmBH,WAAW,GAAXA;aACAC,oBAAoB,GAApBA;aACAC,wBAAwB,GAAxBA;aACAC,WAAW,GAAXA;IAClB;IAEH,MAAM,QACFC,SAAiB,EACjBC,OAAgC,EAC0B;QAC1D,IAAI,CAAE,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,YACjC,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAG3B,MAAMC,SAASC,0BAA0B,SAAS,CAAC;YAAEL;YAAWC;QAAQ;QACxE,IAAI,CAACG,OAAO,OAAO,EACf,OAAOF,OAAO,IAAI,CAAC,IAAII,uBAAuBF,OAAO,KAAK;QAG9D,MAAMG,gBAAgB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAACH,OAAO,IAAI,CAAC,SAAS;QACnF,IAAIG,cAAc,MAAM,IACpB,OAAOL,OAAO,IAAI,CAACK,cAAc,KAAK;QAG1C,MAAMC,UAAUD,cAAc,KAAK;QAEnC,MAAME,YAAY,IAAIC,KAClBA,KAAK,GAAG,KAAKC,AAAkC,KAAlCA,kCAAAA,SACf,WAAW;QAEb,MAAMC,iBAAiB,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC;YAC/D,WAAWJ,QAAQ,EAAE;YACrB,WAAW;YACX,QAAQ;YACRP;YACAQ;QACJ;QAEA,IAAIG,eAAe,MAAM,IACrB,OAAOV,OAAO,IAAI,CAACU,eAAe,KAAK;QAG3C,MAAMC,WAAWD,eAAe,KAAK;QAErC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAwB;YAClD,YAAYE;YACZ,MAAM,CAAC,cAAc,EAAEN,QAAQ,IAAI,EAAE;YACrC,OAAO;gBACH,WAAWA,QAAQ,EAAE;gBACrB,WAAW;gBACX,YAAYK,SAAS,EAAE;YAC3B;QACJ;QAEA,OAAOX,OAAO,EAAE,CAACW;IACrB;AACJ;AAEO,MAAME,8CAAwBC,sBAAAA,oBAAuC,CAAC;IACzE,gBAAgBrB;IAChB,cAAc;QACVsB;QACAC;QACAC;QACAC;KACH;AACL"}

package/api/features/TriggerWebhook/abstractions.d.ts

@@ -1,7 +1,7 @@
 import { type Result } from "@webiny/feature/api";
 import type { WebhookDelivery } from "../../../api/domain/WebhookDelivery.js";
-import type { WebhookNotFoundError, WebhookPersistenceError, WebhookModelNotFoundError, WebhookNotAuthorizedError } from "../../../api/domain/errors.js";
-type IError = WebhookNotFoundError | WebhookPersistenceError | WebhookModelNotFoundError | WebhookNotAuthorizedError;
+import type { WebhookNotFoundError, WebhookPersistenceError, WebhookModelNotFoundError, WebhookNotAuthorizedError, WebhookValidationError } from "../../../api/domain/errors.js";
+type IError = WebhookNotFoundError | WebhookPersistenceError | WebhookModelNotFoundError | WebhookNotAuthorizedError | WebhookValidationError;
 export interface ITriggerWebhookUseCase {
     execute(webhookId: string, payload: Record<string, unknown>): Promise<Result<WebhookDelivery, IError>>;
 }

package/api/features/TriggerWebhook/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/features/TriggerWebhook/abstractions.js","sources":["../../../../src/api/features/TriggerWebhook/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { WebhookDelivery } from \"~/api/domain/WebhookDelivery.js\";\nimport type {\n    WebhookNotFoundError,\n    WebhookPersistenceError,\n    WebhookModelNotFoundError,\n    WebhookNotAuthorizedError\n} from \"~/api/domain/errors.js\";\n\ntype IError =\n    | WebhookNotFoundError\n    | WebhookPersistenceError\n    | WebhookModelNotFoundError\n    | WebhookNotAuthorizedError;\n\nexport interface ITriggerWebhookUseCase {\n    execute(\n        webhookId: string,\n        payload: Record<string, unknown>\n    ): Promise<Result<WebhookDelivery, IError>>;\n}\n\nexport const TriggerWebhookUseCase = createAbstraction<ITriggerWebhookUseCase>(\n    \"Webhooks/TriggerWebhookUseCase\"\n);\n\nexport namespace TriggerWebhookUseCase {\n    export type Interface = ITriggerWebhookUseCase;\n    export type Error = IError;\n}\n"],"names":["TriggerWebhookUseCase","createAbstraction"],"mappings":";AAsBO,MAAMA,wBAAwBC,kBACjC"}
+{"version":3,"file":"api/features/TriggerWebhook/abstractions.js","sources":["../../../../src/api/features/TriggerWebhook/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { WebhookDelivery } from \"~/api/domain/WebhookDelivery.js\";\nimport type {\n    WebhookNotFoundError,\n    WebhookPersistenceError,\n    WebhookModelNotFoundError,\n    WebhookNotAuthorizedError,\n    WebhookValidationError\n} from \"~/api/domain/errors.js\";\n\ntype IError =\n    | WebhookNotFoundError\n    | WebhookPersistenceError\n    | WebhookModelNotFoundError\n    | WebhookNotAuthorizedError\n    | WebhookValidationError;\n\nexport interface ITriggerWebhookUseCase {\n    execute(\n        webhookId: string,\n        payload: Record<string, unknown>\n    ): Promise<Result<WebhookDelivery, IError>>;\n}\n\nexport const TriggerWebhookUseCase = createAbstraction<ITriggerWebhookUseCase>(\n    \"Webhooks/TriggerWebhookUseCase\"\n);\n\nexport namespace TriggerWebhookUseCase {\n    export type Interface = ITriggerWebhookUseCase;\n    export type Error = IError;\n}\n"],"names":["TriggerWebhookUseCase","createAbstraction"],"mappings":";AAwBO,MAAMA,wBAAwBC,kBACjC"}

package/api/features/TriggerWebhook/schema.d.ts

@@ -0,0 +1,5 @@
+import { z } from "zod";
+export declare const TriggerWebhookInputSchema: z.ZodObject<{
+    webhookId: z.ZodString;
+    payload: z.ZodRecord<z.ZodString, z.ZodUnknown>;
+}, z.core.$strip>;

package/api/features/TriggerWebhook/schema.js

@@ -0,0 +1,8 @@
+import { z } from "zod";
+const TriggerWebhookInputSchema = z.object({
+    webhookId: z.string().min(1, "Webhook ID is required."),
+    payload: z.record(z.string(), z.unknown())
+});
+export { TriggerWebhookInputSchema };
+
+//# sourceMappingURL=schema.js.map

package/api/features/TriggerWebhook/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api/features/TriggerWebhook/schema.js","sources":["../../../../src/api/features/TriggerWebhook/schema.ts"],"sourcesContent":["import { z } from \"zod\";\n\nexport const TriggerWebhookInputSchema = z.object({\n    webhookId: z.string().min(1, \"Webhook ID is required.\"),\n    payload: z.record(z.string(), z.unknown())\n});\n"],"names":["TriggerWebhookInputSchema","z"],"mappings":";AAEO,MAAMA,4BAA4BC,EAAE,MAAM,CAAC;IAC9C,WAAWA,EAAE,MAAM,GAAG,GAAG,CAAC,GAAG;IAC7B,SAASA,EAAE,MAAM,CAACA,EAAE,MAAM,IAAIA,EAAE,OAAO;AAC3C"}

package/api/features/UpdateWebhook/UpdateWebhookUseCase.d.ts

@@ -1,12 +1,12 @@
 import { Result } from "@webiny/feature/api";
-import { UpdateWebhookUseCase as UseCaseAbstraction, UpdateWebhookRepository } from "./abstractions.js";
+import { UpdateWebhookRepository, UpdateWebhookUseCase as UseCaseAbstraction } from "./abstractions.js";
 import { GetWebhookRepository } from "../../../api/features/GetWebhook/abstractions.js";
 import { WebhookPermissions } from "../../../api/features/WebhookPermissions/abstractions.js";
 import type { Webhook } from "../../../api/domain/Webhook.js";
 declare class UpdateWebhookUseCaseImpl implements UseCaseAbstraction.Interface {
-    private permissions;
-    private getWebhookRepository;
-    private updateRepository;
+    private readonly permissions;
+    private readonly getWebhookRepository;
+    private readonly updateRepository;
     constructor(permissions: WebhookPermissions.Interface, getWebhookRepository: GetWebhookRepository.Interface, updateRepository: UpdateWebhookRepository.Interface);
     execute(id: string, input: UseCaseAbstraction.Input): Promise<Result<Webhook, UseCaseAbstraction.Error>>;
 }

package/api/features/UpdateWebhook/UpdateWebhookUseCase.js

@@ -1,18 +1,9 @@
 import { Result } from "@webiny/feature/api";
 import { UpdateWebhookRepository, UpdateWebhookUseCase } from "./abstractions.js";
+import { UpdateWebhookInputSchema } from "./schema.js";
 import { GetWebhookRepository } from "../GetWebhook/abstractions.js";
 import { WebhookPermissions } from "../WebhookPermissions/abstractions.js";
 import { WebhookNotAuthorizedError, WebhookValidationError } from "../../domain/errors.js";
-const isValidEndpointUrl = (url)=>{
-    try {
-        const parsed = new URL(url);
-        if ("https:" === parsed.protocol) return true;
-        if ("http:" === parsed.protocol && ("localhost" === parsed.hostname || "127.0.0.1" === parsed.hostname)) return true;
-        return false;
-    } catch  {
-        return false;
-    }
-};
 class UpdateWebhookUseCaseImpl {
     constructor(permissions, getWebhookRepository, updateRepository){
         this.permissions = permissions;
@@ -21,34 +12,19 @@ class UpdateWebhookUseCaseImpl {
     }
     async execute(id, input) {
         if (!await this.permissions.canEdit("webhook")) return Result.fail(new WebhookNotAuthorizedError());
+        const parsed = UpdateWebhookInputSchema.safeParse(input);
+        if (!parsed.success) return Result.fail(new WebhookValidationError(parsed.error));
         const getResult = await this.getWebhookRepository.execute(id);
         if (getResult.isFail()) return Result.fail(getResult.error);
         const existing = getResult.value;
-        if (input.endpointUrl && !isValidEndpointUrl(input.endpointUrl)) return Result.fail(new WebhookValidationError("Endpoint URL must use HTTPS. HTTP is only allowed for localhost."));
-        if (void 0 !== input.events && 0 === input.events.length) return Result.fail(new WebhookValidationError("At least one event must be selected."));
         const updated = {
             ...existing,
-            ...void 0 !== input.name ? {
-                name: input.name
-            } : {},
-            ...void 0 !== input.slug ? {
-                slug: input.slug
-            } : {},
-            ...void 0 !== input.endpointUrl ? {
-                endpointUrl: input.endpointUrl
-            } : {},
-            ...void 0 !== input.description ? {
-                description: input.description
-            } : {},
-            ...void 0 !== input.enabled ? {
-                enabled: input.enabled
-            } : {},
-            ...void 0 !== input.events ? {
-                events: input.events
-            } : {},
-            ...void 0 !== input.signingSecret ? {
-                signingSecret: input.signingSecret
-            } : {}
+            name: parsed.data.name ?? existing.name,
+            endpointUrl: parsed.data.endpointUrl ?? existing.endpointUrl,
+            description: parsed.data.description ?? existing.description,
+            enabled: parsed.data.enabled ?? existing.enabled,
+            events: parsed.data.events ?? existing.events,
+            signingSecret: parsed.data.signingSecret ?? existing.signingSecret
         };
         return this.updateRepository.execute(updated);
     }

package/api/features/UpdateWebhook/UpdateWebhookUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/features/UpdateWebhook/UpdateWebhookUseCase.js","sources":["../../../../src/api/features/UpdateWebhook/UpdateWebhookUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    UpdateWebhookUseCase as UseCaseAbstraction,\n    UpdateWebhookRepository\n} from \"./abstractions.js\";\nimport { GetWebhookRepository } from \"~/api/features/GetWebhook/abstractions.js\";\nimport { WebhookPermissions } from \"~/api/features/WebhookPermissions/abstractions.js\";\nimport { WebhookValidationError, WebhookNotAuthorizedError } from \"~/api/domain/errors.js\";\nimport type { Webhook } from \"~/api/domain/Webhook.js\";\n\nconst isValidEndpointUrl = (url: string): boolean => {\n    try {\n        const parsed = new URL(url);\n        if (parsed.protocol === \"https:\") {\n            return true;\n        }\n        if (\n            parsed.protocol === \"http:\" &&\n            (parsed.hostname === \"localhost\" || parsed.hostname === \"127.0.0.1\")\n        ) {\n            return true;\n        }\n        return false;\n    } catch {\n        return false;\n    }\n};\n\nclass UpdateWebhookUseCaseImpl implements UseCaseAbstraction.Interface {\n    constructor(\n        private permissions: WebhookPermissions.Interface,\n        private getWebhookRepository: GetWebhookRepository.Interface,\n        private updateRepository: UpdateWebhookRepository.Interface\n    ) {}\n\n    async execute(\n        id: string,\n        input: UseCaseAbstraction.Input\n    ): Promise<Result<Webhook, UseCaseAbstraction.Error>> {\n        if (!(await this.permissions.canEdit(\"webhook\"))) {\n            return Result.fail(new WebhookNotAuthorizedError());\n        }\n\n        const getResult = await this.getWebhookRepository.execute(id);\n        if (getResult.isFail()) {\n            return Result.fail(getResult.error);\n        }\n\n        const existing = getResult.value;\n\n        if (input.endpointUrl && !isValidEndpointUrl(input.endpointUrl)) {\n            return Result.fail(\n                new WebhookValidationError(\n                    \"Endpoint URL must use HTTPS. HTTP is only allowed for localhost.\"\n                )\n            );\n        }\n\n        if (input.events !== undefined && input.events.length === 0) {\n            return Result.fail(new WebhookValidationError(\"At least one event must be selected.\"));\n        }\n\n        const updated: Webhook = {\n            ...existing,\n            ...(input.name !== undefined ? { name: input.name } : {}),\n            ...(input.slug !== undefined ? { slug: input.slug } : {}),\n            ...(input.endpointUrl !== undefined ? { endpointUrl: input.endpointUrl } : {}),\n            ...(input.description !== undefined ? { description: input.description } : {}),\n            ...(input.enabled !== undefined ? { enabled: input.enabled } : {}),\n            ...(input.events !== undefined ? { events: input.events } : {}),\n            ...(input.signingSecret !== undefined ? { signingSecret: input.signingSecret } : {})\n        };\n\n        return this.updateRepository.execute(updated);\n    }\n}\n\nexport const UpdateWebhookUseCase = UseCaseAbstraction.createImplementation({\n    implementation: UpdateWebhookUseCaseImpl,\n    dependencies: [WebhookPermissions, GetWebhookRepository, UpdateWebhookRepository]\n});\n"],"names":["isValidEndpointUrl","url","parsed","URL","UpdateWebhookUseCaseImpl","permissions","getWebhookRepository","updateRepository","id","input","Result","WebhookNotAuthorizedError","getResult","existing","WebhookValidationError","undefined","updated","UpdateWebhookUseCase","UseCaseAbstraction","WebhookPermissions","GetWebhookRepository","UpdateWebhookRepository"],"mappings":";;;;;AAUA,MAAMA,qBAAqB,CAACC;IACxB,IAAI;QACA,MAAMC,SAAS,IAAIC,IAAIF;QACvB,IAAIC,AAAoB,aAApBA,OAAO,QAAQ,EACf,OAAO;QAEX,IACIA,AAAoB,YAApBA,OAAO,QAAQ,IACdA,CAAAA,AAAoB,gBAApBA,OAAO,QAAQ,IAAoBA,AAAoB,gBAApBA,OAAO,QAAQ,AAAe,GAElE,OAAO;QAEX,OAAO;IACX,EAAE,OAAM;QACJ,OAAO;IACX;AACJ;AAEA,MAAME;IACF,YACYC,WAAyC,EACzCC,oBAAoD,EACpDC,gBAAmD,CAC7D;aAHUF,WAAW,GAAXA;aACAC,oBAAoB,GAApBA;aACAC,gBAAgB,GAAhBA;IACT;IAEH,MAAM,QACFC,EAAU,EACVC,KAA+B,EACmB;QAClD,IAAI,CAAE,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,YACjC,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAG3B,MAAMC,YAAY,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAACJ;QAC1D,IAAII,UAAU,MAAM,IAChB,OAAOF,OAAO,IAAI,CAACE,UAAU,KAAK;QAGtC,MAAMC,WAAWD,UAAU,KAAK;QAEhC,IAAIH,MAAM,WAAW,IAAI,CAACT,mBAAmBS,MAAM,WAAW,GAC1D,OAAOC,OAAO,IAAI,CACd,IAAII,uBACA;QAKZ,IAAIL,AAAiBM,WAAjBN,MAAM,MAAM,IAAkBA,AAAwB,MAAxBA,MAAM,MAAM,CAAC,MAAM,EACjD,OAAOC,OAAO,IAAI,CAAC,IAAII,uBAAuB;QAGlD,MAAME,UAAmB;YACrB,GAAGH,QAAQ;YACX,GAAIJ,AAAeM,WAAfN,MAAM,IAAI,GAAiB;gBAAE,MAAMA,MAAM,IAAI;YAAC,IAAI,CAAC,CAAC;YACxD,GAAIA,AAAeM,WAAfN,MAAM,IAAI,GAAiB;gBAAE,MAAMA,MAAM,IAAI;YAAC,IAAI,CAAC,CAAC;YACxD,GAAIA,AAAsBM,WAAtBN,MAAM,WAAW,GAAiB;gBAAE,aAAaA,MAAM,WAAW;YAAC,IAAI,CAAC,CAAC;YAC7E,GAAIA,AAAsBM,WAAtBN,MAAM,WAAW,GAAiB;gBAAE,aAAaA,MAAM,WAAW;YAAC,IAAI,CAAC,CAAC;YAC7E,GAAIA,AAAkBM,WAAlBN,MAAM,OAAO,GAAiB;gBAAE,SAASA,MAAM,OAAO;YAAC,IAAI,CAAC,CAAC;YACjE,GAAIA,AAAiBM,WAAjBN,MAAM,MAAM,GAAiB;gBAAE,QAAQA,MAAM,MAAM;YAAC,IAAI,CAAC,CAAC;YAC9D,GAAIA,AAAwBM,WAAxBN,MAAM,aAAa,GAAiB;gBAAE,eAAeA,MAAM,aAAa;YAAC,IAAI,CAAC,CAAC;QACvF;QAEA,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAACO;IACzC;AACJ;AAEO,MAAMC,4CAAuBC,qBAAAA,oBAAuC,CAAC;IACxE,gBAAgBd;IAChB,cAAc;QAACe;QAAoBC;QAAsBC;KAAwB;AACrF"}
+{"version":3,"file":"api/features/UpdateWebhook/UpdateWebhookUseCase.js","sources":["../../../../src/api/features/UpdateWebhook/UpdateWebhookUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport {\n    UpdateWebhookRepository,\n    UpdateWebhookUseCase as UseCaseAbstraction\n} from \"./abstractions.js\";\nimport { UpdateWebhookInputSchema } from \"./schema.js\";\nimport { GetWebhookRepository } from \"~/api/features/GetWebhook/abstractions.js\";\nimport { WebhookPermissions } from \"~/api/features/WebhookPermissions/abstractions.js\";\nimport { WebhookNotAuthorizedError, WebhookValidationError } from \"~/api/domain/errors.js\";\nimport type { Webhook } from \"~/api/domain/Webhook.js\";\n\nclass UpdateWebhookUseCaseImpl implements UseCaseAbstraction.Interface {\n    constructor(\n        private readonly permissions: WebhookPermissions.Interface,\n        private readonly getWebhookRepository: GetWebhookRepository.Interface,\n        private readonly updateRepository: UpdateWebhookRepository.Interface\n    ) {}\n\n    async execute(\n        id: string,\n        input: UseCaseAbstraction.Input\n    ): Promise<Result<Webhook, UseCaseAbstraction.Error>> {\n        if (!(await this.permissions.canEdit(\"webhook\"))) {\n            return Result.fail(new WebhookNotAuthorizedError());\n        }\n\n        const parsed = UpdateWebhookInputSchema.safeParse(input);\n        if (!parsed.success) {\n            return Result.fail(new WebhookValidationError(parsed.error));\n        }\n\n        const getResult = await this.getWebhookRepository.execute(id);\n        if (getResult.isFail()) {\n            return Result.fail(getResult.error);\n        }\n\n        const existing = getResult.value;\n\n        const updated: Webhook = {\n            ...existing,\n            name: parsed.data.name ?? existing.name,\n            endpointUrl: parsed.data.endpointUrl ?? existing.endpointUrl,\n            description: parsed.data.description ?? existing.description,\n            enabled: parsed.data.enabled ?? existing.enabled,\n            events: parsed.data.events ?? existing.events,\n            signingSecret: parsed.data.signingSecret ?? existing.signingSecret\n        };\n\n        return this.updateRepository.execute(updated);\n    }\n}\n\nexport const UpdateWebhookUseCase = UseCaseAbstraction.createImplementation({\n    implementation: UpdateWebhookUseCaseImpl,\n    dependencies: [WebhookPermissions, GetWebhookRepository, UpdateWebhookRepository]\n});\n"],"names":["UpdateWebhookUseCaseImpl","permissions","getWebhookRepository","updateRepository","id","input","Result","WebhookNotAuthorizedError","parsed","UpdateWebhookInputSchema","WebhookValidationError","getResult","existing","updated","UpdateWebhookUseCase","UseCaseAbstraction","WebhookPermissions","GetWebhookRepository","UpdateWebhookRepository"],"mappings":";;;;;;AAWA,MAAMA;IACF,YACqBC,WAAyC,EACzCC,oBAAoD,EACpDC,gBAAmD,CACtE;aAHmBF,WAAW,GAAXA;aACAC,oBAAoB,GAApBA;aACAC,gBAAgB,GAAhBA;IAClB;IAEH,MAAM,QACFC,EAAU,EACVC,KAA+B,EACmB;QAClD,IAAI,CAAE,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,YACjC,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAG3B,MAAMC,SAASC,yBAAyB,SAAS,CAACJ;QAClD,IAAI,CAACG,OAAO,OAAO,EACf,OAAOF,OAAO,IAAI,CAAC,IAAII,uBAAuBF,OAAO,KAAK;QAG9D,MAAMG,YAAY,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAACP;QAC1D,IAAIO,UAAU,MAAM,IAChB,OAAOL,OAAO,IAAI,CAACK,UAAU,KAAK;QAGtC,MAAMC,WAAWD,UAAU,KAAK;QAEhC,MAAME,UAAmB;YACrB,GAAGD,QAAQ;YACX,MAAMJ,OAAO,IAAI,CAAC,IAAI,IAAII,SAAS,IAAI;YACvC,aAAaJ,OAAO,IAAI,CAAC,WAAW,IAAII,SAAS,WAAW;YAC5D,aAAaJ,OAAO,IAAI,CAAC,WAAW,IAAII,SAAS,WAAW;YAC5D,SAASJ,OAAO,IAAI,CAAC,OAAO,IAAII,SAAS,OAAO;YAChD,QAAQJ,OAAO,IAAI,CAAC,MAAM,IAAII,SAAS,MAAM;YAC7C,eAAeJ,OAAO,IAAI,CAAC,aAAa,IAAII,SAAS,aAAa;QACtE;QAEA,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAACC;IACzC;AACJ;AAEO,MAAMC,4CAAuBC,qBAAAA,oBAAuC,CAAC;IACxE,gBAAgBf;IAChB,cAAc;QAACgB;QAAoBC;QAAsBC;KAAwB;AACrF"}

package/api/features/UpdateWebhook/abstractions.d.ts

@@ -3,7 +3,6 @@ import type { Webhook } from "../../../api/domain/Webhook.js";
 import type { WebhookNotFoundError, WebhookValidationError, WebhookPersistenceError, WebhookModelNotFoundError, WebhookNotAuthorizedError } from "../../../api/domain/errors.js";
 export interface IUpdateWebhookInput {
     name?: string;
-    slug?: string;
     endpointUrl?: string;
     description?: string;
     enabled?: boolean;

package/api/features/UpdateWebhook/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"api/features/UpdateWebhook/abstractions.js","sources":["../../../../src/api/features/UpdateWebhook/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { Webhook } from \"~/api/domain/Webhook.js\";\nimport type {\n    WebhookNotFoundError,\n    WebhookValidationError,\n    WebhookPersistenceError,\n    WebhookModelNotFoundError,\n    WebhookNotAuthorizedError\n} from \"~/api/domain/errors.js\";\n\nexport interface IUpdateWebhookInput {\n    name?: string;\n    slug?: string;\n    endpointUrl?: string;\n    description?: string;\n    enabled?: boolean;\n    events?: string[];\n    signingSecret?: string;\n}\n\ntype IError =\n    | WebhookNotFoundError\n    | WebhookValidationError\n    | WebhookPersistenceError\n    | WebhookModelNotFoundError\n    | WebhookNotAuthorizedError;\n\nexport interface IUpdateWebhookUseCase {\n    execute(id: string, input: IUpdateWebhookInput): Promise<Result<Webhook, IError>>;\n}\n\nexport const UpdateWebhookUseCase = createAbstraction<IUpdateWebhookUseCase>(\n    \"Webhooks/UpdateWebhookUseCase\"\n);\n\nexport namespace UpdateWebhookUseCase {\n    export type Interface = IUpdateWebhookUseCase;\n    export type Input = IUpdateWebhookInput;\n    export type Error = IError;\n}\n\nexport interface IUpdateWebhookRepository {\n    execute(\n        webhook: Webhook\n    ): Promise<Result<Webhook, WebhookPersistenceError | WebhookModelNotFoundError>>;\n}\n\nexport const UpdateWebhookRepository = createAbstraction<IUpdateWebhookRepository>(\n    \"Webhooks/UpdateWebhookRepository\"\n);\n\nexport namespace UpdateWebhookRepository {\n    export type Interface = IUpdateWebhookRepository;\n    export type Error = WebhookPersistenceError | WebhookModelNotFoundError;\n}\n"],"names":["UpdateWebhookUseCase","createAbstraction","UpdateWebhookRepository"],"mappings":";AA+BO,MAAMA,uBAAuBC,kBAChC;AAeG,MAAMC,0BAA0BD,kBACnC"}
+{"version":3,"file":"api/features/UpdateWebhook/abstractions.js","sources":["../../../../src/api/features/UpdateWebhook/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { Webhook } from \"~/api/domain/Webhook.js\";\nimport type {\n    WebhookNotFoundError,\n    WebhookValidationError,\n    WebhookPersistenceError,\n    WebhookModelNotFoundError,\n    WebhookNotAuthorizedError\n} from \"~/api/domain/errors.js\";\n\nexport interface IUpdateWebhookInput {\n    name?: string;\n    endpointUrl?: string;\n    description?: string;\n    enabled?: boolean;\n    events?: string[];\n    signingSecret?: string;\n}\n\ntype IError =\n    | WebhookNotFoundError\n    | WebhookValidationError\n    | WebhookPersistenceError\n    | WebhookModelNotFoundError\n    | WebhookNotAuthorizedError;\n\nexport interface IUpdateWebhookUseCase {\n    execute(id: string, input: IUpdateWebhookInput): Promise<Result<Webhook, IError>>;\n}\n\nexport const UpdateWebhookUseCase = createAbstraction<IUpdateWebhookUseCase>(\n    \"Webhooks/UpdateWebhookUseCase\"\n);\n\nexport namespace UpdateWebhookUseCase {\n    export type Interface = IUpdateWebhookUseCase;\n    export type Input = IUpdateWebhookInput;\n    export type Error = IError;\n}\n\nexport interface IUpdateWebhookRepository {\n    execute(\n        webhook: Webhook\n    ): Promise<Result<Webhook, WebhookPersistenceError | WebhookModelNotFoundError>>;\n}\n\nexport const UpdateWebhookRepository = createAbstraction<IUpdateWebhookRepository>(\n    \"Webhooks/UpdateWebhookRepository\"\n);\n\nexport namespace UpdateWebhookRepository {\n    export type Interface = IUpdateWebhookRepository;\n    export type Error = WebhookPersistenceError | WebhookModelNotFoundError;\n}\n"],"names":["UpdateWebhookUseCase","createAbstraction","UpdateWebhookRepository"],"mappings":";AA8BO,MAAMA,uBAAuBC,kBAChC;AAeG,MAAMC,0BAA0BD,kBACnC"}

package/api/features/UpdateWebhook/schema.d.ts

@@ -0,0 +1,9 @@
+import { z } from "zod";
+export declare const UpdateWebhookInputSchema: z.ZodObject<{
+    name: z.ZodOptional<z.ZodString>;
+    endpointUrl: z.ZodOptional<z.ZodString>;
+    description: z.ZodOptional<z.ZodString>;
+    enabled: z.ZodOptional<z.ZodBoolean>;
+    events: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    signingSecret: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;

package/api/features/UpdateWebhook/schema.js

@@ -0,0 +1,15 @@
+import { z } from "zod";
+import { isValidEndpointUrl } from "../../utils/isValidEndpointUrl.js";
+const UpdateWebhookInputSchema = z.object({
+    name: z.string().min(1, "Name must not be empty.").optional(),
+    endpointUrl: z.string().refine(isValidEndpointUrl, {
+        message: "Endpoint URL must use HTTPS. HTTP is only allowed for localhost."
+    }).optional(),
+    description: z.string().optional(),
+    enabled: z.boolean().optional(),
+    events: z.array(z.string()).min(1, "At least one event must be selected.").optional(),
+    signingSecret: z.string().optional()
+});
+export { UpdateWebhookInputSchema };
+
+//# sourceMappingURL=schema.js.map