From bec46cbdad595ec775d92f6acd4c2b47319360ed Mon Sep 17 00:00:00 2001
From: Nikolas Nyby <nnyby@columbia.edu>
Date: Fri, 11 Oct 2024 22:16:54 -0400
Subject: [PATCH] Update to new sentry-js setup

---
 quizcon/templates/base.html | 28 +++-------------------------
 requirements.txt            |  2 +-
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/quizcon/templates/base.html b/quizcon/templates/base.html
index 758295d8..8c1e2f1d 100644
--- a/quizcon/templates/base.html
+++ b/quizcon/templates/base.html
@@ -7,6 +7,9 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <!-- The above 2 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+
+        {% include "ctlsettings/sentry_js.html" %}
+
         {% block precss %}{% endblock %}
         <!-- Bootstrap CSS -->
         <!-- CSS only -->
@@ -162,31 +165,6 @@
         <!-- JavaScript Bundle with Popper -->
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-gtEjrD/SeCtmISkJkNUaaKMoLD0//ElJ19smozuHV6z3Iehds+3Ulb9Bn9Plx0x4" crossorigin="anonymous"></script>
 
-        {% if SENTRY_PUBLIC_DSN %}
-        <script
-            src="https://browser.sentry-cdn.com/5.7.1/bundle.min.js"
-            integrity="sha384-KMv6bBTABABhv0NI+rVWly6PIRvdippFEgjpKyxUcpEmDWZTkDOiueL5xW+cztZZ"
-            crossorigin="anonymous"></script>
-
-        <script>
-        Sentry.init({
-            dsn: '{{ SENTRY_PUBLIC_DSN }}'
-        });
-
-        {% if user.is_anonymous %}
-        Sentry.setUser({
-            email: 'none',
-            id: 'anonymous'
-        });
-        {% else %}
-        Sentry.setUser({
-            email: '{{ user.email }}',
-            id: '{{ user.username }}'
-        });
-        {% endif %}
-        </script>
-        {% endif %}
-
         {% block js %}{% endblock %}
 
         {% if STAGING_ENV %}
diff --git a/requirements.txt b/requirements.txt
index 24c9faab..75632637 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -78,7 +78,7 @@ django-flatblocks==1.0.0
 djangorestframework==3.15.2
 
 django-storages==1.14.4
-ctlsettings==0.3.6
+ctlsettings==0.4.1
 
 django-reversion==5.1.0
 text_unidecode==1.3