Update tests

Author: alukach

.vscode/launch.json

@@ -16,6 +16,7 @@
       ],
       "jinja": true,
       "cwd": "${workspaceFolder}/src",
+      "justMyCode": false
     }
   ]
 }

pyproject.toml

@@ -50,4 +50,4 @@ dev = [
 
 [tool.pytest.ini_options]
 asyncio_default_fixture_loop_scope = "function"
-asyncio_mode = "strict"
+asyncio_mode = "auto"

src/stac_auth_proxy/config.py

@@ -48,11 +48,11 @@ class Settings(BaseSettings):
     public_endpoints: EndpointMethods = {r"^/api.html$": ["GET"], r"^/api$": ["GET"]}
     openapi_spec_endpoint: Optional[str] = None
 
-    collections_filter: Optional[ClassInput] = None
-    collections_filter_endpoints: Optional[EndpointMethods] = {
-        "/collections": ["GET"],
-        "/collections/{collection_id}": ["GET"],
-    }
+    # collections_filter: Optional[ClassInput] = None
+    # collections_filter_endpoints: Optional[EndpointMethods] = {
+    #     r"^/collections$": ["GET"],
+    #     r"^/collections$/([^/]+)": ["GET"],
+    # }
     items_filter: Optional[ClassInput] = None
     items_filter_endpoints: Optional[EndpointMethods] = {
         r"^/search$": ["POST"],

tests/conftest.py

@@ -3,8 +3,8 @@
 import json
 import os
 import threading
-from typing import Any, Generator
-from unittest.mock import AsyncMock, MagicMock, patch
+from typing import Any, AsyncGenerator
+from unittest.mock import AsyncMock, MagicMock, patch, DEFAULT
 
 import pytest
 import uvicorn
@@ -144,12 +144,21 @@ def mock_env():
 
 
 @pytest.fixture
-def mock_upstream() -> Generator[MagicMock, None, None]:
+async def mock_upstream() -> AsyncGenerator[MagicMock, None]:
     """Mock the HTTPX send method. Useful when we want to inspect the request is sent to upstream API."""
+
+    async def store_body(request, **kwargs):
+        """Exhaust and store the request body."""
+        _streamed_body = b""
+        async for chunk in request.stream:
+            _streamed_body += chunk
+        setattr(request, "_streamed_body", _streamed_body)
+        return DEFAULT
+
     with patch(
         "stac_auth_proxy.handlers.reverse_proxy.httpx.AsyncClient.send",
         new_callable=AsyncMock,
+        side_effect=store_body,
+        return_value=single_chunk_async_stream_response(b"{}"),
     ) as mock_send_method:
-        # Mock response from upstream API
-        mock_send_method.return_value = single_chunk_async_stream_response(b"{}")
         yield mock_send_method

tests/test_filters_jinja2.py

@@ -18,7 +18,7 @@
         id="simple_not_templated",
     ),
     pytest.param(
-        "{{ '(properties.private = false)' if token is none else true }}",
+        "{{ '(properties.private = false)' if user is none else true }}",
         "true",
         "(properties.private = false)",
         id="simple_templated",
@@ -30,7 +30,7 @@
         id="complex_not_templated",
     ),
     pytest.param(
-        """{{ '{"op": "=", "args": [{"property": "private"}, true]}' if token is none else true }}""",
+        """{{ '{"op": "=", "args": [{"property": "private"}, true]}' if user is none else true }}""",
         "true",
         """{"op": "=", "args": [{"property": "private"}, true]}""",
         id="complex_templated",
@@ -146,11 +146,12 @@ def _build_client(
     return TestClient(app, headers=headers)
 
 
-def _get_upstream_request(mock_upstream: MagicMock):
+async def _get_upstream_request(mock_upstream: MagicMock):
     """Fetches the raw body and query params from the single upstream request."""
     assert mock_upstream.call_count == 1
     [request] = cast(list[Request], mock_upstream.call_args[0])
-    return request.read().decode(), dict(request.url.params)
+    req_body = request._streamed_body
+    return req_body.decode(), dict(request.url.params)
 
 
 @pytest.mark.parametrize(
@@ -159,7 +160,7 @@ def _get_upstream_request(mock_upstream: MagicMock):
 )
 @pytest.mark.parametrize("is_authenticated", [True, False], ids=["auth", "anon"])
 @pytest.mark.parametrize("input_query", SEARCH_POST_QUERIES)
-def test_search_post(
+async def test_search_post(
     mock_upstream,
     source_api_server,
     filter_template_expr,
@@ -179,7 +180,7 @@ def test_search_post(
     response.raise_for_status()
 
     # Retrieve the JSON body that was actually sent upstream
-    proxied_body_str = _get_upstream_request(mock_upstream)[0]
+    proxied_body_str = (await _get_upstream_request(mock_upstream))[0]
     proxied_body = json.loads(proxied_body_str)
 
     # Determine the expected combined filter
@@ -193,6 +194,7 @@ def test_search_post(
     expected_output = {
         **input_query,
         "filter": proxy_filter.to_json(),
+        "filter-lang": "cql2-json",
     }
 
     assert (
@@ -206,7 +208,7 @@ def test_search_post(
 )
 @pytest.mark.parametrize("is_authenticated", [True, False], ids=["auth", "anon"])
 @pytest.mark.parametrize("input_query", SEARCH_GET_QUERIES)
-def test_search_get(
+async def test_search_get(
     mock_upstream,
     source_api_server,
     filter_template_expr,
@@ -226,7 +228,7 @@ def test_search_get(
     response.raise_for_status()
 
     # For GET, we expect the upstream body to be empty, but URL params to be appended
-    proxied_body, upstream_query = _get_upstream_request(mock_upstream)
+    proxied_body, upstream_query = await _get_upstream_request(mock_upstream)
     assert proxied_body == ""
 
     # Determine the expected combined filter
@@ -253,7 +255,7 @@ def test_search_get(
 )
 @pytest.mark.parametrize("is_authenticated", [True, False], ids=["auth", "anon"])
 @pytest.mark.parametrize("input_query", ITEMS_LIST_QUERIES)
-def test_items_list(
+async def test_items_list(
     mock_upstream,
     source_api_server,
     filter_template_expr,
@@ -274,7 +276,7 @@ def test_items_list(
     response.raise_for_status()
 
     # For GET items, we also expect an empty body and appended querystring
-    proxied_body, proxied_query = _get_upstream_request(mock_upstream)
+    proxied_body, proxied_query = await _get_upstream_request(mock_upstream)
     assert proxied_body == ""
 
     # Only the appended filter (no input_filter merges in these particular tests),