From bba6f6941ce9da58725eacd89d9336dfde947571 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 1 Mar 2023 16:38:19 +0000
Subject: [PATCH] Minor fix for audit log system - after the switch to use an
 async queue for handling of audit log storage, context was lost - in
 multi-tenant environments need to carry the tenant ID into the queue job so
 that context can be applied.

---
 .../events/processors/AuditLogsProcessor.ts   | 43 ++++++++++---------
 packages/types/src/sdk/auditLogs.ts           |  1 +
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
index fd68b66871..d888d4f438 100644
--- a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
+++ b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
@@ -8,7 +8,7 @@ import {
   HostInfo,
 } from "@budibase/types"
 import { EventProcessor } from "./types"
-import { getAppId } from "../../context"
+import { getAppId, doInTenant } from "../../context"
 import BullQueue from "bull"
 import { createQueue, JobQueue } from "../../queue"
 import { isAudited } from "../../utils"
@@ -26,28 +26,30 @@ export default class AuditLogsProcessor implements EventProcessor {
       JobQueue.AUDIT_LOG
     )
     return AuditLogsProcessor.auditLogQueue.process(async job => {
-      let properties = job.data.properties
-      if (properties.audited) {
-        properties = {
-          ...properties,
-          ...properties.audited,
+      return doInTenant(job.data.tenantId, async () => {
+        let properties = job.data.properties
+        if (properties.audited) {
+          properties = {
+            ...properties,
+            ...properties.audited,
+          }
+          delete properties.audited
         }
-        delete properties.audited
-      }
 
-      // this feature is disabled by default due to privacy requirements
-      // in some countries - available as env var in-case it is desired
-      // in self host deployments
-      let hostInfo: HostInfo | undefined = {}
-      if (env.ENABLE_AUDIT_LOG_IP_ADDR) {
-        hostInfo = job.data.opts.hostInfo
-      }
+        // this feature is disabled by default due to privacy requirements
+        // in some countries - available as env var in-case it is desired
+        // in self host deployments
+        let hostInfo: HostInfo | undefined = {}
+        if (env.ENABLE_AUDIT_LOG_IP_ADDR) {
+          hostInfo = job.data.opts.hostInfo
+        }
 
-      await writeAuditLogs(job.data.event, properties, {
-        userId: job.data.opts.userId,
-        timestamp: job.data.opts.timestamp,
-        appId: job.data.opts.appId,
-        hostInfo,
+        await writeAuditLogs(job.data.event, properties, {
+          userId: job.data.opts.userId,
+          timestamp: job.data.opts.timestamp,
+          appId: job.data.opts.appId,
+          hostInfo,
+        })
       })
     })
   }
@@ -72,6 +74,7 @@ export default class AuditLogsProcessor implements EventProcessor {
           appId: getAppId(),
           hostInfo: identity.hostInfo,
         },
+        tenantId: identity.tenantId!,
       })
     }
   }
diff --git a/packages/types/src/sdk/auditLogs.ts b/packages/types/src/sdk/auditLogs.ts
index 0322d2e862..cf12a79688 100644
--- a/packages/types/src/sdk/auditLogs.ts
+++ b/packages/types/src/sdk/auditLogs.ts
@@ -18,4 +18,5 @@ export type AuditLogQueueEvent = {
   event: Event
   properties: any
   opts: AuditWriteOpts
+  tenantId: string
 }