Rebecca Fixes

Author: BJSS-russell-pollock

.github/workflows/preview-env.yml

@@ -388,8 +388,7 @@ jobs:
           MTLS_CERT: /tmp/client1-cert.pem
           MTLS_KEY: /tmp/client1-key.pem
         run: |
-          touch .env.remote
-          make test-remote
+          make test-integration
 
       - name: Upload integration test results
         if: always()

Makefile

@@ -36,7 +36,8 @@ build-gateway-api: dependencies
 	@poetry run mypy --no-namespace-packages .
 	@echo "Packaging dependencies..."
 	@poetry build --format=wheel
-	@poetry run pip install "dist/gateway_api-0.1.0-py3-none-any.whl" --target "./target/gateway-api" --platform musllinux_1_2_x86_64 --only-binary=:all:	# Copy main file separately as it is not included within the package.
+	@pip install "dist/gateway_api-0.1.0-py3-none-any.whl" --target "./target/gateway-api" --platform musllinux_1_2_x86_64 --only-binary=:all:
+	# Copy main file separately as it is not included within the package.
 	@rm -rf ../infrastructure/images/gateway-api/resources/build/
 	@mkdir ../infrastructure/images/gateway-api/resources/build/
 	@cp -r ./target/gateway-api ../infrastructure/images/gateway-api/resources/build/

gateway-api/poetry.lock

@@ -10,7 +10,7 @@ requires-python = ">=3.14,<4.0.0"
 
 [tool.poetry.dependencies]
 clinical-data-common = { git = "https://github.com/NHSDigital/clinical-data-common.git", tag = "v0.1.0" }
-flask = "^3.1.2"
+flask = "^3.1.3"
 types-flask = "^1.1.6"
 requests = "^2.32.5"
 pyjwt = "^2.11.0"

gateway-api/pyproject.toml

@@ -20,7 +20,7 @@ class JWT:
     expiration: int = field(default_factory=lambda: int(time()) + 300)
 
     # These are here for future proofing but are not expected ever to be changed
-    algorithm: str | None = None
+    algorithm: str = "none"
     type: str = "JWT"
     reason_for_request: str = "directcare"
     requested_scope: str = "patient/*.read"
@@ -36,7 +36,7 @@ def exp_time(self) -> str:
     def encode(self) -> str:
         return pyjwt.encode(
             self.payload(),
-            key=None,
+            key=None,  # type: ignore[arg-type]
             algorithm=self.algorithm,
             headers={"typ": self.type},
         )

gateway-api/src/gateway_api/clinical_jwt/jwt.py

@@ -29,7 +29,7 @@ def test_jwt_creation_with_required_fields() -> None:
     assert token.requesting_device == '{"device": "info"}'
     assert token.requesting_organization == "ORG-123"
     assert token.requesting_practitioner == '{"practitioner": "info"}'
-    assert token.algorithm is None
+    assert token.algorithm == "none"
     assert token.type == "JWT"
     assert token.reason_for_request == "directcare"
     assert token.requested_scope == "patient/*.read"

gateway-api/src/gateway_api/clinical_jwt/test_jwt.py

@@ -2,7 +2,7 @@
 
 import os
 from datetime import timedelta
-from typing import Protocol, cast
+from typing import Any, Protocol, cast
 
 import pytest
 import requests
@@ -144,19 +144,14 @@ def simple_request_payload() -> Parameters:
 
 
 @pytest.fixture
-def get_headers(request: pytest.FixtureRequest) -> dict[str, str]:
+def get_headers(request: pytest.FixtureRequest) -> Any:
     """Return merged auth headers for remote tests, or empty dict for local."""
-    env = os.getenv("ENV") or request.config.getoption("--env")
+    env = request.config.getoption("--env")
     if env == "remote":
         apikey_headers = request.getfixturevalue("status_endpoint_auth_headers")
-        token = os.getenv("APIGEE_ACCESS_TOKEN")
-
-        if token:
-            return {"Authorization": f"Bearer {token}", **apikey_headers}
-
         nhsd_headers = request.getfixturevalue("nhsd_apim_auth_headers")
         headers = nhsd_headers | apikey_headers
-        return cast("dict[str, str]", headers)
+        return headers
 
     return {}
 

gateway-api/tests/conftest.py

@@ -6,9 +6,11 @@
 
 from typing import Any
 
+import pytest
 from pact import Verifier
 
 
+@pytest.mark.remote_only
 def test_provider_honors_consumer_contract(mtls_proxy: str, get_headers: Any) -> None:
     verifier = Verifier(
         name="GatewayAPIProvider",