AMB-000 revery NHS Login ID token claims and update test markers

Author: RyanThomas1214

tests/conftest.py

@@ -192,7 +192,7 @@ async def get_token_nhs_login_token_exchange(test_app_and_product):
         "id_status": "verified",
         "token_use": "id",
         "auth_time": 1616600683,
-        "iss": "https://identity.ptl.api.platform.nhs.uk/auth/realms/NHS-Login-mock-internal-dev",
+        "iss": "https://internal-dev.api.service.nhs.uk",
         "vot": "P9.Cp.Cd",
         "exp": int(time()) + 600,
         "iat": int(time()) - 10,
@@ -204,8 +204,8 @@ async def get_token_nhs_login_token_exchange(test_app_and_product):
     id_token_headers = {
         "sub": "49f470a1-cc52-49b7-beba-0f9cec937c46",
         "aud": "APIM-1",
-        "kid": "B86zGrfcoloO13rnjKYDyAJcqj2iZAMrS49jyleL0Fo",
-        "iss": "https://identity.ptl.api.platform.nhs.uk/auth/realms/NHS-Login-mock-internal-dev",
+        "kid": "nhs-login",
+        "iss": "https://internal-dev.api.service.nhs.uk",
         "typ": "JWT",
         "exp": 1616604574,
         "iat": 1616600974,

tests/test_endpoints.py

@@ -100,7 +100,7 @@ async def test_user_role_unhappy_path(self, test_app_and_product,
         assert response.status_code == status_code
         assert response.json()["issue"][0]["diagnostics"] == error_description
 
-    @pytest.mark.mock_auth
+    @pytest.mark.simulated_auth
     @pytest.mark.asyncio
     @pytest.mark.parametrize("additional_headers,error_description", [
         (

tests/test_splunk_logging.py

@@ -116,7 +116,7 @@ async def test_splunk_auth_with_cis2_token_exchange(self, get_token_cis2_token_e
         auth_user = auth["user"]
         assert auth_user["user_id"] == "lala"
 
-    @pytest.mark.mock_auth
+    @pytest.mark.simulated_auth
     @pytest.mark.splunk
     @pytest.mark.asyncio
     async def test_splunk_auth_with_nhs_login_token_exchange(self, get_token_nhs_login_token_exchange, debug):