From 7d4be356bfec60a8ab87846aa3136fcabeec9134 Mon Sep 17 00:00:00 2001
From: Lambodar Padhy <Lambodar.Padhy1@nhs.net>
Date: Thu, 4 Sep 2025 10:27:20 +0100
Subject: [PATCH 1/5] NHSO-60614: Added Supplier App Name to header

---
 .../AssignMessage.SetHeader.NhsdSupplierAppName.xml   | 11 +++++++++++
 proxies/live/apiproxy/targets/nhsa-target.xml         |  3 +++
 2 files changed, 14 insertions(+)
 create mode 100644 proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml

diff --git a/proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml b/proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml
new file mode 100644
index 0000000..1355f36
--- /dev/null
+++ b/proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<AssignMessage async="false" continueOnError="true" enabled="true" name="AssignMessage.SetHeader.NhsdSupplierAppName">
+  <Set>
+    <Headers>
+      <Header name="NHSD-Supplier-App-Name">{apim-app-flow-vars.nhsa.SupplierName}</Header>
+    </Headers>
+  </Set>
+  <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
+  <AssignTo createNew="false" transport="http" type="request"/>
+  <DisplayName>AssignMessage.SetHeader.NhsdSupplierAppName</DisplayName>
+</AssignMessage>
diff --git a/proxies/live/apiproxy/targets/nhsa-target.xml b/proxies/live/apiproxy/targets/nhsa-target.xml
index 198bd2f..a74d14d 100644
--- a/proxies/live/apiproxy/targets/nhsa-target.xml
+++ b/proxies/live/apiproxy/targets/nhsa-target.xml
@@ -46,6 +46,9 @@
 			<Step>
 				<Name>AssignMessage.SetHeader.NhsdSupplierAppId</Name>
 			</Step>
+      <Step>
+        <Name>AssignMessage.SetHeader.NhsdSupplierAppName</Name>
+      </Step>
 			<Step>
 				<Name>AssignMessage.RemoveHeader.XCorrelationId</Name>
 			</Step>

From 53cca5b6f15fe924ca390faf02e04b64f85b1e80 Mon Sep 17 00:00:00 2001
From: Lambodar Padhy <Lambodar.Padhy1@nhs.net>
Date: Mon, 8 Sep 2025 14:26:22 +0100
Subject: [PATCH 2/5] NHSO-60614: Added Flow callout extended attribute

---
 .../apiproxy/policies/FlowCallout.ExtendedAttributes.xml     | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 proxies/live/apiproxy/policies/FlowCallout.ExtendedAttributes.xml

diff --git a/proxies/live/apiproxy/policies/FlowCallout.ExtendedAttributes.xml b/proxies/live/apiproxy/policies/FlowCallout.ExtendedAttributes.xml
new file mode 100644
index 0000000..ed4fb7c
--- /dev/null
+++ b/proxies/live/apiproxy/policies/FlowCallout.ExtendedAttributes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<FlowCallout async="false" continueOnError="false" enabled="true" name="FlowCallout.LogToSplunk">
+    <DisplayName>FlowCallout.LogToSplunk</DisplayName>
+    <SharedFlowBundle>LogToSplunk</SharedFlowBundle>
+</FlowCallout>
\ No newline at end of file

From 8f966cc1ea4bc5605595bc72d51c236a8f37c0de Mon Sep 17 00:00:00 2001
From: Lambodar Padhy <Lambodar.Padhy1@nhs.net>
Date: Mon, 8 Sep 2025 15:23:12 +0100
Subject: [PATCH 3/5] NHSO-60614: Added Flow callout extended attribute

---
 .../apiproxy/policies/FlowCallout.ExtendedAttributes.xml  | 8 ++++----
 proxies/live/apiproxy/targets/nhsa-target.xml             | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/proxies/live/apiproxy/policies/FlowCallout.ExtendedAttributes.xml b/proxies/live/apiproxy/policies/FlowCallout.ExtendedAttributes.xml
