From d99aee69a894bb02eea60923523f1042eebfd0db Mon Sep 17 00:00:00 2001 From: Hlamalani Date: Wed, 4 Sep 2024 14:11:27 +0200 Subject: [PATCH 1/3] update update authorizatio Bearer --- aaq/tasks.py | 2 +- aaq/utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aaq/tasks.py b/aaq/tasks.py index 19606a71..3b2e1ee5 100644 --- a/aaq/tasks.py +++ b/aaq/tasks.py @@ -62,7 +62,7 @@ def send_feedback_task_v2(feedback_secret_key, query_id, content_id=None, **kwar url = urljoin(settings.AAQ_V2_API_URL, path) headers = { - "Authorization": settings.AAQ_V2_AUTH, + "Authorization": f"Bearer {settings.AAQ_V2_AUTH}", "Content-Type": "application/json", } response = requests.post(url, json=data, headers=headers) diff --git a/aaq/utils.py b/aaq/utils.py index 02cbbd75..6d5d7086 100644 --- a/aaq/utils.py +++ b/aaq/utils.py @@ -9,7 +9,7 @@ def check_urgency_v2(message_text): url = urllib.parse.urljoin(settings.AAQ_V2_API_URL, "check-urgency") headers = { - "Authorization": settings.AAQ_V2_AUTH, + "Authorization": f"Bearer {settings.AAQ_V2_AUTH}", "Content-Type": "application/json", } @@ -27,7 +27,7 @@ def search(query_text, generate_llm_response, query_metadata): "query_metadata": query_metadata, } headers = { - "Authorization": settings.AAQ_V2_AUTH, + "Authorization": f"Bearer {settings.AAQ_V2_AUTH}", "Content-Type": "application/json", } From d8986d87e2a2cd48ccc72a5d8c125b96190e3adb Mon Sep 17 00:00:00 2001 From: Hlamalani Date: Wed, 4 Sep 2024 15:18:33 +0200 Subject: [PATCH 2/3] add assert for bearer token --- aaq/tests/test_utils.py | 2 ++ aaq/tests/test_views.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/aaq/tests/test_utils.py b/aaq/tests/test_utils.py index 617fa93d..64a38e46 100644 --- a/aaq/tests/test_utils.py +++ b/aaq/tests/test_utils.py @@ -51,6 +51,7 @@ def test_search_function(self): self.assertIn("query_id", response) self.assertEqual(response["query_id"], 1) self.assertEqual(json.loads(search_request.request.body), payload) + self.assertIn("Bearer", search_request.request.headers['Authorization']) assert response == { "message": "*0* - Example content title\n" "*1* - Another example content title", @@ -94,6 +95,7 @@ def test_urgency_check(self): self.assertIn("is_urgent", response) self.assertIn("matched_rules", response) self.assertEqual(json.loads(request.request.body), message_text) + self.assertIn("Bearer", request.request.headers['Authorization']) assert response == { "details": { diff --git a/aaq/tests/test_views.py b/aaq/tests/test_views.py index fe32fd43..a9ea3873 100644 --- a/aaq/tests/test_views.py +++ b/aaq/tests/test_views.py @@ -290,7 +290,10 @@ def test_response_feedback_view(self): response = self.client.post(self.url, data=payload, format="json") + request = responses.calls[0] + assert response.status_code == 200 + self.assertIn("Bearer", request.request.headers['Authorization']) def test_response_feedback_invalid_view(self): """Test that we can submit response feedback""" @@ -488,7 +491,10 @@ def test_content_feedback_view(self): response = self.client.post(self.url, data=payload, format="json") + request = responses.calls[0] + assert response.status_code == 200 + self.assertIn("Bearer", request.request.headers['Authorization']) def test_content_feedback_invalid_view(self): """Test that we can submit content feedback""" From 1b2ae97f5f9fbae2f07ad8de895bc12b05eb8d1f Mon Sep 17 00:00:00 2001 From: Hlamalani Date: Wed, 4 Sep 2024 15:20:31 +0200 Subject: [PATCH 3/3] add assert for bearer token --- aaq/tests/test_utils.py | 4 ++-- aaq/tests/test_views.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aaq/tests/test_utils.py b/aaq/tests/test_utils.py index 64a38e46..7aabdfe1 100644 --- a/aaq/tests/test_utils.py +++ b/aaq/tests/test_utils.py @@ -51,7 +51,7 @@ def test_search_function(self): self.assertIn("query_id", response) self.assertEqual(response["query_id"], 1) self.assertEqual(json.loads(search_request.request.body), payload) - self.assertIn("Bearer", search_request.request.headers['Authorization']) + self.assertIn("Bearer", search_request.request.headers["Authorization"]) assert response == { "message": "*0* - Example content title\n" "*1* - Another example content title", @@ -95,7 +95,7 @@ def test_urgency_check(self): self.assertIn("is_urgent", response) self.assertIn("matched_rules", response) self.assertEqual(json.loads(request.request.body), message_text) - self.assertIn("Bearer", request.request.headers['Authorization']) + self.assertIn("Bearer", request.request.headers["Authorization"]) assert response == { "details": { diff --git a/aaq/tests/test_views.py b/aaq/tests/test_views.py index a9ea3873..23281a6c 100644 --- a/aaq/tests/test_views.py +++ b/aaq/tests/test_views.py @@ -293,7 +293,7 @@ def test_response_feedback_view(self): request = responses.calls[0] assert response.status_code == 200 - self.assertIn("Bearer", request.request.headers['Authorization']) + self.assertIn("Bearer", request.request.headers["Authorization"]) def test_response_feedback_invalid_view(self): """Test that we can submit response feedback""" @@ -494,7 +494,7 @@ def test_content_feedback_view(self): request = responses.calls[0] assert response.status_code == 200 - self.assertIn("Bearer", request.request.headers['Authorization']) + self.assertIn("Bearer", request.request.headers["Authorization"]) def test_content_feedback_invalid_view(self): """Test that we can submit content feedback"""