From d333a96d993b56b0ec9cb1057bd5d541f48619f8 Mon Sep 17 00:00:00 2001
From: StarkZarn <67663172+StarkZarn@users.noreply.github.com>
Date: Thu, 18 Apr 2024 12:28:11 -0700
Subject: [PATCH] Revert "Respect dnt in JS tracker (#257)"

This reverts commit 4ffc3bdef73182ca9ca58f458538d694332d7c68.
---
 shynet/analytics/templates/analytics/scripts/page.js |  8 --------
 shynet/analytics/views/ingress.py                    | 10 +++-------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/shynet/analytics/templates/analytics/scripts/page.js b/shynet/analytics/templates/analytics/scripts/page.js
index 9574cdc6..35aa7dde 100644
--- a/shynet/analytics/templates/analytics/scripts/page.js
+++ b/shynet/analytics/templates/analytics/scripts/page.js
@@ -5,13 +5,7 @@
 //
 // This script only sends the current URL, the referrer URL, and the page load time. That's it!
 
-{% if dnt %}
 var Shynet = {
-  dnt: true
-};
-{% else %}
-var Shynet = {
-  dnt: false,
   idempotency: null,
   heartbeatTaskId: null,
   skipHeartbeat: false,
@@ -59,8 +53,6 @@ var Shynet = {
 };
 
 window.addEventListener("load", Shynet.newPageLoad);
-{% endif %}
-
 
 {% if script_inject %}
 // The following is script is not part of Shynet, and was instead
diff --git a/shynet/analytics/views/ingress.py b/shynet/analytics/views/ingress.py
index 49dcfda0..b6b76094 100644
--- a/shynet/analytics/views/ingress.py
+++ b/shynet/analytics/views/ingress.py
@@ -15,7 +15,7 @@
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
-from django.views.generic import View
+from django.views.generic import TemplateView, View
 from ipware import get_client_ip
 
 from core.models import Service
@@ -119,7 +119,7 @@ def get(self, *args, **kwargs):
                     "service_uuid": self.kwargs.get("service_uuid"),
                 },
             )
-            if self.kwargs.get("identifier") is None
+            if self.kwargs.get("identifier") == None
             else reverse(
                 "ingress:endpoint_script_id",
                 kwargs={
@@ -129,9 +129,6 @@ def get(self, *args, **kwargs):
             )
         )
         heartbeat_frequency = settings.SCRIPT_HEARTBEAT_FREQUENCY
-        dnt = self.request.META.get("HTTP_DNT", "0").strip() == "1"
-        service_uuid = self.kwargs.get("service_uuid")
-        service = Service.objects.get(pk=service_uuid, status=Service.ACTIVE)
         return render(
             self.request,
             "analytics/scripts/page.js",
@@ -141,7 +138,6 @@ def get(self, *args, **kwargs):
                     "protocol": protocol,
                     "heartbeat_frequency": heartbeat_frequency,
                     "script_inject": self.get_script_inject(),
-                    "dnt": dnt and service.respect_dnt,
                 }
             ),
             content_type="application/javascript",
@@ -163,7 +159,7 @@ def post(self, *args, **kwargs):
     def get_script_inject(self):
         service_uuid = self.kwargs.get("service_uuid")
         script_inject = cache.get(f"script_inject_{service_uuid}")
-        if script_inject is None:
+        if script_inject == None:
             service = Service.objects.get(uuid=service_uuid)
             script_inject = service.script_inject
             cache.set(f"script_inject_{service_uuid}", script_inject, timeout=3600)