Post review tweaks again

cmu-delphi · May 13, 2024 · 40d14a6 · 40d14a6
1 parent 8df87d8
commit 40d14a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/server/_common.py b/src/server/_common.py
@@ -68,7 +68,7 @@ def log_info_with_request(message, **kwargs):
         remote_addr=request.remote_addr,
         real_remote_addr=get_real_ip_addr(request),
         user_agent=request.user_agent.string,
-        req_referrer=request.referrer or request.origin,
+        referrer=request.referrer or request.origin,
         api_key=resolve_auth_token(),
         user_id=(current_user and current_user.id),
         **kwargs
@@ -115,7 +115,6 @@ def before_request_execute():
     user = current_user
     api_key = resolve_auth_token()
 
-    # TODO: replace this next call with: log_info_with_request("Received API request")
     log_info_with_request("Received API request")
 
     if not _is_public_route() and api_key and not user:

diff --git a/tests/server/test_validate.py b/tests/server/test_validate.py
@@ -71,9 +71,9 @@ def test_origin_headers(self):
             output = logs.output
             self.assertEqual(len(output), 2) # [before_request, after_request]
             self.assertIn("Received API request", output[0])
-            self.assertIn("\"req_referrer\": \"https://test.com/test\"", output[0])
+            self.assertIn("\"referrer\": \"https://test.com/test\"", output[0])
             self.assertIn("Served API request", output[1])
-            self.assertIn("\"req_referrer\": \"https://test.com/test\"", output[1])
+            self.assertIn("\"referrer\": \"https://test.com/test\"", output[1])
         with self.subTest("origin only"):
             with self.assertLogs("server_api", level='INFO') as logs:
                 self.client.get("/signal_dashboard_status", headers={
@@ -82,9 +82,9 @@ def test_origin_headers(self):
             output = logs.output
             self.assertEqual(len(output), 2) # [before_request, after_request]
             self.assertIn("Received API request", output[0])
-            self.assertIn("\"req_referrer\": \"https://test.com\"", output[0])
+            self.assertIn("\"referrer\": \"https://test.com\"", output[0])
             self.assertIn("Served API request", output[1])
-            self.assertIn("\"req_referrer\": \"https://test.com\"", output[1])
+            self.assertIn("\"referrer\": \"https://test.com\"", output[1])
         with self.subTest("referer overrides origin"):
             with self.assertLogs("server_api", level='INFO') as logs:
                 self.client.get("/signal_dashboard_status", headers={
@@ -94,6 +94,6 @@ def test_origin_headers(self):
             output = logs.output
             self.assertEqual(len(output), 2) # [before_request, after_request]
             self.assertIn("Received API request", output[0])
-            self.assertIn("\"req_referrer\": \"https://test.com/test\"", output[0])
+            self.assertIn("\"referrer\": \"https://test.com/test\"", output[0])
             self.assertIn("Served API request", output[1])
-            self.assertIn("\"req_referrer\": \"https://test.com/test\"", output[1])
+            self.assertIn("\"referrer\": \"https://test.com/test\"", output[1])