adds faultrule for ODS not in partner list

Author: kevinmason-nhs

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

@@ -106,50 +106,46 @@
             </Step>
             <Condition>(raisefault.RaiseFault.MissingAsid.failed = true)</Condition>
         </FaultRule>
-<!--        <FaultRule name="single_asid_ods_header_not_in_partner_list_error">-->
-<!--            <Step>-->
-<!--                <Condition>(isFhirR4Path = false)</Condition>-->
-<!--                <Name>AssignMessage.SetOperationOutcomeVariablesPreR4</Name>-->
-<!--            </Step>-->
-<!--            <Step>-->
-<!--                <Name>AssignMessage.SetOperationOutcomeODSHeaderValueNotInPartnerListPreR4</Name>-->
-<!--            </Step>-->
-<!--            <Step>-->
-<!--                <Name>AssignMessage.OperationOutcomeErrorResponse</Name>-->
-<!--            </Step>-->
-<!--            <Condition>(FlowCallout.EUOAllowlistVerify.error_description ~~ ".*Invalid ODS code.*")</Condition>)-->
-<!--        </FaultRule>-->
-<!--        <FaultRule name="single_asid_ods_header_not_in_partner_list_error_fhir_r4">-->
-<!--            <Step>-->
-<!--                <Name>AssignMessage.SetOperationOutcomeODSHeaderValueNotInPartnerListR4</Name>-->
-<!--            </Step>-->
-<!--            <Step>-->
-<!--                <Name>AssignMessage.OperationOutcomeErrorResponse</Name>-->
-<!--            </Step>-->
-<!--            <Condition>(FlowCallout.EUOAllowlistVerify.error_description ~~ ".*Invalid ODS code.*") and (isFhirR4Path = true)</Condition>)-->
-<!--        </FaultRule>-->
-<!--        <FaultRule name="single_asid_ods_header_missing_error">-->
-<!--            <Step>-->
-<!--                <Condition>(isFhirR4Path = false)</Condition>-->
-<!--                <Name>AssignMessage.SetOperationOutcomeVariablesPreR4</Name>-->
-<!--            </Step>-->
-<!--            <Step>-->
-<!--                <Name>AssignMessage.SetOperationOutcomeODSHeaderMissingPreR4</Name>-->
-<!--            </Step>-->
-<!--            <Step>-->
-<!--                <Name>AssignMessage.OperationOutcomeErrorResponse</Name>-->
-<!--            </Step>-->
-<!--            <Condition>(FlowCallout.EUOAllowlistVerify.error_description ~~ ".*Missing or Empty NHSD-End-User-Organisation-ODS header.*")</Condition>)-->
-<!--        </FaultRule>-->
-<!--        <FaultRule name="single_asid_ods_header_missing_error_fhir_r4">-->
-<!--            <Step>-->
-<!--                <Name>AssignMessage.SetOperationOutcomeODSHeaderMissingR4</Name>-->
-<!--            </Step>-->
-<!--            <Step>-->
-<!--                <Name>AssignMessage.OperationOutcomeErrorResponse</Name>-->
-<!--            </Step>-->
-<!--            <Condition>(FlowCallout.EUOAllowlistVerify.error_description ~~ ".*Missing or Empty NHSD-End-User-Organisation-ODS header.*") and (isFhirR4Path = true)</Condition>)-->
-<!--        </FaultRule>-->
+        <FaultRule name="single_asid_ods_header_not_in_partner_list_error">
+            <Step>
+                <Condition>(isFhirR4Path = false)</Condition>
+                <Name>AssignMessage.SetOperationOutcomeVariablesPreR4</Name>
+            </Step>
+            <Step>
+                <Condition>(isFhirR4Path = false)</Condition>
+                <Name>AssignMessage.SetOperationOutcomeODSHeaderValueNotInPartnerListPreR4</Name>
+            </Step>
+            <Step>
+                <Condition>(isFhirR4Path = true)</Condition>
+                <Name>AssignMessage.SetOperationOutcomeODSHeaderValueNotInPartnerListR4</Name>
+            </Step>
+            <Step>
+                <Name>AssignMessage.OperationOutcomeErrorResponse</Name>
+            </Step>
+            <Condition>(raisefault.RaiseFault.CheckAllowlistFailed.failed = true)</Condition>
+        </FaultRule>
+        <!--        <FaultRule name="single_asid_ods_header_missing_error">-->
+        <!--            <Step>-->
+        <!--                <Condition>(isFhirR4Path = false)</Condition>-->
+        <!--                <Name>AssignMessage.SetOperationOutcomeVariablesPreR4</Name>-->
+        <!--            </Step>-->
+        <!--            <Step>-->
+        <!--                <Name>AssignMessage.SetOperationOutcomeODSHeaderMissingPreR4</Name>-->
+        <!--            </Step>-->
+        <!--            <Step>-->
+        <!--                <Name>AssignMessage.OperationOutcomeErrorResponse</Name>-->
+        <!--            </Step>-->
+        <!--            <Condition>(FlowCallout.EUOAllowlistVerify.error_description ~~ ".*Missing or Empty NHSD-End-User-Organisation-ODS header.*")</Condition>)-->
+        <!--        </FaultRule>-->
+        <!--        <FaultRule name="single_asid_ods_header_missing_error_fhir_r4">-->
+        <!--            <Step>-->
+        <!--                <Name>AssignMessage.SetOperationOutcomeODSHeaderMissingR4</Name>-->
+        <!--            </Step>-->
+        <!--            <Step>-->
+        <!--                <Name>AssignMessage.OperationOutcomeErrorResponse</Name>-->
+        <!--            </Step>-->
+        <!--            <Condition>(FlowCallout.EUOAllowlistVerify.error_description ~~ ".*Missing or Empty NHSD-End-User-Organisation-ODS header.*") and (isFhirR4Path = true)</Condition>)-->
+        <!--        </FaultRule>-->
     </FaultRules>
     <PreFlow>
         <Request>
@@ -207,8 +203,7 @@
     <Flows>
         <Flow name="user-restricted-flow">
             <Condition>(accesstoken.auth_type == "user")</Condition>
-            <Request>
-                <!--AUTHORISED_APPLICATION business function is not supported in user restricted flow --><Step>
+            <Request><!--AUTHORISED_APPLICATION business function is not supported in user restricted flow --><Step>
                     <Name>RaiseFault.403Forbidden</Name>
                     <Condition>(request.header.nhsd-ers-business-function == "AUTHORISED_APPLICATION")</Condition>
                 </Step><Step>