@webiny/api-audit-logs 0.0.0-unstable.7be00a75a9 → 0.0.0-unstable.7c2def32a7

package/subscriptions/headlessCms/handlers/AuditLogModelAfterDeleteEventHandler.js

@@ -1,17 +1,21 @@
 import _webiny_error from "@webiny/error";
 import { ModelAfterDeleteEventHandler } from "@webiny/api-headless-cms/features/contentModel/DeleteModel/index.js";
 import { AUDIT } from "../../../config.js";
-import { getAuditConfig } from "../../../utils/getAuditConfig.js";
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 class AuditLogModelAfterDeleteEventHandlerImpl {
-    constructor(context){
-        this.context = context;
+    constructor(recordAuditLog){
+        this.recordAuditLog = recordAuditLog;
     }
     async handle(event) {
         const { model } = event.payload;
         try {
-            const createAuditLog = getAuditConfig(AUDIT.HEADLESS_CMS.MODEL.DELETE);
-            await createAuditLog("Model deleted", model, model.modelId, this.context);
+            const recordResult = await this.recordAuditLog.execute({
+                audit: AUDIT.HEADLESS_CMS.MODEL.DELETE,
+                message: "Model deleted",
+                content: model,
+                entityId: model.modelId
+            });
+            if (recordResult.isFail()) throw recordResult.error;
         } catch (error) {
             throw _webiny_error.from(error, {
                 message: "Error while executing AuditLogModelAfterDeleteEventHandler",
@@ -23,7 +27,7 @@ class AuditLogModelAfterDeleteEventHandlerImpl {
 const AuditLogModelAfterDeleteEventHandler = ModelAfterDeleteEventHandler.createImplementation({
     implementation: AuditLogModelAfterDeleteEventHandlerImpl,
     dependencies: [
-        AuditLogsContext
+        RecordAuditLogUseCase
     ]
 });
 export { AuditLogModelAfterDeleteEventHandler };

package/subscriptions/headlessCms/handlers/AuditLogModelAfterDeleteEventHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions/headlessCms/handlers/AuditLogModelAfterDeleteEventHandler.js","sources":["../../../../src/subscriptions/headlessCms/handlers/AuditLogModelAfterDeleteEventHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ModelAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentModel/DeleteModel/index.js\";\nimport { AUDIT } from \"~/config.js\";\nimport { getAuditConfig } from \"~/utils/getAuditConfig.js\";\nimport { AuditLogsContext } from \"~/abstractions.js\";\n\nclass AuditLogModelAfterDeleteEventHandlerImpl implements ModelAfterDeleteEventHandler.Interface {\n    constructor(private context: AuditLogsContext.Interface) {}\n\n    async handle(event: ModelAfterDeleteEventHandler.Event): Promise<void> {\n        const { model } = event.payload;\n\n        try {\n            const createAuditLog = getAuditConfig(AUDIT.HEADLESS_CMS.MODEL.DELETE);\n\n            await createAuditLog(\"Model deleted\", model, model.modelId, this.context);\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogModelAfterDeleteEventHandler\",\n                code: \"AUDIT_LOGS_AFTER_MODEL_DELETE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogModelAfterDeleteEventHandler =\n    ModelAfterDeleteEventHandler.createImplementation({\n        implementation: AuditLogModelAfterDeleteEventHandlerImpl,\n        dependencies: [AuditLogsContext]\n    });\n"],"names":["AuditLogModelAfterDeleteEventHandlerImpl","context","event","model","createAuditLog","getAuditConfig","AUDIT","error","WebinyError","AuditLogModelAfterDeleteEventHandler","ModelAfterDeleteEventHandler","AuditLogsContext"],"mappings":";;;;;AAMA,MAAMA;IACF,YAAoBC,OAAmC,CAAE;aAArCA,OAAO,GAAPA;IAAsC;IAE1D,MAAM,OAAOC,KAAyC,EAAiB;QACnE,MAAM,EAAEC,KAAK,EAAE,GAAGD,MAAM,OAAO;QAE/B,IAAI;YACA,MAAME,iBAAiBC,eAAeC,MAAM,YAAY,CAAC,KAAK,CAAC,MAAM;YAErE,MAAMF,eAAe,iBAAiBD,OAAOA,MAAM,OAAO,EAAE,IAAI,CAAC,OAAO;QAC5E,EAAE,OAAOI,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,uCACTC,6BAA6B,oBAAoB,CAAC;IAC9C,gBAAgBV;IAChB,cAAc;QAACW;KAAiB;AACpC"}
+{"version":3,"file":"subscriptions/headlessCms/handlers/AuditLogModelAfterDeleteEventHandler.js","sources":["../../../../src/subscriptions/headlessCms/handlers/AuditLogModelAfterDeleteEventHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ModelAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentModel/DeleteModel/index.js\";\nimport { AUDIT } from \"~/config.js\";\nimport { RecordAuditLogUseCase } from \"~/features/RecordAuditLog/abstractions.js\";\n\nclass AuditLogModelAfterDeleteEventHandlerImpl implements ModelAfterDeleteEventHandler.Interface {\n    constructor(private recordAuditLog: RecordAuditLogUseCase.Interface) {}\n\n    async handle(event: ModelAfterDeleteEventHandler.Event): Promise<void> {\n        const { model } = event.payload;\n\n        try {\n            const recordResult = await this.recordAuditLog.execute({\n                audit: AUDIT.HEADLESS_CMS.MODEL.DELETE,\n                message: \"Model deleted\",\n                content: model,\n                entityId: model.modelId\n            });\n            if (recordResult.isFail()) {\n                throw recordResult.error;\n            }\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogModelAfterDeleteEventHandler\",\n                code: \"AUDIT_LOGS_AFTER_MODEL_DELETE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogModelAfterDeleteEventHandler =\n    ModelAfterDeleteEventHandler.createImplementation({\n        implementation: AuditLogModelAfterDeleteEventHandlerImpl,\n        dependencies: [RecordAuditLogUseCase]\n    });\n"],"names":["AuditLogModelAfterDeleteEventHandlerImpl","recordAuditLog","event","model","recordResult","AUDIT","error","WebinyError","AuditLogModelAfterDeleteEventHandler","ModelAfterDeleteEventHandler","RecordAuditLogUseCase"],"mappings":";;;;AAKA,MAAMA;IACF,YAAoBC,cAA+C,CAAE;aAAjDA,cAAc,GAAdA;IAAkD;IAEtE,MAAM,OAAOC,KAAyC,EAAiB;QACnE,MAAM,EAAEC,KAAK,EAAE,GAAGD,MAAM,OAAO;QAE/B,IAAI;YACA,MAAME,eAAe,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBACnD,OAAOC,MAAM,YAAY,CAAC,KAAK,CAAC,MAAM;gBACtC,SAAS;gBACT,SAASF;gBACT,UAAUA,MAAM,OAAO;YAC3B;YACA,IAAIC,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;QAEhC,EAAE,OAAOE,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,uCACTC,6BAA6B,oBAAoB,CAAC;IAC9C,gBAAgBT;IAChB,cAAc;QAACU;KAAsB;AACzC"}

package/subscriptions/headlessCms/handlers/AuditLogModelAfterUpdateEventHandler.d.ts

@@ -1,8 +1,8 @@
 import { ModelAfterUpdateEventHandler } from "@webiny/api-headless-cms/features/contentModel/UpdateModel/index.js";
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 declare class AuditLogModelAfterUpdateEventHandlerImpl implements ModelAfterUpdateEventHandler.Interface {
-    private context;
-    constructor(context: AuditLogsContext.Interface);
+    private recordAuditLog;
+    constructor(recordAuditLog: RecordAuditLogUseCase.Interface);
     handle(event: ModelAfterUpdateEventHandler.Event): Promise<void>;
 }
 export declare const AuditLogModelAfterUpdateEventHandler: typeof AuditLogModelAfterUpdateEventHandlerImpl & {

package/subscriptions/headlessCms/handlers/AuditLogModelAfterUpdateEventHandler.js

@@ -1,20 +1,24 @@
 import _webiny_error from "@webiny/error";
 import { ModelAfterUpdateEventHandler } from "@webiny/api-headless-cms/features/contentModel/UpdateModel/index.js";
 import { AUDIT } from "../../../config.js";
-import { getAuditConfig } from "../../../utils/getAuditConfig.js";
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 class AuditLogModelAfterUpdateEventHandlerImpl {
-    constructor(context){
-        this.context = context;
+    constructor(recordAuditLog){
+        this.recordAuditLog = recordAuditLog;
     }
     async handle(event) {
         const { model, original } = event.payload;
         try {
-            const createAuditLog = getAuditConfig(AUDIT.HEADLESS_CMS.MODEL.UPDATE);
-            await createAuditLog("Model updated", {
-                before: original,
-                after: model
-            }, model.modelId, this.context);
+            const recordResult = await this.recordAuditLog.execute({
+                audit: AUDIT.HEADLESS_CMS.MODEL.UPDATE,
+                message: "Model updated",
+                content: {
+                    before: original,
+                    after: model
+                },
+                entityId: model.modelId
+            });
+            if (recordResult.isFail()) throw recordResult.error;
         } catch (error) {
             throw _webiny_error.from(error, {
                 message: "Error while executing AuditLogModelAfterUpdateEventHandler",
@@ -26,7 +30,7 @@ class AuditLogModelAfterUpdateEventHandlerImpl {
 const AuditLogModelAfterUpdateEventHandler = ModelAfterUpdateEventHandler.createImplementation({
     implementation: AuditLogModelAfterUpdateEventHandlerImpl,
     dependencies: [
-        AuditLogsContext
+        RecordAuditLogUseCase
     ]
 });
 export { AuditLogModelAfterUpdateEventHandler };

package/subscriptions/headlessCms/handlers/AuditLogModelAfterUpdateEventHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions/headlessCms/handlers/AuditLogModelAfterUpdateEventHandler.js","sources":["../../../../src/subscriptions/headlessCms/handlers/AuditLogModelAfterUpdateEventHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ModelAfterUpdateEventHandler } from \"@webiny/api-headless-cms/features/contentModel/UpdateModel/index.js\";\nimport { AUDIT } from \"~/config.js\";\nimport { getAuditConfig } from \"~/utils/getAuditConfig.js\";\nimport { AuditLogsContext } from \"~/abstractions.js\";\n\nclass AuditLogModelAfterUpdateEventHandlerImpl implements ModelAfterUpdateEventHandler.Interface {\n    constructor(private context: AuditLogsContext.Interface) {}\n\n    async handle(event: ModelAfterUpdateEventHandler.Event): Promise<void> {\n        const { model, original } = event.payload;\n\n        try {\n            const createAuditLog = getAuditConfig(AUDIT.HEADLESS_CMS.MODEL.UPDATE);\n\n            await createAuditLog(\n                \"Model updated\",\n                { before: original, after: model },\n                model.modelId,\n                this.context\n            );\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogModelAfterUpdateEventHandler\",\n                code: \"AUDIT_LOGS_AFTER_MODEL_UPDATE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogModelAfterUpdateEventHandler =\n    ModelAfterUpdateEventHandler.createImplementation({\n        implementation: AuditLogModelAfterUpdateEventHandlerImpl,\n        dependencies: [AuditLogsContext]\n    });\n"],"names":["AuditLogModelAfterUpdateEventHandlerImpl","context","event","model","original","createAuditLog","getAuditConfig","AUDIT","error","WebinyError","AuditLogModelAfterUpdateEventHandler","ModelAfterUpdateEventHandler","AuditLogsContext"],"mappings":";;;;;AAMA,MAAMA;IACF,YAAoBC,OAAmC,CAAE;aAArCA,OAAO,GAAPA;IAAsC;IAE1D,MAAM,OAAOC,KAAyC,EAAiB;QACnE,MAAM,EAAEC,KAAK,EAAEC,QAAQ,EAAE,GAAGF,MAAM,OAAO;QAEzC,IAAI;YACA,MAAMG,iBAAiBC,eAAeC,MAAM,YAAY,CAAC,KAAK,CAAC,MAAM;YAErE,MAAMF,eACF,iBACA;gBAAE,QAAQD;gBAAU,OAAOD;YAAM,GACjCA,MAAM,OAAO,EACb,IAAI,CAAC,OAAO;QAEpB,EAAE,OAAOK,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,uCACTC,6BAA6B,oBAAoB,CAAC;IAC9C,gBAAgBX;IAChB,cAAc;QAACY;KAAiB;AACpC"}
+{"version":3,"file":"subscriptions/headlessCms/handlers/AuditLogModelAfterUpdateEventHandler.js","sources":["../../../../src/subscriptions/headlessCms/handlers/AuditLogModelAfterUpdateEventHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ModelAfterUpdateEventHandler } from \"@webiny/api-headless-cms/features/contentModel/UpdateModel/index.js\";\nimport { AUDIT } from \"~/config.js\";\nimport { RecordAuditLogUseCase } from \"~/features/RecordAuditLog/abstractions.js\";\n\nclass AuditLogModelAfterUpdateEventHandlerImpl implements ModelAfterUpdateEventHandler.Interface {\n    constructor(private recordAuditLog: RecordAuditLogUseCase.Interface) {}\n\n    async handle(event: ModelAfterUpdateEventHandler.Event): Promise<void> {\n        const { model, original } = event.payload;\n\n        try {\n            const recordResult = await this.recordAuditLog.execute({\n                audit: AUDIT.HEADLESS_CMS.MODEL.UPDATE,\n                message: \"Model updated\",\n                content: { before: original, after: model },\n                entityId: model.modelId\n            });\n            if (recordResult.isFail()) {\n                throw recordResult.error;\n            }\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogModelAfterUpdateEventHandler\",\n                code: \"AUDIT_LOGS_AFTER_MODEL_UPDATE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogModelAfterUpdateEventHandler =\n    ModelAfterUpdateEventHandler.createImplementation({\n        implementation: AuditLogModelAfterUpdateEventHandlerImpl,\n        dependencies: [RecordAuditLogUseCase]\n    });\n"],"names":["AuditLogModelAfterUpdateEventHandlerImpl","recordAuditLog","event","model","original","recordResult","AUDIT","error","WebinyError","AuditLogModelAfterUpdateEventHandler","ModelAfterUpdateEventHandler","RecordAuditLogUseCase"],"mappings":";;;;AAKA,MAAMA;IACF,YAAoBC,cAA+C,CAAE;aAAjDA,cAAc,GAAdA;IAAkD;IAEtE,MAAM,OAAOC,KAAyC,EAAiB;QACnE,MAAM,EAAEC,KAAK,EAAEC,QAAQ,EAAE,GAAGF,MAAM,OAAO;QAEzC,IAAI;YACA,MAAMG,eAAe,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBACnD,OAAOC,MAAM,YAAY,CAAC,KAAK,CAAC,MAAM;gBACtC,SAAS;gBACT,SAAS;oBAAE,QAAQF;oBAAU,OAAOD;gBAAM;gBAC1C,UAAUA,MAAM,OAAO;YAC3B;YACA,IAAIE,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;QAEhC,EAAE,OAAOE,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,uCACTC,6BAA6B,oBAAoB,CAAC;IAC9C,gBAAgBV;IAChB,cAAc;QAACW;KAAsB;AACzC"}

package/subscriptions/headlessCms/index.d.ts

@@ -1,2 +1,2 @@
-import type { AuditLogsContext } from "../../types.js";
-export declare const createHeadlessCmsHooks: (context: AuditLogsContext) => void;
+import type { Container } from "@webiny/di";
+export declare const createHeadlessCmsHooks: (container: Container) => void;

package/subscriptions/headlessCms/index.js

@@ -12,21 +12,21 @@ import { AuditLogModelAfterDeleteEventHandler } from "./handlers/AuditLogModelAf
 import { AuditLogGroupAfterCreateEventHandler } from "./handlers/AuditLogGroupAfterCreateEventHandler.js";
 import { AuditLogGroupAfterUpdateEventHandler } from "./handlers/AuditLogGroupAfterUpdateEventHandler.js";
 import { AuditLogGroupAfterDeleteEventHandler } from "./handlers/AuditLogGroupAfterDeleteEventHandler.js";
-const createHeadlessCmsHooks = (context)=>{
-    context.container.register(AuditLogEntryAfterCreateEventHandler);
-    context.container.register(AuditLogEntryAfterUpdateEventHandler);
-    context.container.register(AuditLogEntryAfterDeleteEventHandler);
-    context.container.register(AuditLogEntryAfterPublishEventHandler);
-    context.container.register(AuditLogEntryAfterUnpublishEventHandler);
-    context.container.register(AuditLogEntryAfterRestoreFromBinEventHandler);
-    context.container.register(AuditLogEntryRevisionAfterCreateEventHandler);
-    context.container.register(AuditLogEntryRevisionAfterDeleteEventHandler);
-    context.container.register(AuditLogModelAfterCreateEventHandler);
-    context.container.register(AuditLogModelAfterUpdateEventHandler);
-    context.container.register(AuditLogModelAfterDeleteEventHandler);
-    context.container.register(AuditLogGroupAfterCreateEventHandler);
-    context.container.register(AuditLogGroupAfterUpdateEventHandler);
-    context.container.register(AuditLogGroupAfterDeleteEventHandler);
+const createHeadlessCmsHooks = (container)=>{
+    container.register(AuditLogEntryAfterCreateEventHandler);
+    container.register(AuditLogEntryAfterUpdateEventHandler);
+    container.register(AuditLogEntryAfterDeleteEventHandler);
+    container.register(AuditLogEntryAfterPublishEventHandler);
+    container.register(AuditLogEntryAfterUnpublishEventHandler);
+    container.register(AuditLogEntryAfterRestoreFromBinEventHandler);
+    container.register(AuditLogEntryRevisionAfterCreateEventHandler);
+    container.register(AuditLogEntryRevisionAfterDeleteEventHandler);
+    container.register(AuditLogModelAfterCreateEventHandler);
+    container.register(AuditLogModelAfterUpdateEventHandler);
+    container.register(AuditLogModelAfterDeleteEventHandler);
+    container.register(AuditLogGroupAfterCreateEventHandler);
+    container.register(AuditLogGroupAfterUpdateEventHandler);
+    container.register(AuditLogGroupAfterDeleteEventHandler);
 };
 export { createHeadlessCmsHooks };
 

package/subscriptions/headlessCms/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions/headlessCms/index.js","sources":["../../../src/subscriptions/headlessCms/index.ts"],"sourcesContent":["import type { AuditLogsContext } from \"~/types.js\";\nimport { AuditLogEntryAfterCreateEventHandler } from \"./handlers/AuditLogEntryAfterCreateEventHandler.js\";\nimport { AuditLogEntryAfterUpdateEventHandler } from \"./handlers/AuditLogEntryAfterUpdateEventHandler.js\";\nimport { AuditLogEntryAfterDeleteEventHandler } from \"./handlers/AuditLogEntryAfterDeleteEventHandler.js\";\nimport { AuditLogEntryAfterPublishEventHandler } from \"./handlers/AuditLogEntryAfterPublishEventHandler.js\";\nimport { AuditLogEntryAfterUnpublishEventHandler } from \"./handlers/AuditLogEntryAfterUnpublishEventHandler.js\";\nimport { AuditLogEntryAfterRestoreFromBinEventHandler } from \"./handlers/AuditLogEntryAfterRestoreFromBinEventHandler.js\";\nimport { AuditLogEntryRevisionAfterCreateEventHandler } from \"./handlers/AuditLogEntryRevisionAfterCreateEventHandler.js\";\nimport { AuditLogEntryRevisionAfterDeleteEventHandler } from \"./handlers/AuditLogEntryRevisionAfterDeleteEventHandler.js\";\nimport { AuditLogModelAfterCreateEventHandler } from \"./handlers/AuditLogModelAfterCreateEventHandler.js\";\nimport { AuditLogModelAfterUpdateEventHandler } from \"./handlers/AuditLogModelAfterUpdateEventHandler.js\";\nimport { AuditLogModelAfterDeleteEventHandler } from \"./handlers/AuditLogModelAfterDeleteEventHandler.js\";\nimport { AuditLogGroupAfterCreateEventHandler } from \"./handlers/AuditLogGroupAfterCreateEventHandler.js\";\nimport { AuditLogGroupAfterUpdateEventHandler } from \"./handlers/AuditLogGroupAfterUpdateEventHandler.js\";\nimport { AuditLogGroupAfterDeleteEventHandler } from \"./handlers/AuditLogGroupAfterDeleteEventHandler.js\";\n\nexport const createHeadlessCmsHooks = (context: AuditLogsContext) => {\n    // Register entry handlers\n    context.container.register(AuditLogEntryAfterCreateEventHandler);\n    context.container.register(AuditLogEntryAfterUpdateEventHandler);\n    context.container.register(AuditLogEntryAfterDeleteEventHandler);\n    context.container.register(AuditLogEntryAfterPublishEventHandler);\n    context.container.register(AuditLogEntryAfterUnpublishEventHandler);\n    context.container.register(AuditLogEntryAfterRestoreFromBinEventHandler);\n    context.container.register(AuditLogEntryRevisionAfterCreateEventHandler);\n    context.container.register(AuditLogEntryRevisionAfterDeleteEventHandler);\n\n    // Register model handlers\n    context.container.register(AuditLogModelAfterCreateEventHandler);\n    context.container.register(AuditLogModelAfterUpdateEventHandler);\n    context.container.register(AuditLogModelAfterDeleteEventHandler);\n\n    // Register group handlers\n    context.container.register(AuditLogGroupAfterCreateEventHandler);\n    context.container.register(AuditLogGroupAfterUpdateEventHandler);\n    context.container.register(AuditLogGroupAfterDeleteEventHandler);\n};\n"],"names":["createHeadlessCmsHooks","context","AuditLogEntryAfterCreateEventHandler","AuditLogEntryAfterUpdateEventHandler","AuditLogEntryAfterDeleteEventHandler","AuditLogEntryAfterPublishEventHandler","AuditLogEntryAfterUnpublishEventHandler","AuditLogEntryAfterRestoreFromBinEventHandler","AuditLogEntryRevisionAfterCreateEventHandler","AuditLogEntryRevisionAfterDeleteEventHandler","AuditLogModelAfterCreateEventHandler","AuditLogModelAfterUpdateEventHandler","AuditLogModelAfterDeleteEventHandler","AuditLogGroupAfterCreateEventHandler","AuditLogGroupAfterUpdateEventHandler","AuditLogGroupAfterDeleteEventHandler"],"mappings":";;;;;;;;;;;;;;AAgBO,MAAMA,yBAAyB,CAACC;IAEnCA,QAAQ,SAAS,CAAC,QAAQ,CAACC;IAC3BD,QAAQ,SAAS,CAAC,QAAQ,CAACE;IAC3BF,QAAQ,SAAS,CAAC,QAAQ,CAACG;IAC3BH,QAAQ,SAAS,CAAC,QAAQ,CAACI;IAC3BJ,QAAQ,SAAS,CAAC,QAAQ,CAACK;IAC3BL,QAAQ,SAAS,CAAC,QAAQ,CAACM;IAC3BN,QAAQ,SAAS,CAAC,QAAQ,CAACO;IAC3BP,QAAQ,SAAS,CAAC,QAAQ,CAACQ;IAG3BR,QAAQ,SAAS,CAAC,QAAQ,CAACS;IAC3BT,QAAQ,SAAS,CAAC,QAAQ,CAACU;IAC3BV,QAAQ,SAAS,CAAC,QAAQ,CAACW;IAG3BX,QAAQ,SAAS,CAAC,QAAQ,CAACY;IAC3BZ,QAAQ,SAAS,CAAC,QAAQ,CAACa;IAC3Bb,QAAQ,SAAS,CAAC,QAAQ,CAACc;AAC/B"}
+{"version":3,"file":"subscriptions/headlessCms/index.js","sources":["../../../src/subscriptions/headlessCms/index.ts"],"sourcesContent":["import type { Container } from \"@webiny/di\";\nimport { AuditLogEntryAfterCreateEventHandler } from \"./handlers/AuditLogEntryAfterCreateEventHandler.js\";\nimport { AuditLogEntryAfterUpdateEventHandler } from \"./handlers/AuditLogEntryAfterUpdateEventHandler.js\";\nimport { AuditLogEntryAfterDeleteEventHandler } from \"./handlers/AuditLogEntryAfterDeleteEventHandler.js\";\nimport { AuditLogEntryAfterPublishEventHandler } from \"./handlers/AuditLogEntryAfterPublishEventHandler.js\";\nimport { AuditLogEntryAfterUnpublishEventHandler } from \"./handlers/AuditLogEntryAfterUnpublishEventHandler.js\";\nimport { AuditLogEntryAfterRestoreFromBinEventHandler } from \"./handlers/AuditLogEntryAfterRestoreFromBinEventHandler.js\";\nimport { AuditLogEntryRevisionAfterCreateEventHandler } from \"./handlers/AuditLogEntryRevisionAfterCreateEventHandler.js\";\nimport { AuditLogEntryRevisionAfterDeleteEventHandler } from \"./handlers/AuditLogEntryRevisionAfterDeleteEventHandler.js\";\nimport { AuditLogModelAfterCreateEventHandler } from \"./handlers/AuditLogModelAfterCreateEventHandler.js\";\nimport { AuditLogModelAfterUpdateEventHandler } from \"./handlers/AuditLogModelAfterUpdateEventHandler.js\";\nimport { AuditLogModelAfterDeleteEventHandler } from \"./handlers/AuditLogModelAfterDeleteEventHandler.js\";\nimport { AuditLogGroupAfterCreateEventHandler } from \"./handlers/AuditLogGroupAfterCreateEventHandler.js\";\nimport { AuditLogGroupAfterUpdateEventHandler } from \"./handlers/AuditLogGroupAfterUpdateEventHandler.js\";\nimport { AuditLogGroupAfterDeleteEventHandler } from \"./handlers/AuditLogGroupAfterDeleteEventHandler.js\";\n\nexport const createHeadlessCmsHooks = (container: Container) => {\n    // Register entry handlers\n    container.register(AuditLogEntryAfterCreateEventHandler);\n    container.register(AuditLogEntryAfterUpdateEventHandler);\n    container.register(AuditLogEntryAfterDeleteEventHandler);\n    container.register(AuditLogEntryAfterPublishEventHandler);\n    container.register(AuditLogEntryAfterUnpublishEventHandler);\n    container.register(AuditLogEntryAfterRestoreFromBinEventHandler);\n    container.register(AuditLogEntryRevisionAfterCreateEventHandler);\n    container.register(AuditLogEntryRevisionAfterDeleteEventHandler);\n\n    // Register model handlers\n    container.register(AuditLogModelAfterCreateEventHandler);\n    container.register(AuditLogModelAfterUpdateEventHandler);\n    container.register(AuditLogModelAfterDeleteEventHandler);\n\n    // Register group handlers\n    container.register(AuditLogGroupAfterCreateEventHandler);\n    container.register(AuditLogGroupAfterUpdateEventHandler);\n    container.register(AuditLogGroupAfterDeleteEventHandler);\n};\n"],"names":["createHeadlessCmsHooks","container","AuditLogEntryAfterCreateEventHandler","AuditLogEntryAfterUpdateEventHandler","AuditLogEntryAfterDeleteEventHandler","AuditLogEntryAfterPublishEventHandler","AuditLogEntryAfterUnpublishEventHandler","AuditLogEntryAfterRestoreFromBinEventHandler","AuditLogEntryRevisionAfterCreateEventHandler","AuditLogEntryRevisionAfterDeleteEventHandler","AuditLogModelAfterCreateEventHandler","AuditLogModelAfterUpdateEventHandler","AuditLogModelAfterDeleteEventHandler","AuditLogGroupAfterCreateEventHandler","AuditLogGroupAfterUpdateEventHandler","AuditLogGroupAfterDeleteEventHandler"],"mappings":";;;;;;;;;;;;;;AAgBO,MAAMA,yBAAyB,CAACC;IAEnCA,UAAU,QAAQ,CAACC;IACnBD,UAAU,QAAQ,CAACE;IACnBF,UAAU,QAAQ,CAACG;IACnBH,UAAU,QAAQ,CAACI;IACnBJ,UAAU,QAAQ,CAACK;IACnBL,UAAU,QAAQ,CAACM;IACnBN,UAAU,QAAQ,CAACO;IACnBP,UAAU,QAAQ,CAACQ;IAGnBR,UAAU,QAAQ,CAACS;IACnBT,UAAU,QAAQ,CAACU;IACnBV,UAAU,QAAQ,CAACW;IAGnBX,UAAU,QAAQ,CAACY;IACnBZ,UAAU,QAAQ,CAACa;IACnBb,UAAU,QAAQ,CAACc;AACvB"}

package/subscriptions/index.d.ts

@@ -1,2 +1,2 @@
-import type { AuditLogsContext } from "../types.js";
-export declare const createSubscriptionHooks: (context: AuditLogsContext) => void;
+import type { Container } from "@webiny/di";
+export declare const createSubscriptionHooks: (container: Container) => void;

package/subscriptions/index.js

@@ -4,13 +4,15 @@ import { createSecurityHooks } from "./security/index.js";
 import { createMailerHooks } from "./mailer/index.js";
 import { createAcoHooks } from "./aco/index.js";
 import { createWebsiteBuilderHooks } from "./websiteBuilder/index.js";
-const createSubscriptionHooks = (context)=>{
-    createFileManagerHooks(context);
-    createHeadlessCmsHooks(context);
-    createSecurityHooks(context);
-    createMailerHooks(context);
-    createAcoHooks(context);
-    createWebsiteBuilderHooks(context);
+import { createAiHooks } from "./ai/index.js";
+const createSubscriptionHooks = (container)=>{
+    createFileManagerHooks(container);
+    createHeadlessCmsHooks(container);
+    createSecurityHooks(container);
+    createMailerHooks(container);
+    createAcoHooks(container);
+    createWebsiteBuilderHooks(container);
+    createAiHooks(container);
 };
 export { createSubscriptionHooks };
 

package/subscriptions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions/index.js","sources":["../../src/subscriptions/index.ts"],"sourcesContent":["import { createFileManagerHooks } from \"./fileManager/index.js\";\nimport { createHeadlessCmsHooks } from \"./headlessCms/index.js\";\nimport { createSecurityHooks } from \"./security/index.js\";\nimport { createMailerHooks } from \"./mailer/index.js\";\nimport { createAcoHooks } from \"./aco/index.js\";\nimport { createWebsiteBuilderHooks } from \"~/subscriptions/websiteBuilder/index.js\";\nimport type { AuditLogsContext } from \"~/types.js\";\n\nexport const createSubscriptionHooks = (context: AuditLogsContext) => {\n    createFileManagerHooks(context);\n    createHeadlessCmsHooks(context);\n    createSecurityHooks(context);\n    createMailerHooks(context);\n    createAcoHooks(context);\n    createWebsiteBuilderHooks(context);\n};\n"],"names":["createSubscriptionHooks","context","createFileManagerHooks","createHeadlessCmsHooks","createSecurityHooks","createMailerHooks","createAcoHooks","createWebsiteBuilderHooks"],"mappings":";;;;;;AAQO,MAAMA,0BAA0B,CAACC;IACpCC,uBAAuBD;IACvBE,uBAAuBF;IACvBG,oBAAoBH;IACpBI,kBAAkBJ;IAClBK,eAAeL;IACfM,0BAA0BN;AAC9B"}
+{"version":3,"file":"subscriptions/index.js","sources":["../../src/subscriptions/index.ts"],"sourcesContent":["import { createFileManagerHooks } from \"./fileManager/index.js\";\nimport { createHeadlessCmsHooks } from \"./headlessCms/index.js\";\nimport { createSecurityHooks } from \"./security/index.js\";\nimport { createMailerHooks } from \"./mailer/index.js\";\nimport { createAcoHooks } from \"./aco/index.js\";\nimport { createWebsiteBuilderHooks } from \"~/subscriptions/websiteBuilder/index.js\";\nimport { createAiHooks } from \"./ai/index.js\";\nimport type { Container } from \"@webiny/di\";\n\nexport const createSubscriptionHooks = (container: Container) => {\n    createFileManagerHooks(container);\n    createHeadlessCmsHooks(container);\n    createSecurityHooks(container);\n    createMailerHooks(container);\n    createAcoHooks(container);\n    createWebsiteBuilderHooks(container);\n    createAiHooks(container);\n};\n"],"names":["createSubscriptionHooks","container","createFileManagerHooks","createHeadlessCmsHooks","createSecurityHooks","createMailerHooks","createAcoHooks","createWebsiteBuilderHooks","createAiHooks"],"mappings":";;;;;;;AASO,MAAMA,0BAA0B,CAACC;IACpCC,uBAAuBD;IACvBE,uBAAuBF;IACvBG,oBAAoBH;IACpBI,kBAAkBJ;IAClBK,eAAeL;IACfM,0BAA0BN;IAC1BO,cAAcP;AAClB"}

package/subscriptions/mailer/handlers/AuditLogMailerSettingsAfterSaveHandler.d.ts

@@ -1,8 +1,8 @@
 import { MailerSettingsAfterSaveEventHandler } from "@webiny/api-mailer/features/SaveSettings/index.js";
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 declare class AuditLogMailerSettingsAfterSaveHandlerImpl implements MailerSettingsAfterSaveEventHandler.Interface {
-    private context;
-    constructor(context: AuditLogsContext.Interface);
+    private recordAuditLog;
+    constructor(recordAuditLog: RecordAuditLogUseCase.Interface);
     handle(event: MailerSettingsAfterSaveEventHandler.Event): Promise<void>;
 }
 export declare const AuditLogMailerSettingsAfterSaveHandler: typeof AuditLogMailerSettingsAfterSaveHandlerImpl & {

package/subscriptions/mailer/handlers/AuditLogMailerSettingsAfterSaveHandler.js

@@ -1,19 +1,23 @@
 import _webiny_error from "@webiny/error";
 import { MailerSettingsAfterSaveEventHandler } from "@webiny/api-mailer/features/SaveSettings/index.js";
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 import { AUDIT } from "../../../config.js";
-import { getAuditConfig } from "../../../utils/getAuditConfig.js";
 class AuditLogMailerSettingsAfterSaveHandlerImpl {
-    constructor(context){
-        this.context = context;
+    constructor(recordAuditLog){
+        this.recordAuditLog = recordAuditLog;
     }
     async handle(event) {
         try {
             const { settings } = event.payload;
-            const createAuditLog = getAuditConfig(AUDIT.MAILER.SETTINGS.UPDATE);
-            await createAuditLog("Settings updated", {
-                after: settings
-            }, "-", this.context);
+            const recordResult = await this.recordAuditLog.execute({
+                audit: AUDIT.MAILER.SETTINGS.UPDATE,
+                message: "Settings updated",
+                content: {
+                    after: settings
+                },
+                entityId: "-"
+            });
+            if (recordResult.isFail()) throw recordResult.error;
         } catch (error) {
             throw _webiny_error.from(error, {
                 message: "Error while executing AuditLogMailerSettingsAfterSaveHandler",
@@ -25,7 +29,7 @@ class AuditLogMailerSettingsAfterSaveHandlerImpl {
 const AuditLogMailerSettingsAfterSaveHandler = MailerSettingsAfterSaveEventHandler.createImplementation({
     implementation: AuditLogMailerSettingsAfterSaveHandlerImpl,
     dependencies: [
-        AuditLogsContext
+        RecordAuditLogUseCase
     ]
 });
 export { AuditLogMailerSettingsAfterSaveHandler };

package/subscriptions/mailer/handlers/AuditLogMailerSettingsAfterSaveHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions/mailer/handlers/AuditLogMailerSettingsAfterSaveHandler.js","sources":["../../../../src/subscriptions/mailer/handlers/AuditLogMailerSettingsAfterSaveHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { MailerSettingsAfterSaveEventHandler } from \"@webiny/api-mailer/features/SaveSettings/index.js\";\nimport { AuditLogsContext } from \"~/abstractions.js\";\nimport { AUDIT } from \"~/config.js\";\nimport { getAuditConfig } from \"~/utils/getAuditConfig.js\";\n\nclass AuditLogMailerSettingsAfterSaveHandlerImpl\n    implements MailerSettingsAfterSaveEventHandler.Interface\n{\n    constructor(private context: AuditLogsContext.Interface) {}\n\n    async handle(event: MailerSettingsAfterSaveEventHandler.Event): Promise<void> {\n        try {\n            const { settings } = event.payload;\n            const createAuditLog = getAuditConfig(AUDIT.MAILER.SETTINGS.UPDATE);\n\n            await createAuditLog(\"Settings updated\", { after: settings }, \"-\", this.context);\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogMailerSettingsAfterSaveHandler\",\n                code: \"AUDIT_LOGS_AFTER_MAILER_SETTINGS_SAVE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogMailerSettingsAfterSaveHandler =\n    MailerSettingsAfterSaveEventHandler.createImplementation({\n        implementation: AuditLogMailerSettingsAfterSaveHandlerImpl,\n        dependencies: [AuditLogsContext]\n    });\n"],"names":["AuditLogMailerSettingsAfterSaveHandlerImpl","context","event","settings","createAuditLog","getAuditConfig","AUDIT","error","WebinyError","AuditLogMailerSettingsAfterSaveHandler","MailerSettingsAfterSaveEventHandler","AuditLogsContext"],"mappings":";;;;;AAMA,MAAMA;IAGF,YAAoBC,OAAmC,CAAE;aAArCA,OAAO,GAAPA;IAAsC;IAE1D,MAAM,OAAOC,KAAgD,EAAiB;QAC1E,IAAI;YACA,MAAM,EAAEC,QAAQ,EAAE,GAAGD,MAAM,OAAO;YAClC,MAAME,iBAAiBC,eAAeC,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM;YAElE,MAAMF,eAAe,oBAAoB;gBAAE,OAAOD;YAAS,GAAG,KAAK,IAAI,CAAC,OAAO;QACnF,EAAE,OAAOI,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,yCACTC,oCAAoC,oBAAoB,CAAC;IACrD,gBAAgBV;IAChB,cAAc;QAACW;KAAiB;AACpC"}
+{"version":3,"file":"subscriptions/mailer/handlers/AuditLogMailerSettingsAfterSaveHandler.js","sources":["../../../../src/subscriptions/mailer/handlers/AuditLogMailerSettingsAfterSaveHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { MailerSettingsAfterSaveEventHandler } from \"@webiny/api-mailer/features/SaveSettings/index.js\";\nimport { RecordAuditLogUseCase } from \"~/features/RecordAuditLog/abstractions.js\";\nimport { AUDIT } from \"~/config.js\";\n\nclass AuditLogMailerSettingsAfterSaveHandlerImpl\n    implements MailerSettingsAfterSaveEventHandler.Interface\n{\n    constructor(private recordAuditLog: RecordAuditLogUseCase.Interface) {}\n\n    async handle(event: MailerSettingsAfterSaveEventHandler.Event): Promise<void> {\n        try {\n            const { settings } = event.payload;\n\n            const recordResult = await this.recordAuditLog.execute({\n                audit: AUDIT.MAILER.SETTINGS.UPDATE,\n                message: \"Settings updated\",\n                content: { after: settings },\n                entityId: \"-\"\n            });\n            if (recordResult.isFail()) {\n                throw recordResult.error;\n            }\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogMailerSettingsAfterSaveHandler\",\n                code: \"AUDIT_LOGS_AFTER_MAILER_SETTINGS_SAVE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogMailerSettingsAfterSaveHandler =\n    MailerSettingsAfterSaveEventHandler.createImplementation({\n        implementation: AuditLogMailerSettingsAfterSaveHandlerImpl,\n        dependencies: [RecordAuditLogUseCase]\n    });\n"],"names":["AuditLogMailerSettingsAfterSaveHandlerImpl","recordAuditLog","event","settings","recordResult","AUDIT","error","WebinyError","AuditLogMailerSettingsAfterSaveHandler","MailerSettingsAfterSaveEventHandler","RecordAuditLogUseCase"],"mappings":";;;;AAKA,MAAMA;IAGF,YAAoBC,cAA+C,CAAE;aAAjDA,cAAc,GAAdA;IAAkD;IAEtE,MAAM,OAAOC,KAAgD,EAAiB;QAC1E,IAAI;YACA,MAAM,EAAEC,QAAQ,EAAE,GAAGD,MAAM,OAAO;YAElC,MAAME,eAAe,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBACnD,OAAOC,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM;gBACnC,SAAS;gBACT,SAAS;oBAAE,OAAOF;gBAAS;gBAC3B,UAAU;YACd;YACA,IAAIC,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;QAEhC,EAAE,OAAOE,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,yCACTC,oCAAoC,oBAAoB,CAAC;IACrD,gBAAgBT;IAChB,cAAc;QAACU;KAAsB;AACzC"}

package/subscriptions/mailer/index.d.ts

@@ -1,2 +1,2 @@
-import { AuditLogsContext } from "../../abstractions.js";
-export declare const createMailerHooks: (context: AuditLogsContext.Interface) => void;
+import type { Container } from "@webiny/di";
+export declare const createMailerHooks: (container: Container) => void;

package/subscriptions/mailer/index.js

@@ -1,6 +1,6 @@
 import { AuditLogMailerSettingsAfterSaveHandler } from "./handlers/AuditLogMailerSettingsAfterSaveHandler.js";
-const createMailerHooks = (context)=>{
-    context.container.register(AuditLogMailerSettingsAfterSaveHandler);
+const createMailerHooks = (container)=>{
+    container.register(AuditLogMailerSettingsAfterSaveHandler);
 };
 export { createMailerHooks };
 

package/subscriptions/mailer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions/mailer/index.js","sources":["../../../src/subscriptions/mailer/index.ts"],"sourcesContent":["import { AuditLogMailerSettingsAfterSaveHandler } from \"./handlers/AuditLogMailerSettingsAfterSaveHandler.js\";\nimport { AuditLogsContext } from \"~/abstractions.js\";\n\nexport const createMailerHooks = (context: AuditLogsContext.Interface) => {\n    // Register mailer settings event handlers\n    context.container.register(AuditLogMailerSettingsAfterSaveHandler);\n};\n"],"names":["createMailerHooks","context","AuditLogMailerSettingsAfterSaveHandler"],"mappings":";AAGO,MAAMA,oBAAoB,CAACC;IAE9BA,QAAQ,SAAS,CAAC,QAAQ,CAACC;AAC/B"}
+{"version":3,"file":"subscriptions/mailer/index.js","sources":["../../../src/subscriptions/mailer/index.ts"],"sourcesContent":["import { AuditLogMailerSettingsAfterSaveHandler } from \"./handlers/AuditLogMailerSettingsAfterSaveHandler.js\";\nimport type { Container } from \"@webiny/di\";\n\nexport const createMailerHooks = (container: Container) => {\n    // Register mailer settings event handlers\n    container.register(AuditLogMailerSettingsAfterSaveHandler);\n};\n"],"names":["createMailerHooks","container","AuditLogMailerSettingsAfterSaveHandler"],"mappings":";AAGO,MAAMA,oBAAoB,CAACC;IAE9BA,UAAU,QAAQ,CAACC;AACvB"}

package/subscriptions/security/handlers/AuditLogApiKeyAfterCreateHandler.d.ts

@@ -1,8 +1,8 @@
 import { ApiKeyAfterCreateEventHandler } from "@webiny/api-core/features/security/apiKeys/CreateApiKey/index.js";
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 declare class AuditLogApiKeyAfterCreateHandlerImpl implements ApiKeyAfterCreateEventHandler.Interface {
-    private context;
-    constructor(context: AuditLogsContext.Interface);
+    private recordAuditLog;
+    constructor(recordAuditLog: RecordAuditLogUseCase.Interface);
     handle(event: ApiKeyAfterCreateEventHandler.Event): Promise<void>;
 }
 export declare const AuditLogApiKeyAfterCreateHandler: typeof AuditLogApiKeyAfterCreateHandlerImpl & {

package/subscriptions/security/handlers/AuditLogApiKeyAfterCreateHandler.js

@@ -1,8 +1,7 @@
 import _webiny_error from "@webiny/error";
 import { ApiKeyAfterCreateEventHandler } from "@webiny/api-core/features/security/apiKeys/CreateApiKey/index.js";
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 import { AUDIT } from "../../../config.js";
-import { getAuditConfig } from "../../../utils/getAuditConfig.js";
 const cleanupApiKey = (apiKey)=>({
         id: apiKey.id,
         slug: apiKey.slug,
@@ -13,15 +12,20 @@ const cleanupApiKey = (apiKey)=>({
         permissions: apiKey.permissions
     });
 class AuditLogApiKeyAfterCreateHandlerImpl {
-    constructor(context){
-        this.context = context;
+    constructor(recordAuditLog){
+        this.recordAuditLog = recordAuditLog;
     }
     async handle(event) {
         try {
             const { apiKey: initialApiKey } = event.payload;
-            const createAuditLog = getAuditConfig(AUDIT.SECURITY.API_KEY.CREATE);
             const apiKey = cleanupApiKey(initialApiKey);
-            await createAuditLog("API key created", apiKey, apiKey.id, this.context);
+            const recordResult = await this.recordAuditLog.execute({
+                audit: AUDIT.SECURITY.API_KEY.CREATE,
+                message: "API key created",
+                content: apiKey,
+                entityId: apiKey.id
+            });
+            if (recordResult.isFail()) throw recordResult.error;
         } catch (error) {
             throw _webiny_error.from(error, {
                 message: "Error while executing AuditLogApiKeyAfterCreateHandler",
@@ -33,7 +37,7 @@ class AuditLogApiKeyAfterCreateHandlerImpl {
 const AuditLogApiKeyAfterCreateHandler = ApiKeyAfterCreateEventHandler.createImplementation({
     implementation: AuditLogApiKeyAfterCreateHandlerImpl,
     dependencies: [
-        AuditLogsContext
+        RecordAuditLogUseCase
     ]
 });
 export { AuditLogApiKeyAfterCreateHandler };

package/subscriptions/security/handlers/AuditLogApiKeyAfterCreateHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions/security/handlers/AuditLogApiKeyAfterCreateHandler.js","sources":["../../../../src/subscriptions/security/handlers/AuditLogApiKeyAfterCreateHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ApiKeyAfterCreateEventHandler } from \"@webiny/api-core/features/security/apiKeys/CreateApiKey/index.js\";\nimport { AuditLogsContext } from \"~/abstractions.js\";\nimport { AUDIT } from \"~/config.js\";\nimport { getAuditConfig } from \"~/utils/getAuditConfig.js\";\nimport type { ApiKey } from \"@webiny/api-core/types/security.js\";\n\n/**\n * We need to remove the token from the API Key object, as it is a security risk.\n *\n * We assign the API Key object explicitly, so we do not miss any new properties that might be added in the future - and they should not be in the log.\n */\nconst cleanupApiKey = (apiKey: ApiKey): Omit<ApiKey, \"token\"> => {\n    return {\n        id: apiKey.id,\n        slug: apiKey.slug,\n        createdBy: apiKey.createdBy,\n        createdOn: apiKey.createdOn,\n        description: apiKey.description,\n        name: apiKey.name,\n        permissions: apiKey.permissions\n    };\n};\n\nclass AuditLogApiKeyAfterCreateHandlerImpl implements ApiKeyAfterCreateEventHandler.Interface {\n    constructor(private context: AuditLogsContext.Interface) {}\n\n    async handle(event: ApiKeyAfterCreateEventHandler.Event): Promise<void> {\n        try {\n            const { apiKey: initialApiKey } = event.payload;\n            const createAuditLog = getAuditConfig(AUDIT.SECURITY.API_KEY.CREATE);\n\n            const apiKey = cleanupApiKey(initialApiKey);\n\n            await createAuditLog(\"API key created\", apiKey, apiKey.id, this.context);\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogApiKeyAfterCreateHandler\",\n                code: \"AUDIT_LOGS_AFTER_API_KEY_CREATE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogApiKeyAfterCreateHandler = ApiKeyAfterCreateEventHandler.createImplementation({\n    implementation: AuditLogApiKeyAfterCreateHandlerImpl,\n    dependencies: [AuditLogsContext]\n});\n"],"names":["cleanupApiKey","apiKey","AuditLogApiKeyAfterCreateHandlerImpl","context","event","initialApiKey","createAuditLog","getAuditConfig","AUDIT","error","WebinyError","AuditLogApiKeyAfterCreateHandler","ApiKeyAfterCreateEventHandler","AuditLogsContext"],"mappings":";;;;;AAYA,MAAMA,gBAAgB,CAACC,SACZ;QACH,IAAIA,OAAO,EAAE;QACb,MAAMA,OAAO,IAAI;QACjB,WAAWA,OAAO,SAAS;QAC3B,WAAWA,OAAO,SAAS;QAC3B,aAAaA,OAAO,WAAW;QAC/B,MAAMA,OAAO,IAAI;QACjB,aAAaA,OAAO,WAAW;IACnC;AAGJ,MAAMC;IACF,YAAoBC,OAAmC,CAAE;aAArCA,OAAO,GAAPA;IAAsC;IAE1D,MAAM,OAAOC,KAA0C,EAAiB;QACpE,IAAI;YACA,MAAM,EAAE,QAAQC,aAAa,EAAE,GAAGD,MAAM,OAAO;YAC/C,MAAME,iBAAiBC,eAAeC,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM;YAEnE,MAAMP,SAASD,cAAcK;YAE7B,MAAMC,eAAe,mBAAmBL,QAAQA,OAAO,EAAE,EAAE,IAAI,CAAC,OAAO;QAC3E,EAAE,OAAOQ,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,mCAAmCC,8BAA8B,oBAAoB,CAAC;IAC/F,gBAAgBV;IAChB,cAAc;QAACW;KAAiB;AACpC"}
+{"version":3,"file":"subscriptions/security/handlers/AuditLogApiKeyAfterCreateHandler.js","sources":["../../../../src/subscriptions/security/handlers/AuditLogApiKeyAfterCreateHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ApiKeyAfterCreateEventHandler } from \"@webiny/api-core/features/security/apiKeys/CreateApiKey/index.js\";\nimport { RecordAuditLogUseCase } from \"~/features/RecordAuditLog/abstractions.js\";\nimport { AUDIT } from \"~/config.js\";\nimport type { ApiKey } from \"@webiny/api-core/types/security.js\";\n\n/**\n * We need to remove the token from the API Key object, as it is a security risk.\n *\n * We assign the API Key object explicitly, so we do not miss any new properties that might be added in the future - and they should not be in the log.\n */\nconst cleanupApiKey = (apiKey: ApiKey): Omit<ApiKey, \"token\"> => {\n    return {\n        id: apiKey.id,\n        slug: apiKey.slug,\n        createdBy: apiKey.createdBy,\n        createdOn: apiKey.createdOn,\n        description: apiKey.description,\n        name: apiKey.name,\n        permissions: apiKey.permissions\n    };\n};\n\nclass AuditLogApiKeyAfterCreateHandlerImpl implements ApiKeyAfterCreateEventHandler.Interface {\n    constructor(private recordAuditLog: RecordAuditLogUseCase.Interface) {}\n\n    async handle(event: ApiKeyAfterCreateEventHandler.Event): Promise<void> {\n        try {\n            const { apiKey: initialApiKey } = event.payload;\n\n            const apiKey = cleanupApiKey(initialApiKey);\n\n            const recordResult = await this.recordAuditLog.execute({\n                audit: AUDIT.SECURITY.API_KEY.CREATE,\n                message: \"API key created\",\n                content: apiKey,\n                entityId: apiKey.id\n            });\n            if (recordResult.isFail()) {\n                throw recordResult.error;\n            }\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogApiKeyAfterCreateHandler\",\n                code: \"AUDIT_LOGS_AFTER_API_KEY_CREATE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogApiKeyAfterCreateHandler = ApiKeyAfterCreateEventHandler.createImplementation({\n    implementation: AuditLogApiKeyAfterCreateHandlerImpl,\n    dependencies: [RecordAuditLogUseCase]\n});\n"],"names":["cleanupApiKey","apiKey","AuditLogApiKeyAfterCreateHandlerImpl","recordAuditLog","event","initialApiKey","recordResult","AUDIT","error","WebinyError","AuditLogApiKeyAfterCreateHandler","ApiKeyAfterCreateEventHandler","RecordAuditLogUseCase"],"mappings":";;;;AAWA,MAAMA,gBAAgB,CAACC,SACZ;QACH,IAAIA,OAAO,EAAE;QACb,MAAMA,OAAO,IAAI;QACjB,WAAWA,OAAO,SAAS;QAC3B,WAAWA,OAAO,SAAS;QAC3B,aAAaA,OAAO,WAAW;QAC/B,MAAMA,OAAO,IAAI;QACjB,aAAaA,OAAO,WAAW;IACnC;AAGJ,MAAMC;IACF,YAAoBC,cAA+C,CAAE;aAAjDA,cAAc,GAAdA;IAAkD;IAEtE,MAAM,OAAOC,KAA0C,EAAiB;QACpE,IAAI;YACA,MAAM,EAAE,QAAQC,aAAa,EAAE,GAAGD,MAAM,OAAO;YAE/C,MAAMH,SAASD,cAAcK;YAE7B,MAAMC,eAAe,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBACnD,OAAOC,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM;gBACpC,SAAS;gBACT,SAASN;gBACT,UAAUA,OAAO,EAAE;YACvB;YACA,IAAIK,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;QAEhC,EAAE,OAAOE,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,mCAAmCC,8BAA8B,oBAAoB,CAAC;IAC/F,gBAAgBT;IAChB,cAAc;QAACU;KAAsB;AACzC"}

package/subscriptions/security/handlers/AuditLogApiKeyAfterDeleteHandler.d.ts

@@ -1,8 +1,8 @@
 import { ApiKeyAfterDeleteEventHandler } from "@webiny/api-core/features/security/apiKeys/DeleteApiKey/index.js";
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 declare class AuditLogApiKeyAfterDeleteHandlerImpl implements ApiKeyAfterDeleteEventHandler.Interface {
-    private context;
-    constructor(context: AuditLogsContext.Interface);
+    private recordAuditLog;
+    constructor(recordAuditLog: RecordAuditLogUseCase.Interface);
     handle(event: ApiKeyAfterDeleteEventHandler.Event): Promise<void>;
 }
 export declare const AuditLogApiKeyAfterDeleteHandler: typeof AuditLogApiKeyAfterDeleteHandlerImpl & {

package/subscriptions/security/handlers/AuditLogApiKeyAfterDeleteHandler.js

@@ -1,8 +1,7 @@
 import _webiny_error from "@webiny/error";
 import { ApiKeyAfterDeleteEventHandler } from "@webiny/api-core/features/security/apiKeys/DeleteApiKey/index.js";
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 import { AUDIT } from "../../../config.js";
-import { getAuditConfig } from "../../../utils/getAuditConfig.js";
 const cleanupApiKey = (apiKey)=>({
         id: apiKey.id,
         slug: apiKey.slug,
@@ -13,15 +12,20 @@ const cleanupApiKey = (apiKey)=>({
         permissions: apiKey.permissions
     });
 class AuditLogApiKeyAfterDeleteHandlerImpl {
-    constructor(context){
-        this.context = context;
+    constructor(recordAuditLog){
+        this.recordAuditLog = recordAuditLog;
     }
     async handle(event) {
         try {
             const { apiKey: initialApiKey } = event.payload;
-            const createAuditLog = getAuditConfig(AUDIT.SECURITY.API_KEY.DELETE);
             const apiKey = cleanupApiKey(initialApiKey);
-            await createAuditLog("API key deleted", apiKey, apiKey.id, this.context);
+            const recordResult = await this.recordAuditLog.execute({
+                audit: AUDIT.SECURITY.API_KEY.DELETE,
+                message: "API key deleted",
+                content: apiKey,
+                entityId: apiKey.id
+            });
+            if (recordResult.isFail()) throw recordResult.error;
         } catch (error) {
             throw _webiny_error.from(error, {
                 message: "Error while executing AuditLogApiKeyAfterDeleteHandler",
@@ -33,7 +37,7 @@ class AuditLogApiKeyAfterDeleteHandlerImpl {
 const AuditLogApiKeyAfterDeleteHandler = ApiKeyAfterDeleteEventHandler.createImplementation({
     implementation: AuditLogApiKeyAfterDeleteHandlerImpl,
     dependencies: [
-        AuditLogsContext
+        RecordAuditLogUseCase
     ]
 });
 export { AuditLogApiKeyAfterDeleteHandler };

package/subscriptions/security/handlers/AuditLogApiKeyAfterDeleteHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions/security/handlers/AuditLogApiKeyAfterDeleteHandler.js","sources":["../../../../src/subscriptions/security/handlers/AuditLogApiKeyAfterDeleteHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ApiKeyAfterDeleteEventHandler } from \"@webiny/api-core/features/security/apiKeys/DeleteApiKey/index.js\";\nimport { AuditLogsContext } from \"~/abstractions.js\";\nimport { AUDIT } from \"~/config.js\";\nimport { getAuditConfig } from \"~/utils/getAuditConfig.js\";\nimport type { ApiKey } from \"@webiny/api-core/types/security.js\";\n\n/**\n * We need to remove the token from the API Key object, as it is a security risk.\n *\n * We assign the API Key object explicitly, so we do not miss any new properties that might be added in the future - and they should not be in the log.\n */\nconst cleanupApiKey = (apiKey: ApiKey): Omit<ApiKey, \"token\"> => {\n    return {\n        id: apiKey.id,\n        slug: apiKey.slug,\n        createdBy: apiKey.createdBy,\n        createdOn: apiKey.createdOn,\n        description: apiKey.description,\n        name: apiKey.name,\n        permissions: apiKey.permissions\n    };\n};\n\nclass AuditLogApiKeyAfterDeleteHandlerImpl implements ApiKeyAfterDeleteEventHandler.Interface {\n    constructor(private context: AuditLogsContext.Interface) {}\n\n    async handle(event: ApiKeyAfterDeleteEventHandler.Event): Promise<void> {\n        try {\n            const { apiKey: initialApiKey } = event.payload;\n            const createAuditLog = getAuditConfig(AUDIT.SECURITY.API_KEY.DELETE);\n\n            const apiKey = cleanupApiKey(initialApiKey);\n\n            await createAuditLog(\"API key deleted\", apiKey, apiKey.id, this.context);\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogApiKeyAfterDeleteHandler\",\n                code: \"AUDIT_LOGS_AFTER_API_KEY_DELETE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogApiKeyAfterDeleteHandler = ApiKeyAfterDeleteEventHandler.createImplementation({\n    implementation: AuditLogApiKeyAfterDeleteHandlerImpl,\n    dependencies: [AuditLogsContext]\n});\n"],"names":["cleanupApiKey","apiKey","AuditLogApiKeyAfterDeleteHandlerImpl","context","event","initialApiKey","createAuditLog","getAuditConfig","AUDIT","error","WebinyError","AuditLogApiKeyAfterDeleteHandler","ApiKeyAfterDeleteEventHandler","AuditLogsContext"],"mappings":";;;;;AAYA,MAAMA,gBAAgB,CAACC,SACZ;QACH,IAAIA,OAAO,EAAE;QACb,MAAMA,OAAO,IAAI;QACjB,WAAWA,OAAO,SAAS;QAC3B,WAAWA,OAAO,SAAS;QAC3B,aAAaA,OAAO,WAAW;QAC/B,MAAMA,OAAO,IAAI;QACjB,aAAaA,OAAO,WAAW;IACnC;AAGJ,MAAMC;IACF,YAAoBC,OAAmC,CAAE;aAArCA,OAAO,GAAPA;IAAsC;IAE1D,MAAM,OAAOC,KAA0C,EAAiB;QACpE,IAAI;YACA,MAAM,EAAE,QAAQC,aAAa,EAAE,GAAGD,MAAM,OAAO;YAC/C,MAAME,iBAAiBC,eAAeC,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM;YAEnE,MAAMP,SAASD,cAAcK;YAE7B,MAAMC,eAAe,mBAAmBL,QAAQA,OAAO,EAAE,EAAE,IAAI,CAAC,OAAO;QAC3E,EAAE,OAAOQ,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,mCAAmCC,8BAA8B,oBAAoB,CAAC;IAC/F,gBAAgBV;IAChB,cAAc;QAACW;KAAiB;AACpC"}
+{"version":3,"file":"subscriptions/security/handlers/AuditLogApiKeyAfterDeleteHandler.js","sources":["../../../../src/subscriptions/security/handlers/AuditLogApiKeyAfterDeleteHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ApiKeyAfterDeleteEventHandler } from \"@webiny/api-core/features/security/apiKeys/DeleteApiKey/index.js\";\nimport { RecordAuditLogUseCase } from \"~/features/RecordAuditLog/abstractions.js\";\nimport { AUDIT } from \"~/config.js\";\nimport type { ApiKey } from \"@webiny/api-core/types/security.js\";\n\n/**\n * We need to remove the token from the API Key object, as it is a security risk.\n *\n * We assign the API Key object explicitly, so we do not miss any new properties that might be added in the future - and they should not be in the log.\n */\nconst cleanupApiKey = (apiKey: ApiKey): Omit<ApiKey, \"token\"> => {\n    return {\n        id: apiKey.id,\n        slug: apiKey.slug,\n        createdBy: apiKey.createdBy,\n        createdOn: apiKey.createdOn,\n        description: apiKey.description,\n        name: apiKey.name,\n        permissions: apiKey.permissions\n    };\n};\n\nclass AuditLogApiKeyAfterDeleteHandlerImpl implements ApiKeyAfterDeleteEventHandler.Interface {\n    constructor(private recordAuditLog: RecordAuditLogUseCase.Interface) {}\n\n    async handle(event: ApiKeyAfterDeleteEventHandler.Event): Promise<void> {\n        try {\n            const { apiKey: initialApiKey } = event.payload;\n\n            const apiKey = cleanupApiKey(initialApiKey);\n\n            const recordResult = await this.recordAuditLog.execute({\n                audit: AUDIT.SECURITY.API_KEY.DELETE,\n                message: \"API key deleted\",\n                content: apiKey,\n                entityId: apiKey.id\n            });\n            if (recordResult.isFail()) {\n                throw recordResult.error;\n            }\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogApiKeyAfterDeleteHandler\",\n                code: \"AUDIT_LOGS_AFTER_API_KEY_DELETE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogApiKeyAfterDeleteHandler = ApiKeyAfterDeleteEventHandler.createImplementation({\n    implementation: AuditLogApiKeyAfterDeleteHandlerImpl,\n    dependencies: [RecordAuditLogUseCase]\n});\n"],"names":["cleanupApiKey","apiKey","AuditLogApiKeyAfterDeleteHandlerImpl","recordAuditLog","event","initialApiKey","recordResult","AUDIT","error","WebinyError","AuditLogApiKeyAfterDeleteHandler","ApiKeyAfterDeleteEventHandler","RecordAuditLogUseCase"],"mappings":";;;;AAWA,MAAMA,gBAAgB,CAACC,SACZ;QACH,IAAIA,OAAO,EAAE;QACb,MAAMA,OAAO,IAAI;QACjB,WAAWA,OAAO,SAAS;QAC3B,WAAWA,OAAO,SAAS;QAC3B,aAAaA,OAAO,WAAW;QAC/B,MAAMA,OAAO,IAAI;QACjB,aAAaA,OAAO,WAAW;IACnC;AAGJ,MAAMC;IACF,YAAoBC,cAA+C,CAAE;aAAjDA,cAAc,GAAdA;IAAkD;IAEtE,MAAM,OAAOC,KAA0C,EAAiB;QACpE,IAAI;YACA,MAAM,EAAE,QAAQC,aAAa,EAAE,GAAGD,MAAM,OAAO;YAE/C,MAAMH,SAASD,cAAcK;YAE7B,MAAMC,eAAe,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBACnD,OAAOC,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM;gBACpC,SAAS;gBACT,SAASN;gBACT,UAAUA,OAAO,EAAE;YACvB;YACA,IAAIK,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;QAEhC,EAAE,OAAOE,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,mCAAmCC,8BAA8B,oBAAoB,CAAC;IAC/F,gBAAgBT;IAChB,cAAc;QAACU;KAAsB;AACzC"}

package/subscriptions/security/handlers/AuditLogApiKeyAfterUpdateHandler.d.ts

@@ -1,8 +1,8 @@
 import { ApiKeyAfterUpdateEventHandler } from "@webiny/api-core/features/security/apiKeys/UpdateApiKey/index.js";
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 declare class AuditLogApiKeyAfterUpdateHandlerImpl implements ApiKeyAfterUpdateEventHandler.Interface {
-    private context;
-    constructor(context: AuditLogsContext.Interface);
+    private recordAuditLog;
+    constructor(recordAuditLog: RecordAuditLogUseCase.Interface);
     handle(event: ApiKeyAfterUpdateEventHandler.Event): Promise<void>;
 }
 export declare const AuditLogApiKeyAfterUpdateHandler: typeof AuditLogApiKeyAfterUpdateHandlerImpl & {

package/subscriptions/security/handlers/AuditLogApiKeyAfterUpdateHandler.js

@@ -1,8 +1,7 @@
 import _webiny_error from "@webiny/error";
 import { ApiKeyAfterUpdateEventHandler } from "@webiny/api-core/features/security/apiKeys/UpdateApiKey/index.js";
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 import { AUDIT } from "../../../config.js";
-import { getAuditConfig } from "../../../utils/getAuditConfig.js";
 const cleanupApiKey = (apiKey)=>({
         id: apiKey.id,
         slug: apiKey.slug,
@@ -13,19 +12,24 @@ const cleanupApiKey = (apiKey)=>({
         permissions: apiKey.permissions
     });
 class AuditLogApiKeyAfterUpdateHandlerImpl {
-    constructor(context){
-        this.context = context;
+    constructor(recordAuditLog){
+        this.recordAuditLog = recordAuditLog;
     }
     async handle(event) {
         try {
             const { updated: initialApiKey, original: initialOriginalApiKey } = event.payload;
-            const createAuditLog = getAuditConfig(AUDIT.SECURITY.API_KEY.UPDATE);
             const apiKey = cleanupApiKey(initialApiKey);
             const original = cleanupApiKey(initialOriginalApiKey);
-            await createAuditLog("API key updated", {
-                before: original,
-                after: apiKey
-            }, apiKey.id, this.context);
+            const recordResult = await this.recordAuditLog.execute({
+                audit: AUDIT.SECURITY.API_KEY.UPDATE,
+                message: "API key updated",
+                content: {
+                    before: original,
+                    after: apiKey
+                },
+                entityId: apiKey.id
+            });
+            if (recordResult.isFail()) throw recordResult.error;
         } catch (error) {
             throw _webiny_error.from(error, {
                 message: "Error while executing AuditLogApiKeyAfterUpdateHandler",
@@ -37,7 +41,7 @@ class AuditLogApiKeyAfterUpdateHandlerImpl {
 const AuditLogApiKeyAfterUpdateHandler = ApiKeyAfterUpdateEventHandler.createImplementation({
     implementation: AuditLogApiKeyAfterUpdateHandlerImpl,
     dependencies: [
-        AuditLogsContext
+        RecordAuditLogUseCase
     ]
 });
 export { AuditLogApiKeyAfterUpdateHandler };

package/subscriptions/security/handlers/AuditLogApiKeyAfterUpdateHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions/security/handlers/AuditLogApiKeyAfterUpdateHandler.js","sources":["../../../../src/subscriptions/security/handlers/AuditLogApiKeyAfterUpdateHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ApiKeyAfterUpdateEventHandler } from \"@webiny/api-core/features/security/apiKeys/UpdateApiKey/index.js\";\nimport { AuditLogsContext } from \"~/abstractions.js\";\nimport { AUDIT } from \"~/config.js\";\nimport { getAuditConfig } from \"~/utils/getAuditConfig.js\";\nimport type { ApiKey } from \"@webiny/api-core/types/security.js\";\n\n/**\n * We need to remove the token from the API Key object, as it is a security risk.\n *\n * We assign the API Key object explicitly, so we do not miss any new properties that might be added in the future - and they should not be in the log.\n */\nconst cleanupApiKey = (apiKey: ApiKey): Omit<ApiKey, \"token\"> => {\n    return {\n        id: apiKey.id,\n        slug: apiKey.slug,\n        createdBy: apiKey.createdBy,\n        createdOn: apiKey.createdOn,\n        description: apiKey.description,\n        name: apiKey.name,\n        permissions: apiKey.permissions\n    };\n};\n\nclass AuditLogApiKeyAfterUpdateHandlerImpl implements ApiKeyAfterUpdateEventHandler.Interface {\n    constructor(private context: AuditLogsContext.Interface) {}\n\n    async handle(event: ApiKeyAfterUpdateEventHandler.Event): Promise<void> {\n        try {\n            const { updated: initialApiKey, original: initialOriginalApiKey } = event.payload;\n            const createAuditLog = getAuditConfig(AUDIT.SECURITY.API_KEY.UPDATE);\n\n            const apiKey = cleanupApiKey(initialApiKey);\n            const original = cleanupApiKey(initialOriginalApiKey);\n\n            await createAuditLog(\n                \"API key updated\",\n                {\n                    before: original,\n                    after: apiKey\n                },\n                apiKey.id,\n                this.context\n            );\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogApiKeyAfterUpdateHandler\",\n                code: \"AUDIT_LOGS_AFTER_API_KEY_UPDATE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogApiKeyAfterUpdateHandler = ApiKeyAfterUpdateEventHandler.createImplementation({\n    implementation: AuditLogApiKeyAfterUpdateHandlerImpl,\n    dependencies: [AuditLogsContext]\n});\n"],"names":["cleanupApiKey","apiKey","AuditLogApiKeyAfterUpdateHandlerImpl","context","event","initialApiKey","initialOriginalApiKey","createAuditLog","getAuditConfig","AUDIT","original","error","WebinyError","AuditLogApiKeyAfterUpdateHandler","ApiKeyAfterUpdateEventHandler","AuditLogsContext"],"mappings":";;;;;AAYA,MAAMA,gBAAgB,CAACC,SACZ;QACH,IAAIA,OAAO,EAAE;QACb,MAAMA,OAAO,IAAI;QACjB,WAAWA,OAAO,SAAS;QAC3B,WAAWA,OAAO,SAAS;QAC3B,aAAaA,OAAO,WAAW;QAC/B,MAAMA,OAAO,IAAI;QACjB,aAAaA,OAAO,WAAW;IACnC;AAGJ,MAAMC;IACF,YAAoBC,OAAmC,CAAE;aAArCA,OAAO,GAAPA;IAAsC;IAE1D,MAAM,OAAOC,KAA0C,EAAiB;QACpE,IAAI;YACA,MAAM,EAAE,SAASC,aAAa,EAAE,UAAUC,qBAAqB,EAAE,GAAGF,MAAM,OAAO;YACjF,MAAMG,iBAAiBC,eAAeC,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM;YAEnE,MAAMR,SAASD,cAAcK;YAC7B,MAAMK,WAAWV,cAAcM;YAE/B,MAAMC,eACF,mBACA;gBACI,QAAQG;gBACR,OAAOT;YACX,GACAA,OAAO,EAAE,EACT,IAAI,CAAC,OAAO;QAEpB,EAAE,OAAOU,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,mCAAmCC,8BAA8B,oBAAoB,CAAC;IAC/F,gBAAgBZ;IAChB,cAAc;QAACa;KAAiB;AACpC"}
+{"version":3,"file":"subscriptions/security/handlers/AuditLogApiKeyAfterUpdateHandler.js","sources":["../../../../src/subscriptions/security/handlers/AuditLogApiKeyAfterUpdateHandler.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ApiKeyAfterUpdateEventHandler } from \"@webiny/api-core/features/security/apiKeys/UpdateApiKey/index.js\";\nimport { RecordAuditLogUseCase } from \"~/features/RecordAuditLog/abstractions.js\";\nimport { AUDIT } from \"~/config.js\";\nimport type { ApiKey } from \"@webiny/api-core/types/security.js\";\n\n/**\n * We need to remove the token from the API Key object, as it is a security risk.\n *\n * We assign the API Key object explicitly, so we do not miss any new properties that might be added in the future - and they should not be in the log.\n */\nconst cleanupApiKey = (apiKey: ApiKey): Omit<ApiKey, \"token\"> => {\n    return {\n        id: apiKey.id,\n        slug: apiKey.slug,\n        createdBy: apiKey.createdBy,\n        createdOn: apiKey.createdOn,\n        description: apiKey.description,\n        name: apiKey.name,\n        permissions: apiKey.permissions\n    };\n};\n\nclass AuditLogApiKeyAfterUpdateHandlerImpl implements ApiKeyAfterUpdateEventHandler.Interface {\n    constructor(private recordAuditLog: RecordAuditLogUseCase.Interface) {}\n\n    async handle(event: ApiKeyAfterUpdateEventHandler.Event): Promise<void> {\n        try {\n            const { updated: initialApiKey, original: initialOriginalApiKey } = event.payload;\n\n            const apiKey = cleanupApiKey(initialApiKey);\n            const original = cleanupApiKey(initialOriginalApiKey);\n\n            const recordResult = await this.recordAuditLog.execute({\n                audit: AUDIT.SECURITY.API_KEY.UPDATE,\n                message: \"API key updated\",\n                content: {\n                    before: original,\n                    after: apiKey\n                },\n                entityId: apiKey.id\n            });\n            if (recordResult.isFail()) {\n                throw recordResult.error;\n            }\n        } catch (error) {\n            throw WebinyError.from(error, {\n                message: \"Error while executing AuditLogApiKeyAfterUpdateHandler\",\n                code: \"AUDIT_LOGS_AFTER_API_KEY_UPDATE_HANDLER\"\n            });\n        }\n    }\n}\n\nexport const AuditLogApiKeyAfterUpdateHandler = ApiKeyAfterUpdateEventHandler.createImplementation({\n    implementation: AuditLogApiKeyAfterUpdateHandlerImpl,\n    dependencies: [RecordAuditLogUseCase]\n});\n"],"names":["cleanupApiKey","apiKey","AuditLogApiKeyAfterUpdateHandlerImpl","recordAuditLog","event","initialApiKey","initialOriginalApiKey","original","recordResult","AUDIT","error","WebinyError","AuditLogApiKeyAfterUpdateHandler","ApiKeyAfterUpdateEventHandler","RecordAuditLogUseCase"],"mappings":";;;;AAWA,MAAMA,gBAAgB,CAACC,SACZ;QACH,IAAIA,OAAO,EAAE;QACb,MAAMA,OAAO,IAAI;QACjB,WAAWA,OAAO,SAAS;QAC3B,WAAWA,OAAO,SAAS;QAC3B,aAAaA,OAAO,WAAW;QAC/B,MAAMA,OAAO,IAAI;QACjB,aAAaA,OAAO,WAAW;IACnC;AAGJ,MAAMC;IACF,YAAoBC,cAA+C,CAAE;aAAjDA,cAAc,GAAdA;IAAkD;IAEtE,MAAM,OAAOC,KAA0C,EAAiB;QACpE,IAAI;YACA,MAAM,EAAE,SAASC,aAAa,EAAE,UAAUC,qBAAqB,EAAE,GAAGF,MAAM,OAAO;YAEjF,MAAMH,SAASD,cAAcK;YAC7B,MAAME,WAAWP,cAAcM;YAE/B,MAAME,eAAe,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBACnD,OAAOC,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM;gBACpC,SAAS;gBACT,SAAS;oBACL,QAAQF;oBACR,OAAON;gBACX;gBACA,UAAUA,OAAO,EAAE;YACvB;YACA,IAAIO,aAAa,MAAM,IACnB,MAAMA,aAAa,KAAK;QAEhC,EAAE,OAAOE,OAAO;YACZ,MAAMC,cAAAA,IAAgB,CAACD,OAAO;gBAC1B,SAAS;gBACT,MAAM;YACV;QACJ;IACJ;AACJ;AAEO,MAAME,mCAAmCC,8BAA8B,oBAAoB,CAAC;IAC/F,gBAAgBX;IAChB,cAAc;QAACY;KAAsB;AACzC"}

package/subscriptions/security/handlers/AuditLogRoleAfterCreateHandler.d.ts

@@ -1,8 +1,8 @@
-import { AuditLogsContext } from "../../../abstractions.js";
+import { RecordAuditLogUseCase } from "../../../features/RecordAuditLog/abstractions.js";
 import { RoleAfterCreateEventHandler } from "@webiny/api-core/features/security/roles/CreateRole/index.js";
 declare class AuditLogRoleAfterCreateHandlerImpl implements RoleAfterCreateEventHandler.Interface {
-    private context;
-    constructor(context: AuditLogsContext.Interface);
+    private recordAuditLog;
+    constructor(recordAuditLog: RecordAuditLogUseCase.Interface);
     handle(event: RoleAfterCreateEventHandler.Event): Promise<void>;
 }
 export declare const AuditLogRoleAfterCreateHandler: typeof AuditLogRoleAfterCreateHandlerImpl & {