From 2aaaec5a4bc9fd103e8bddf2394148d8318b604c Mon Sep 17 00:00:00 2001
From: Walter <walter@walter.lol>
Date: Fri, 21 Feb 2025 06:06:29 +0100
Subject: [PATCH] Fix bug on logging

---
 app/bloonsa_api/views.py  | 3 +++
 app/bloonsa_game/views.py | 1 +
 app/settings/settings.py  | 6 +++---
 app/users/util.py         | 4 +++-
 app/users/views.py        | 6 +++++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/bloonsa_api/views.py b/app/bloonsa_api/views.py
index bee4ea7..9ab2318 100644
--- a/app/bloonsa_api/views.py
+++ b/app/bloonsa_api/views.py
@@ -34,6 +34,7 @@ class LoadLevel(CSRFexemptTemplateView):
             player: Player = request.user.player
             player.bloonsa_levels_played.add(level)
             bloonsa_util.log(player=player,
+                             request=request,
                              action=actions.bloonsa_load_level_by_id,
                              note=level.level_id)
 
@@ -118,6 +119,7 @@ class CompleteLevel(CSRFexemptTemplateView):
                          dart_glitch_ever=True)
 
         bloonsa_util.log(player=player,
+                         request=request,
                          action=actions.bloonsa_submit_score,
                          note=level.level_id)
 
@@ -136,6 +138,7 @@ class RateLevel(CSRFexemptTemplateView):
         player: Player = request.user.player
         ratingObject = player.bloonsa_level_ratings.filter(level=level).first()
         bloonsa_util.log(player=player,
+                         request=request,
                          action=actions.bloonsa_rate_level,
                          note=level.level_id)
         if ratingObject:
diff --git a/app/bloonsa_game/views.py b/app/bloonsa_game/views.py
index 2c04e1e..0d7ca3f 100644
--- a/app/bloonsa_game/views.py
+++ b/app/bloonsa_game/views.py
@@ -26,6 +26,7 @@ class GameView(TemplateView):
             level = Level.objects.get(level_id=kwargs["pk"])
             if level:
                 bloonsa_util.log(player=player,
+                                 request=request,
                                  action=actions.bloonsa_load_level_by_url,
                                  note=level)
                 return render(request, "bloonsa_game/game.html", context={
diff --git a/app/settings/settings.py b/app/settings/settings.py
index b1c0ea1..2d8479a 100644
--- a/app/settings/settings.py
+++ b/app/settings/settings.py
@@ -123,9 +123,9 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-AUTHENTICATION_BACKENDS = (
-    "users.backends.CaseInsensitiveModelBackend", # inherits from 'django.contrib.auth.backends.ModelBackend'
-)
+#AUTHENTICATION_BACKENDS = (
+#    "users.backends.CaseInsensitiveModelBackend", # inherits from 'django.contrib.auth.backends.ModelBackend'
+#)
 
 # Internationalization
 # https://docs.djangoproject.com/en/3.2/topics/i18n/
diff --git a/app/users/util.py b/app/users/util.py
index 92fea14..001dc11 100644
--- a/app/users/util.py
+++ b/app/users/util.py
@@ -39,11 +39,13 @@ class BloonsaUtil:
         return player
 
     # Update activity timestamp and IP
-    def tag_player(self, player=None, request=None):
+    def tag_player(self, request, player=None):
         if not self.tracking:
             return
         if request and not request.user.is_authenticated:
             return
+        if not request:
+            return
         player = player or self.init_player(request=request)
         if player.banned:
             # TODO message popup?
diff --git a/app/users/views.py b/app/users/views.py
index 8763b9f..8abbe7c 100644
--- a/app/users/views.py
+++ b/app/users/views.py
@@ -23,6 +23,7 @@ class LoginView(TemplateView):
         login(request=request, user=user)
         bloonsa_util.init_player(request=request)
         bloonsa_util.log(player=user.player,
+                         request=request,
                          action=actions.login)
         return redirect("bloonsa_game:game")
 
@@ -46,6 +47,7 @@ class RegisterView(TemplateView):
         player.save()
 
         bloonsa_util.log(player=player,
+                         request=request,
                          action=actions.login)
         return redirect("bloonsa_game:game")
 
@@ -54,8 +56,9 @@ class RegisterView(TemplateView):
 class LogoutView(TemplateView):
     def get(self, request, *args, **kwargs):
         if request.user.is_authenticated:
-            bloonsa_util.init_player(request=request)
+            player = bloonsa_util.init_player(request=request)
             bloonsa_util.log(request=request,
+                             player=player,
                              action=actions.logout)
             logout(request)
         return redirect("bloonsa_game:game")
@@ -97,6 +100,7 @@ class ConfigView(LoginRequiredMixin, TemplateView):
             form_config.save()
 
         bloonsa_util.log(action=actions.config,
+                         request=request,
                          player=request.user.player)
         # messages.success(request, "Profile updated successfully")
         return redirect("users:config")
\ No newline at end of file