Skip to content

Commit 9173f8f

Browse files
pca-nhspca-nhs
committed
PR comment updates
1 parent 06706a1 commit 9173f8f

File tree

4 files changed

+26
-23
lines changed

4 files changed

+26
-23
lines changed

‎manifest_template.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ APIGEE_ENVIRONMENTS:
1414
additional_proxies:
1515
- identity-service-mock-internal-dev
1616
variants:
17-
- name: alpha-internal-dev
18-
display_name: Internal Development - alpha
19-
euo_allowlist_required: false
2017
- name: rc-internal-dev
2118
display_name: Internal Development - rc
2219
euo_allowlist_required: false

‎proxies/live/apiproxy/policies/AssignMessage.SetOperationOutcomeODSHeaderMissingR4.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</AssignVariable>
66
<AssignVariable>
77
<Name>op_outcome_issue_code</Name>
8-
<Value>REC_BAD_REQUEST</Value>
8+
<Value>SECURITY</Value>
99
</AssignVariable>
1010
<AssignVariable>
1111
<Name>faultstring</Name>

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

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
</Step>
107107
<Condition>(raisefault.RaiseFault.MissingAsid.failed = true)</Condition>
108108
</FaultRule>
109-
<FaultRule name="single_asid_ods_header_not_in_partner_list_error">
109+
<FaultRule name="ods_header_not_in_partner_list_error">
110110
<Step>
111111
<Condition>(isFhirR4Path = false)</Condition>
112112
<Name>AssignMessage.SetOperationOutcomeVariablesPreR4</Name>
@@ -115,6 +115,10 @@
115115
<Condition>(isFhirR4Path = false)</Condition>
116116
<Name>AssignMessage.SetOperationOutcomeODSHeaderValueNotInPartnerListPreR4</Name>
117117
</Step>
118+
<Step>
119+
<Condition>(isFhirR4Path = true)</Condition>
120+
<Name>AssignMessage.SetOperationOutcomeVariablesR4</Name>
121+
</Step>
118122
<Step>
119123
<Condition>(isFhirR4Path = true)</Condition>
120124
<Name>AssignMessage.SetOperationOutcomeODSHeaderValueNotInPartnerListR4</Name>
@@ -124,7 +128,7 @@
124128
</Step>
125129
<Condition>(raisefault.RaiseFault.CheckAllowlistFailed.failed = true) and (validation.errorDescription ~~ ".*Invalid ODS code.*")</Condition>
126130
</FaultRule>
127-
<FaultRule name="single_asid_ods_header_missing_error">
131+
<FaultRule name="ods_header_missing_error">
128132
<Step>
129133
<Condition>(isFhirR4Path = false)</Condition>
130134
<Name>AssignMessage.SetOperationOutcomeVariablesPreR4</Name>
@@ -133,6 +137,10 @@
133137
<Condition>(isFhirR4Path = false)</Condition>
134138
<Name>AssignMessage.SetOperationOutcomeODSHeaderMissingPreR4</Name>
135139
</Step>
140+
<Step>
141+
<Condition>(isFhirR4Path = true)</Condition>
142+
<Name>AssignMessage.SetOperationOutcomeVariablesR4</Name>
143+
</Step>
136144
<Step>
137145
<Condition>(isFhirR4Path = true)</Condition>
138146
<Name>AssignMessage.SetOperationOutcomeODSHeaderMissingR4</Name>
@@ -163,11 +171,11 @@
163171
<!-- Must be placed after Authentication -->
164172
<Step>
165173
<Name>FlowCallout.ExtendedAttributes</Name>
166-
<Condition>(accesstoken.auth_type == "user")</Condition>
174+
<Condition>(accesstoken.auth_type == "user") and (proxy.pathsuffix != "/FHIR/R4/PractitionerRole")</Condition>
167175
</Step>
168176
<Step>
169177
<Name>FlowCallout.EUOAllowlistVerify</Name>
170-
<Condition>(accesstoken.auth_type == "user")</Condition>
178+
<Condition>(accesstoken.auth_type == "user") and (proxy.pathsuffix != "/FHIR/R4/PractitionerRole")</Condition>
171179
</Step>
172180
<Step>
173181
<Name>RaiseFault.MissingAsid</Name>
@@ -210,41 +218,41 @@
210218
<Condition>(request.header.nhsd-ers-business-function == "AUTHORISED_APPLICATION")</Condition>
211219
</Step><Step>
212220
<Name>AssignMessage.Set.x-ers-access-mode-header-user-restricted</Name>
213-
</Step> <Step>
221+
</Step><Step>
214222
<Name>AssignMessage.Set.x-ers-user-id-header-user-restricted</Name>
215-
</Step> <Step>
223+
</Step><Step>
216224
<Name>AssignMessage.Swap.NHSD-eRS-On-Behalf-Of-User-ID</Name>
217225
<Condition>(request.header.NHSD-eRS-On-Behalf-Of-User-ID ~~ ".+")</Condition>
218-
</Step> <Step>
226+
</Step><Step>
219227
<Name>AssignMessage.Swap.nhsd-end-user-organisation-ods</Name>
220228
<Condition>(request.header.nhsd-end-user-organisation-ods ~~ ".+")</Condition>
221-
</Step> <Step>
229+
</Step><Step>
222230
<Name>AssignMessage.Swap.nhsd-ers-business-function</Name>
223231
<Condition>(request.header.nhsd-ers-business-function ~~ ".+")</Condition>
224-
</Step> <Step>
232+
</Step><Step>
225233
<Name>AssignMessage.Swap.nhsd-ers-comm-rule-org</Name>
226234
<Condition>(request.header.nhsd-ers-comm-rule-org ~~ ".+")</Condition>
227-
</Step> <Step>
235+
</Step><Step>
228236
<Name>AssignMessage.Swap.nhsd-ers-file-name</Name>
229237
<Condition>(request.header.nhsd-ers-file-name ~~ ".+")</Condition>
230-
</Step> <Step>
238+
</Step><Step>
231239
<Name>AssignMessage.Swap.nhsd-ers-referral-id</Name>
232240
<Condition>(request.header.nhsd-ers-referral-id ~~ ".+")</Condition>
233-
</Step> <Step>
241+
</Step><Step>
234242
<Name>AssignMessage.Remove.x-request-id-header</Name>
235-
</Step> <Step>
243+
</Step><Step>
236244
<Name>AssignMessage.Set.x-ers-authentication-assurance-level-header</Name>
237-
</Step> <Step>
245+
</Step><Step>
238246
<Name>AssignMessage.Set.x-ers-amr-header</Name>
239-
</Step> <Step>
247+
</Step><Step>
240248
<Name>AssignMessage.Set.x-ers-id-assurance-level-header</Name>
241249
</Step> <Step>
242250
<Condition>(request.header.x-ers-id-assurance-level LesserThan 3)</Condition>
243251
<Name>RaiseFault.401InsufficientIal</Name>
244-
</Step> {% if ALLOW_ECHO_TARGET | default(false) == true %} <Step>
252+
</Step> {% if ALLOW_ECHO_TARGET | default(false) == true %}<Step>
245253
<Name>AssignMessage.SetEchoTarget</Name>
246254
<Condition>(request.header.echo)</Condition>
247-
</Step> {% endif %} {% if '--ft-' in (ERS_TARGET_SERVER | default('e-referrals-service-api')) %} <Step>
255+
</Step> {% endif %} {% if '--ft-' in (ERS_TARGET_SERVER | default('e-referrals-service-api')) %}<Step>
248256
<Name>AssignMessage.SetTruststore</Name>
249257
<!--Condition is implemented this way around to account for isEchoCall being null (https://docs.apigee.com/api-platform/reference/conditions-reference#behaviorofnulloperandsinconditionalstatements)-->
250258
<Condition>(isEchoCall != true )</Condition>

‎tests/integration/test_headers.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ async def test_headers_on_echo_target(
3737
service_url,
3838
user: Actor,
3939
asid,
40-
update_user_restricted_app_attr,
41-
app_restricted_ods_code,
4240
):
4341
access_code = await authenticate_user(user)
4442

0 commit comments

Comments
 (0)