[NRL-602] Check error.content in catch-all errors for errors from apigee

NHSDigital · Apr 17, 2024 · f3865fe · f3865fe
1 parent c10c128
commit f3865fe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/proxies/live/apiproxy/policies/RaiseFault.403NoPointers.xml b/proxies/live/apiproxy/policies/RaiseFault.403NoPointers.xml
@@ -1,24 +1,25 @@
 <RaiseFault async="false" continueOnError="false" enabled="true" name="RaiseFault.403NoPointers">
     <FaultResponse>
         <Set>
-        <Payload contentType="application/json"> {
-            "resourceType": "OperationOutcome",
-            "issue": [
-                {
-                "severity": "error",
-                "code": "403",
-                "details": {
-                    "coding": [
+            <Payload contentType="application/json"> {
+                "resourceType": "OperationOutcome",
+                "issue": [
                     {
-                        "code": "403",
-                        "display": "Forbidden"
+                    "severity": "error",
+                    "code": "403",
+                    "details": {
+                        "coding": [
+                        {
+                            "code": "403",
+                            "display": "Forbidden"
+                        }
+                        ]
+                    },
+                    "diagnostics": "Provided ODS code has no pointers within requesting app"
                     }
-                    ]
-                },
-                "diagnostics": "Provided ODS code has no pointers within requesting app"
-                }
-            ]
-        }</Payload>
+                ]
+            }
+            </Payload>
             <StatusCode>403</StatusCode>
             <ReasonPhrase>Forbidden</ReasonPhrase>
         </Set>

diff --git a/proxies/live/apiproxy/proxies/default.xml b/proxies/live/apiproxy/proxies/default.xml
@@ -77,7 +77,7 @@
         </Step>
         <Step>
             <Name>AssignMessage.Errors.CatchAllMessage</Name>
-            <Condition>(response.content NOT Like "*OperationOutcome*")</Condition>
+            <Condition>(response.content NOT Like "*OperationOutcome*") and (error.content NOT Like "*OperationOutcome*")</Condition>
         </Step>
     </DefaultFaultRule>
 </ProxyEndpoint>