NPA-4699: Updated scripts to account not break api tests

Author: ellie-bound1-NHSD

proxies/live/apiproxy/resources/py/check-app-enabled-endpoint.py

@@ -1,18 +1,23 @@
 path_suffix = flow.getVariable("proxy.pathsuffix").lower()
 request_verb = flow.getVariable("request.verb").lower()
 
-blocked_resources = [
-    ("/fhir/r4/relatedperson", "get"),
-    ("/fhir/r4/questionnaire", "get"),
-    ("/fhir/r4/questionnaireresponse", "post"),
-    ("/fhir/r4/questionnaireresponse", "get"),
-    ("/fhir/r4/consent", "post"),
-    ("/fhir/r4/consent", "patch"),
-]
-
 auth_forbidden = False
-for blocked_resources in blocked_resources:
-    if blocked_resources[0] in path_suffix and blocked_resources[1] == request_verb:
-        auth_forbidden = True
+if request_verb == "patch":
+    # Check blocked endpoint is within path suffix i.e. ignore path parameters
+    blocked_resources = ["/fhir/r4/consent"]
+    for blocked_resource in blocked_resources:
+        if blocked_resource in path_suffix:
+            auth_forbidden = True
+else:
+    # Check blocked endpoint is equal to path suffix
+    requested_resource = (path_suffix, request_verb)
+    blocked_resources = [
+        ("/fhir/r4/relatedperson", "get"),
+        ("/fhir/r4/questionnaire", "get"),
+        ("/fhir/r4/questionnaireresponse", "post"),
+        ("/fhir/r4/questionnaireresponse", "get"),
+        ("/fhir/r4/consent", "post"),
+    ]
+    auth_forbidden = requested_resource in blocked_resources
 
 flow.setVariable("app_auth_forbidden", auth_forbidden)

proxies/live/apiproxy/resources/py/check-user-enabled-endpoint.py

@@ -2,6 +2,8 @@
 path_suffix = flow.getVariable("proxy.pathsuffix").lower()
 request_verb = flow.getVariable("request.verb").lower()
 
+requested_resource = (path_suffix, request_verb)
+
 if auth_level == "p9":
     blocked_resources = [
         ("/fhir/r4/questionnaire", "get"),
@@ -12,9 +14,6 @@
 else:
     blocked_resources = []
 
-auth_forbidden = False
-for blocked_resources in blocked_resources:
-    if blocked_resources[0] in path_suffix and blocked_resources[1] == request_verb:
-        auth_forbidden = True
+auth_forbidden = requested_resource in blocked_resources
 
 flow.setVariable("user_auth_forbidden", auth_forbidden)