index ed4fb7c..50dbae0 100644
--- a/proxies/live/apiproxy/policies/FlowCallout.ExtendedAttributes.xml
+++ b/proxies/live/apiproxy/policies/FlowCallout.ExtendedAttributes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<FlowCallout async="false" continueOnError="false" enabled="true" name="FlowCallout.LogToSplunk">
-    <DisplayName>FlowCallout.LogToSplunk</DisplayName>
-    <SharedFlowBundle>LogToSplunk</SharedFlowBundle>
-</FlowCallout>
\ No newline at end of file
+<FlowCallout async="false" continueOnError="false" enabled="true" name="FlowCallout.ExtendedAttributes">
+  <DisplayName>FlowCallout.ExtendedAttributes</DisplayName>
+  <SharedFlowBundle>ExtendedAttributes</SharedFlowBundle>
+</FlowCallout>
diff --git a/proxies/live/apiproxy/targets/nhsa-target.xml b/proxies/live/apiproxy/targets/nhsa-target.xml
index a74d14d..a4d30ef 100644
--- a/proxies/live/apiproxy/targets/nhsa-target.xml
+++ b/proxies/live/apiproxy/targets/nhsa-target.xml
@@ -32,8 +32,11 @@
 				<Name>OauthV2.VerifyAccessToken</Name>
 			</Step>
 			<Step>
-                <Name>FlowCallout.ApplyRateLimiting</Name>
-            </Step>
+        <Name>FlowCallout.ApplyRateLimiting</Name>
+      </Step>
+      <Step>
+        <Name>FlowCallout.ExtendedAttributes</Name>
+      </Step>
 			<Step>
 				<Name>KeyValueMap.GetUpstreamApiKey</Name>
 			</Step>

From 90fd60b8fd651facdcf7dd747be1e9bb408d9c6c Mon Sep 17 00:00:00 2001
From: Lambodar Padhy <Lambodar.Padhy1@nhs.net>
Date: Tue, 9 Sep 2025 15:02:16 +0100
Subject: [PATCH 4/5] NHSO-60614: Changed the custom attribute name

---
 .../policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml b/proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml
index 1355f36..77fe9dd 100644
--- a/proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml
+++ b/proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml
@@ -2,7 +2,7 @@
 <AssignMessage async="false" continueOnError="true" enabled="true" name="AssignMessage.SetHeader.NhsdSupplierAppName">
   <Set>
     <Headers>
-      <Header name="NHSD-Supplier-App-Name">{apim-app-flow-vars.nhsa.SupplierName}</Header>
+      <Header name="NHSD-Supplier-App-Name">{apim-app-flow-vars.nhsa.SupplierAppName}</Header>
     </Headers>
   </Set>
   <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>

From b0c92b65b5c2e783ecd7f0014c5be0d58ea25f9a Mon Sep 17 00:00:00 2001
From: Lambodar Padhy <Lambodar.Padhy1@nhs.net>
Date: Tue, 16 Sep 2025 11:27:00 +0100
Subject: [PATCH 5/5] NHSO-60614: Ignore unresolved variable set to true

---
 .../policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml b/proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml
index 77fe9dd..0cba24e 100644
--- a/proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml
+++ b/proxies/live/apiproxy/policies/AssignMessage.SetHeader.NhsdSupplierAppName.xml
@@ -5,7 +5,7 @@
       <Header name="NHSD-Supplier-App-Name">{apim-app-flow-vars.nhsa.SupplierAppName}</Header>
     </Headers>
   </Set>
-  <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
+  <IgnoreUnresolvedVariables>true</IgnoreUnresolvedVariables>
   <AssignTo createNew="false" transport="http" type="request"/>
   <DisplayName>AssignMessage.SetHeader.NhsdSupplierAppName</DisplayName>
 </AssignMessage>