Update signal to get user and add force_login to test (soynatan#136)

Author: chrisbrent

easyaudit/signals/request_signals.py

@@ -6,6 +6,7 @@
 from django.conf import settings
 from django.utils.module_loading import import_string
 
+from easyaudit.middleware.easyaudit import get_current_user
 from easyaudit.settings import REMOTE_ADDR_HEADER, UNREGISTERED_URLS, REGISTERED_URLS, WATCH_REQUEST_EVENTS, \
     LOGGING_BACKEND
 
@@ -37,9 +38,10 @@ def request_started_handler(sender, environ, **kwargs):
     if not should_log_url(environ['PATH_INFO']):
         return
 
+    # try and get the user from the request
+    user = get_current_user()
     # get the user from cookies
-    user = None
-    if environ.get('HTTP_COOKIE'):
+    if not user and environ.get('HTTP_COOKIE'):
         cookie = SimpleCookie() # python3 compatibility
         cookie.load(environ['HTTP_COOKIE'])
 

easyaudit/tests/test_app/tests.py

@@ -3,6 +3,7 @@
 import re
 
 from django.test import TestCase, override_settings
+from unittest.mock import patch
 
 from django.urls import reverse
 
@@ -135,6 +136,16 @@ def test_manual_set_user(self):
         crud_event = crud_event_qs[0]
         self.assertEqual(crud_event.user, None)
 
+    def test_middleware_logged_in_user_in_request(self):
+        user = self._setup_user(TEST_USER_EMAIL, TEST_USER_PASSWORD)
+        self.client.force_login(user)
+        create_obj_url = reverse("test_app:create-obj")
+        self.client.post(create_obj_url)
+        self.assertEqual(TestModel.objects.count(), 1)
+        obj = TestModel.objects.all()[0]
+        crud_event = CRUDEvent.objects.filter(object_id=obj.id, content_type=ContentType.objects.get_for_model(obj))[0]
+        self.assertEqual(crud_event.user, user)
+
 
 @override_settings(TEST=True)
 class TestAuditAdmin(TestCase):