From 4e2fb6b5d7bae06e3fb5dc4e7388f7488a5202f4 Mon Sep 17 00:00:00 2001
From: Nikolas Nyby <nnyby@columbia.edu>
Date: Wed, 16 Oct 2024 14:32:39 -0400
Subject: [PATCH] Configure user with initialScope

Based on the docs here:
https://docs.sentry.io/platforms/javascript/configuration/options/#initial-scope

My Sentry.onLoad and client.setUser setup doesn't seem to be working,
and I don't think this is how things are intended to be used in Sentry.
---
 CHANGES.txt                                   |  5 ++++
 .../templates/ctlsettings/sentry_js.html      | 29 +++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1a4d2b2..d1a0ef3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+0.4.3
+====================
+* Updated sentry-js config again to be more failsafe, and also
+  configure user data in initialScope on initialization.
+
 0.4.2 (2024-10-14)
 ====================
 * Updated sentry-js config to use Sentry.onLoad.
diff --git a/ctlsettings/templates/ctlsettings/sentry_js.html b/ctlsettings/templates/ctlsettings/sentry_js.html
index 5699037..6956d39 100644
--- a/ctlsettings/templates/ctlsettings/sentry_js.html
+++ b/ctlsettings/templates/ctlsettings/sentry_js.html
@@ -3,23 +3,22 @@
 <script>
     window.sentryOnLoad = function() {
         Sentry.init({
-            environment: '{{ ENVIRONMENT }}'
-        });
-
-        Sentry.onLoad(function() {
-            const client = Sentry.getClient();
+            environment: '{{ ENVIRONMENT }}',
 
-            {% if request.user.is_anonymous %}
-            client.setUser({
-                email: 'none',
-                username: 'anonymous'
-            });
-            {% else %}
-            client.setUser({
-                email: '{{ request.user.email }}',
-                username: '{{ request.user.username }}'
-            });
+            {% if request and request.user %}
+            initialScope: {
+                user: {
+                    {% if request.user.is_anonymous %}
+                    email: 'none',
+                    username: 'anonymous'
+                    {% else %}
+                    email: '{{ request.user.email }}',
+                    username: '{{ request.user.username }}'
+                    {% endif %}
+                }
+            }
             {% endif %}
+
         });
     };
 </script>