Merge pull request #86 from NHSDigital/develop

Develop

Author: adamoldfield-nhs

…policies/AssignMessage.AddAsidHeader.xml …AssignMessage.RemoveAndAddAsidHeader.xmlproxies/live/apiproxy/policies/AssignMessage.AddAsidHeader.xml renamed to proxies/live/apiproxy/policies/AssignMessage.RemoveAndAddAsidHeader.xml proxies/live/apiproxy/policies/AssignMessage.AddAsidHeader.xml renamed to proxies/live/apiproxy/policies/AssignMessage.RemoveAndAddAsidHeader.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.AddAsidHeader">
+<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.RemoveAndAddAsidHeader">
+   <Remove>
+    <Headers>
+      <Header name="XAPI_ASID"/>
+    </Headers>
+  </Remove>
   <Add>
     <Headers>
       <Header name="XAPI_ASID">{private.apigee.NHSD-ASID}</Header>

…licies/AssignMessage.AddUserIdHeader.xml …signMessage.RemoveAndAddUserIdHeader.xmlproxies/live/apiproxy/policies/AssignMessage.AddUserIdHeader.xml renamed to proxies/live/apiproxy/policies/AssignMessage.RemoveAndAddUserIdHeader.xml proxies/live/apiproxy/policies/AssignMessage.AddUserIdHeader.xml renamed to proxies/live/apiproxy/policies/AssignMessage.RemoveAndAddUserIdHeader.xml

@@ -1,4 +1,9 @@
-<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.AddUserIdHeader">
+<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.RemoveAndAddUserIdHeader">
+  <Remove>
+    <Headers>
+      <Header name="x-ers-user-id"/>
+    </Headers>
+  </Remove>
   <Add>
     <Headers>
       <Header name="x-ers-user-id">{accesstoken.id_token-subject}</Header>

proxies/live/apiproxy/policies/OAuthV2.VerifyAccessToken.xml

@@ -1,3 +1,5 @@
 <OAuthV2 async="false" continueOnError="false" enabled="true" name="OauthV2.VerifyAccessToken">
   <Operation>VerifyAccessToken</Operation>
+  <!-- Set Scope to accept only AAL3 security level. -->
+  <Scope>urn:nhsd:apim:user-nhs-id:aal3:e-referrals-service-api</Scope>
 </OAuthV2>

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

@@ -25,10 +25,10 @@
         <Name>AssignMessage.PopulateAsidFromApp</Name>
       </Step>
       <Step>
-        <Name>AssignMessage.AddAsidHeader</Name>
+        <Name>AssignMessage.RemoveAndAddAsidHeader</Name>
       </Step>
       <Step>
-        <Name>AssignMessage.AddUserIdHeader</Name>
+        <Name>AssignMessage.RemoveAndAddUserIdHeader</Name>
       </Step>
       <Step>
         <Name>AssignMessage.Swap.nhsd-ers-ods-code</Name>

proxies/sandbox/apiproxy/policies/OAuthV2.VerifyAccessToken.xml

@@ -19,18 +19,18 @@ Redeploy the API Proxy. See the main [README.md](../README.md).
 
 ## Endpoints
 
-- [x] POST    `/STU3/v1/ReferralRequest/$ers.createReferral`
-- [x] POST    `/STU3/v1/ReferralRequest/$ers.createReferralAndSendForTriage`
-- [x] POST    `/STU3/v1/HealthcareService/$ers.searchHealthcareServicesForPatient`
-- [x] GET     `/STU3/v1/CodeSystem/{codeSystemType}`
-- [x] GET     `/STU3/v1/Slot`
-- [x] GET     `/R4/v1/PractitionerRole`
-- [x] POST    `/STU3/v1/Binary`
-- [x] POST    `/STU3/v1/ReferralRequest/{ubrn}/$ers.generatePatientLetter`
-- [x] GET     `/STU3/v1/Binary/{attachmentLogicalID}`
-- [x] GET     `/STU3/v1/ReferralRequest/{ubrn}`
-- [x] GET     `/STU3/v1/ReferralRequest/{ubrn}/_history/{version}`
-- [x] POST    `/STU3/v1/ReferralRequest/{ubrn}/$ers.maintainReferralLetter`
-- [x] POST    `/STU3/v1/Appointment`
-- [x] POST    `/STU3/v1/ReferralRequest/{ubrn}/$ers.generateCRI`
+- [x] POST    `/STU3/ReferralRequest/$ers.createReferral`
+- [x] POST    `/STU3/ReferralRequest/$ers.createReferralAndSendForTriage`
+- [x] POST    `/STU3/HealthcareService/$ers.searchHealthcareServicesForPatient`
+- [x] GET     `/STU3/CodeSystem/{codeSystemType}`
+- [x] GET     `/STU3/Slot`
+- [x] GET     `/R4/PractitionerRole`
+- [x] POST    `/STU3/Binary`
+- [x] POST    `/STU3/ReferralRequest/{ubrn}/$ers.generatePatientLetter`
+- [x] GET     `/STU3/Binary/{attachmentLogicalID}`
+- [x] GET     `/STU3/ReferralRequest/{ubrn}`
+- [x] GET     `/STU3/ReferralRequest/{ubrn}/_history/{version}`
+- [x] POST    `/STU3/ReferralRequest/{ubrn}/$ers.maintainReferralLetter`
+- [x] POST    `/STU3/Appointment`
+- [x] POST    `/STU3/ReferralRequest/{ubrn}/$ers.generateCRI`
 

sandbox/README.md

@@ -55,7 +55,7 @@
               {
                 "name": "specialty",
                 "valueCoding": {
-                  "system": "_baseUrl_/STU3/v1/CodeSystem/SPECIALTY",
+                  "system": "_baseUrl_/STU3/CodeSystem/SPECIALTY",
                   "code": "CARDIOLOGY"
                 }
               },

sandbox/src/mocks/createReferral/requests/MinimalRequest.json

@@ -62,7 +62,7 @@
               {
                 "name": "specialty",
                 "valueCoding": {
-                  "system": "_baseUrl_/STU3/v1/CodeSystem/SPECIALTY",
+                  "system": "_baseUrl_/STU3/CodeSystem/SPECIALTY",
                   "code": "CARDIOLOGY"
                 }
               },

sandbox/src/mocks/createReferral/requests/MinimalRequestWithReferringClinician.json

@@ -55,7 +55,7 @@
               {
                 "name": "specialty",
                 "valueCoding": {
-                  "system": "_baseUrl_/STU3/v1/CodeSystem/SPECIALTY",
+                  "system": "_baseUrl_/STU3/CodeSystem/SPECIALTY",
                   "code": "CARDIOLOGY"
                 }
               },

sandbox/src/mocks/createReferral/requests/RequestTwentyServices.json

@@ -54,7 +54,7 @@
 				{
 					"name": "specialty",
 					"valueCoding": {
-						"system": "_baseUrl_/STU3/v1/CodeSystem/SPECIALTY",
+						"system": "_baseUrl_/STU3/CodeSystem/SPECIALTY",
 						"code": "CARDIOLOGY"
 					}
 				},