From 79abc313dcddec21239f29578adb0ee9d1ceea35 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Tue, 14 Jan 2025 20:04:43 +0100
Subject: [PATCH] feat: Set `event.user.ip_address = "{{auto}}"` if
 `sendDefaultPii !== false`

---
 src/main/integrations/electron-context.ts           | 7 ++++++-
 test/e2e/test-apps/javascript/main-error/event.json | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/integrations/electron-context.ts b/src/main/integrations/electron-context.ts
index c6c6b5c7..9f840f1d 100644
--- a/src/main/integrations/electron-context.ts
+++ b/src/main/integrations/electron-context.ts
@@ -28,7 +28,12 @@ export const electronContextIntegration = defineIntegration(() => {
         delete event.request.headers['User-Agent'];
       }
 
-      const { release = getDefaultReleaseName(), environment = getDefaultEnvironment() } = client.getOptions();
+      const { release = getDefaultReleaseName(), environment = getDefaultEnvironment(), sendDefaultPii } = client.getOptions();
+
+      if (sendDefaultPii !== false && typeof event.user?.ip_address === 'undefined') {
+        event.user = event.user || {};
+        event.user.ip_address = event.user.ip_address || '{{auto}}';
+      }
 
       return mergeEvents(
         {
diff --git a/test/e2e/test-apps/javascript/main-error/event.json b/test/e2e/test-apps/javascript/main-error/event.json
index 3db68430..1cf9799e 100644
--- a/test/e2e/test-apps/javascript/main-error/event.json
+++ b/test/e2e/test-apps/javascript/main-error/event.json
@@ -91,6 +91,7 @@
       "event.environment": "javascript",
       "event.origin": "electron",
       "event.process": "browser"
-    }
+    },
+    "user": { "ip_address": "{{auto}}" }
   }
 }