adds logging

Author: kevinmason-nhs

proxies/live/apiproxy/targets/ers-target.xml

@@ -150,7 +150,7 @@
             </Step>
             <Condition>(raisefault.RaiseFault.CheckAllowlistFailed.failed = true) and (validation.statusCode = 400)</Condition>
         </FaultRule>
-        <FaultRule name="single_asid_app_misconfigured">
+        <FaultRule name="euo_allowlist_internal_error">
             <Step>
                 <Condition>(isFhirR4Path = false)</Condition>
                 <Name>AssignMessage.InternalServerError</Name>
@@ -181,7 +181,7 @@
             <Step>
                 <Name>OauthV2.VerifyAccessToken</Name>
             </Step>
-            <!-- Must be placed after Authentication -->
+            <!-- https://nhsd-jira.digital.nhs.uk/browse/ERSSUP-86126 Single ASID Per Connecting Party. Only for user-restricted, excludes Practitioner Role endpoint which should be accessible without -->
             <Step>
                 <Name>FlowCallout.ExtendedAttributes</Name>
                 <Condition>(accesstoken.auth_type == "user") and (proxy.pathsuffix != "/FHIR/R4/PractitionerRole")</Condition>

tests/conftest.py

@@ -262,7 +262,9 @@ async def _make_product(product_scopes, additional_attributes=None):
         ]
 
         if additional_attributes is not None:
+            print(f"Adding additional attributes: {additional_attributes}")
             attributes.extend(additional_attributes)
+            print(f"Attributes now: {attributes}")
 
         body = {
             "proxies": proxies,
@@ -316,6 +318,7 @@ async def _make_app(product, custom_attributes={}):
             {"name": key, "value": value} for key, value in custom_attributes.items()
         ]
         attributes.append({"name": "DisplayName", "value": app_name})
+        print(f"App attributes: {attributes}")
 
         body = {
             "apiProducts": [product],

tests/integration/test_user_restricted.py

@@ -38,6 +38,7 @@ class TestUserRestricted:
     async def test_user_restricted_valid_ods_code(
         self,
         authenticate_user,
+        referring_clinician,
         endpoint_url,
         is_fhir_4,
         service_url,
@@ -82,6 +83,7 @@ async def test_user_restricted_invalid_ods_code(
         self,
         authenticate_user,
         endpoint_url,
+        referring_clinician_insufficient_ial,
         is_fhir_4,
         service_url,
         update_user_restricted_product,