From cc2733d40a0e9e6edefe544881d0182b814b8b28 Mon Sep 17 00:00:00 2001
From: Adrian Parr <adrianparr@gmail.com>
Date: Thu, 21 Mar 2024 11:03:45 +0000
Subject: [PATCH 1/4] =?UTF-8?q?WIP:=20Added=20=E2=80=98subscription-key?=
 =?UTF-8?q?=E2=80=99=20header=20to=20Apigee=20requests=20to=20Azure=20APIM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssignMessage.AddAzureApimSubscriptionKey.xml         | 7 +++++++
 proxies/live/apiproxy/targets/target.xml                  | 8 ++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml

diff --git a/proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml b/proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml
new file mode 100644
index 0000000..7ca0d8d
--- /dev/null
+++ b/proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml
@@ -0,0 +1,7 @@
+<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.AddAzureApimSubscriptionKey">
+  <Set>
+    <Headers>
+      <Header name='subscription-key'>7c13a1ea36fb45b397e9cdce27f6c79d</Header>
+    </Headers>
+  </Set>
+</AssignMessage>
diff --git a/proxies/live/apiproxy/targets/target.xml b/proxies/live/apiproxy/targets/target.xml
index 50deaf4..db2720f 100644
--- a/proxies/live/apiproxy/targets/target.xml
+++ b/proxies/live/apiproxy/targets/target.xml
@@ -26,6 +26,14 @@
       <Condition/>
     </Flow>
   </Flows>
+  <PostFlow>
+    <Request>
+      <Step>
+        <Name>AssignMessage.AddAzureApimSubscriptionKey</Name>
+      </Step>
+    </Request>
+    <Response/>
+  </PostFlow>
   <FaultRules>
     <FaultRule name="api_key_invalid">
       <Condition>verifyapikey.VerifyAPIKey.FromHeader.failed</Condition>

From f6120954c4a53e4313a04bced62bc3a3d71d9d29 Mon Sep 17 00:00:00 2001
From: Adrian Parr <adrianparr@gmail.com>
Date: Thu, 21 Mar 2024 13:05:04 +0000
Subject: [PATCH 2/4] Trying incorrect subscription-key

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

diff --git a/proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml b/proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml
index 7ca0d8d..9886f25 100644
--- a/proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml
+++ b/proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml
@@ -1,7 +1,7 @@
 <AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.AddAzureApimSubscriptionKey">
   <Set>
     <Headers>
-      <Header name='subscription-key'>7c13a1ea36fb45b397e9cdce27f6c79d</Header>
+      <Header name='subscription-key'>7c13a1ea36fb45b397e9cdce27f6c79dX</Header>
     </Headers>
   </Set>
 </AssignMessage>

From ae941b22d1cb68f2f96cb27b62617b8de14ff759 Mon Sep 17 00:00:00 2001
From: Adrian Parr <adrianparr@gmail.com>
Date: Thu, 21 Mar 2024 13:23:46 +0000
Subject: [PATCH 3/4] =?UTF-8?q?Following=20the=20=E2=80=98subscription-key?=
 =?UTF-8?q?=E2=80=99=20pattern=20done=20by=20the=20=E2=80=98service-search?=
 =?UTF-8?q?=E2=80=99=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssignMessage.AddAzureApimSubscriptionKey.xml  |  7 -------
 proxies/live/apiproxy/targets/target.xml           | 14 ++++++--------
 2 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml

diff --git a/proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml b/proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml
deleted file mode 100644
index 9886f25..0000000
--- a/proxies/live/apiproxy/policies/AssignMessage.AddAzureApimSubscriptionKey.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.AddAzureApimSubscriptionKey">
-  <Set>
-    <Headers>
-      <Header name='subscription-key'>7c13a1ea36fb45b397e9cdce27f6c79dX</Header>
-    </Headers>
-  </Set>
-</AssignMessage>
diff --git a/proxies/live/apiproxy/targets/target.xml b/proxies/live/apiproxy/targets/target.xml
index db2720f..08ef4a8 100644
--- a/proxies/live/apiproxy/targets/target.xml
+++ b/proxies/live/apiproxy/targets/target.xml
@@ -7,6 +7,12 @@
       <Step>
         <Name>FlowCallout.ApplyRateLimiting</Name>
       </Step>
+      <Step>
+        <Name>KeyValueMapOperations.GetSubscriptionKey</Name>
+      </Step>
+      <Step>
+        <Name>AssignMessage.AddSubscriptionKey</Name>
+      </Step>
     </Request>
     <Response>
       <Step>
@@ -26,14 +32,6 @@
       <Condition/>
     </Flow>
   </Flows>
-  <PostFlow>
-    <Request>
-      <Step>
-        <Name>AssignMessage.AddAzureApimSubscriptionKey</Name>
-      </Step>
-    </Request>
-    <Response/>
-  </PostFlow>
   <FaultRules>
     <FaultRule name="api_key_invalid">
       <Condition>verifyapikey.VerifyAPIKey.FromHeader.failed</Condition>

From e9b59a4cdeae8894c0a99fe54eeb13563c67b4ab Mon Sep 17 00:00:00 2001
From: Adrian Parr <adrianparr@gmail.com>
Date: Thu, 21 Mar 2024 13:43:23 +0000
Subject: [PATCH 4/4] Updated the mapIdentifier

---
 .../policies/KeyValueMapOperations.GetSubscriptionKey.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxies/live/apiproxy/policies/KeyValueMapOperations.GetSubscriptionKey.xml b/proxies/live/apiproxy/policies/KeyValueMapOperations.GetSubscriptionKey.xml
index 35b9ec2..06ccdb7 100644
--- a/proxies/live/apiproxy/policies/KeyValueMapOperations.GetSubscriptionKey.xml
+++ b/proxies/live/apiproxy/policies/KeyValueMapOperations.GetSubscriptionKey.xml
@@ -1,4 +1,4 @@
-<KeyValueMapOperations name="KeyValueMapOperations.GetSubscriptionKey" mapIdentifier="service-search">
+<KeyValueMapOperations name="KeyValueMapOperations.GetSubscriptionKey" mapIdentifier="nhs-website-content-api">
    <Get assignTo="private.subscriptionKey" index='1'>
       <Key>
          <Parameter>subscription-key</Parameter>