Add dashboard-specific secret and secret import audit logs, re-touch audit logs v2 UI

backend/src/ee/models/auditLog/enums.ts

@@ -17,6 +17,7 @@ export enum EventType {
     CREATE_SECRET = "create-secret",
     UPDATE_SECRET = "update-secret",
     DELETE_SECRET = "delete-secret",
+    GET_WORKSPACE_KEY = "get-workspace-key",
     AUTHORIZE_INTEGRATION = "authorize-integration",
     UNAUTHORIZE_INTEGRATION = "unauthorize-integration",
     CREATE_INTEGRATION = "create-integration",
@@ -36,5 +37,9 @@ export enum EventType {
     DELETE_FOLDER = "delete-folder",
     CREATE_WEBHOOK = "create-webhook",
     UPDATE_WEBHOOK_STATUS = "update-webhook-status",
-    DELETE_WEBHOOK = "delete-webhook"
+    DELETE_WEBHOOK = "delete-webhook",
+    GET_SECRET_IMPORTS = "get-secret-imports",
+    CREATE_SECRET_IMPORT = "create-secret-import",
+    UPDATE_SECRET_IMPORT = "update-secret-import",
+    DELETE_SECRET_IMPORT = "delete-secret-import",
 }

backend/src/ee/models/auditLog/types.ts

@@ -80,17 +80,24 @@ interface DeleteSecretEvent {
     }
 }
 
+interface GetWorkspaceKeyEvent {
+    type: EventType.GET_WORKSPACE_KEY,
+    metadata: {
+        keyId: string;
+    }
+}
+
 interface AuthorizeIntegrationEvent {
     type: EventType.AUTHORIZE_INTEGRATION;
     metadata: {
-        integration: string; // TODO: fix type
+        integration: string;
     }
 }
 
 interface UnauthorizeIntegrationEvent {
     type: EventType.UNAUTHORIZE_INTEGRATION;
     metadata: {
-        integration: string; // TODO: fix type
+        integration: string;
     }
 }
 
@@ -101,9 +108,15 @@ interface CreateIntegrationEvent {
         integration: string; // TODO: fix type
         environment: string;
         secretPath: string;
+        url?: string;
         app?: string;
+        appId?: string;
         targetEnvironment?: string;
-        targetEnvironmentId?: string; // TODO: consider adding other vars
+        targetEnvironmentId?: string;
+        targetService?: string;
+        targetServiceId?: string;
+        path?: string;
+        region?: string;
     }
 }
 
@@ -114,9 +127,15 @@ interface DeleteIntegrationEvent {
         integration: string; // TODO: fix type
         environment: string;
         secretPath: string;
+        url?: string;
         app?: string;
+        appId?: string;
         targetEnvironment?: string;
         targetEnvironmentId?: string;
+        targetService?: string;
+        targetServiceId?: string;
+        path?: string;
+        region?: string;
     }
 }
 
@@ -275,12 +294,55 @@ interface DeleteWebhookEvent {
     }
 }
 
+interface GetSecretImportsEvent {
+    type: EventType.GET_SECRET_IMPORTS,
+    metadata: {
+        environment: string;
+        secretImportId: string;
+        folderId: string;
+        numberOfImports: number;
+    }
+}
+
+interface CreateSecretImportEvent {
+    type: EventType.CREATE_SECRET_IMPORT,
+    metadata: {
+        environment: string;
+        secretImportId: string;
+        folderId: string;
+        importEnvironment: string;
+        importSecretPath: string;
+    }
+}
+
+interface UpdateSecretImportEvent {
+    type: EventType.UPDATE_SECRET_IMPORT,
+    metadata: {
+        environment: string;
+        secretImportId: string;
+        folderId: string;
+        numberOfImports: number;
+    }
+}
+
+interface DeleteSecretImportEvent {
+    type: EventType.DELETE_SECRET_IMPORT,
+    metadata: {
+        environment: string;
+        secretImportId: string;
+        folderId: string;
+        importEnvironment: string;
+        importSecretPath: string;
+    }
+}
+
 export type Event = 
     | GetSecretsEvent
     | GetSecretEvent
     | CreateSecretEvent
     | UpdateSecretEvent
     | DeleteSecretEvent
+    | GetWorkspaceKeyEvent
     | AuthorizeIntegrationEvent
     | UnauthorizeIntegrationEvent
     | CreateIntegrationEvent
@@ -300,4 +362,8 @@ export type Event =
     | DeleteFolderEvent
     | CreateWebhookEvent
     | UpdateWebhookStatusEvent
-    | DeleteWebhookEvent;
+    | DeleteWebhookEvent
+    | GetSecretImportsEvent
+    | CreateSecretImportEvent
+    | UpdateSecretImportEvent
+    | DeleteSecretImportEvent;

backend/src/ee/services/EEAuditLogService.ts

@@ -16,7 +16,7 @@ type ValidEventScope =
     | Required<EventScope>
 
 export default class EEAuditLogService {
-    static async createAuditLog(authData: AuthData, event: Event, eventScope: ValidEventScope) {
+    static async createAuditLog(authData: AuthData, event: Event, eventScope: ValidEventScope, shouldSave: boolean = true) {
         
         const MS_IN_DAY = 24 * 60 * 60 * 1000;
         
@@ -39,7 +39,11 @@ export default class EEAuditLogService {
             userAgent: authData.userAgent,
             userAgentType: authData.userAgentType,
             expiresAt: new Date(Date.now() + ttl)
-        }).save();
+        });
+        
+        if (shouldSave) {
+            await auditLog.save();
+        }
         
         return auditLog;
     }