From a16d65ba5a4d2489cfb047d202ea90e49a42371a Mon Sep 17 00:00:00 2001
From: pasant9 <pasan96tennakoon@gmail.com>
Date: Fri, 4 Oct 2024 16:02:45 +0530
Subject: [PATCH 1/4] Add ApiKey mediator

---
 .../resources/api_templates/velocity_template.xml    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/distribution/resources/api_templates/velocity_template.xml b/modules/distribution/resources/api_templates/velocity_template.xml
index be533fe620..60a7cd4d6f 100644
--- a/modules/distribution/resources/api_templates/velocity_template.xml
+++ b/modules/distribution/resources/api_templates/velocity_template.xml
@@ -36,6 +36,17 @@
         #set( $endpointsecurity = $endpoint_security.get("${type}"))
         ## IF endpoint secured
         #if($endpointsecurity.enabled)
+        #if($endpointsecurity.type == "apikey" || $endpointsecurity.type == "APIKEY")
+<class name="org.wso2.carbon.apimgt.gateway.mediators.ApiKeyMediator">
+<property name="apiKeyIdentifier" value="$util.escapeXml($endpointsecurity.apiKeyIdentifier)" type="STRING"/>
+<property name="apiKeyIdentifierType" value="$util.escapeXml($endpointsecurity.apiKeyIdentifierType)" type="STRING"/>
+#if($isSecureVaultEnabled)
+<property name="apiKeyValue" expression="wso2:vault-lookup('$endpointsecurity.apiKeyValue')" type="STRING"/>
+#else
+<property name="apiKeyValue" value="$util.escapeXml($endpointsecurity.apiKeyValue)" type="STRING"/>
+#end
+</class>
+        #else
         #if($endpointsecurity.type == "basic" || $endpointsecurity.type == "BASIC")
         #if($isSecureVaultEnabled)
 <property xmlns="http://ws.apache.org/ns/synapse" name="password" expression="wso2:vault-lookup('$endpointsecurity.alias')"/>
@@ -100,6 +111,7 @@
         #end
         #end
         #end
+        #end
 <send>
 
 ## If endpoint is http

From f90498acf03e6e1668917a56b1a69e62f7a13d03 Mon Sep 17 00:00:00 2001
From: pasant9 <pasan96tennakoon@gmail.com>
Date: Thu, 10 Oct 2024 15:51:58 +0530
Subject: [PATCH 2/4] Bump carbon apimgt version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b5d1f2b33d..ac524db4e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1288,7 +1288,7 @@
 
         <!-- APIM Component Version -->
 
-        <carbon.apimgt.version>9.30.39</carbon.apimgt.version>
+        <carbon.apimgt.version>9.30.42</carbon.apimgt.version>
 
         <carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>
 

From ea68910aed23447fa9afb50b044379b3fbec7077 Mon Sep 17 00:00:00 2001
From: pasant9 <pasan96tennakoon@gmail.com>
Date: Thu, 10 Oct 2024 15:52:23 +0530
Subject: [PATCH 3/4] Bump UI version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ac524db4e6..2934a3247a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1284,7 +1284,7 @@
         <carbon.analytics.common.version>5.3.13</carbon.analytics.common.version>
 
         <!-- APIM Portals Component Version -->
-        <carbon.apimgt.ui.version>9.1.130</carbon.apimgt.ui.version>
+        <carbon.apimgt.ui.version>9.1.133</carbon.apimgt.ui.version>
 
         <!-- APIM Component Version -->
 

From 600f5e37818a2477eca117bbff176c6e62e39698 Mon Sep 17 00:00:00 2001
From: pasant9 <pasan96tennakoon@gmail.com>
Date: Fri, 11 Oct 2024 06:25:30 +0530
Subject: [PATCH 4/4] Add missing apiKeyIdentifierType config to
 mistral-add-props.json

---
 .../src/test/resources/ai-api/mistral-add-props.json            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/ai-api/mistral-add-props.json b/modules/integration/tests-integration/tests-backend/src/test/resources/ai-api/mistral-add-props.json
index 3059d64246..1e3e5c4c6d 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/ai-api/mistral-add-props.json
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/ai-api/mistral-add-props.json
@@ -12,6 +12,7 @@
         "type": "apikey",
         "apiKeyIdentifier": "Authorization",
         "apiKeyValue": "Bearer 123",
+        "apiKeyIdentifierType": "HEADER",
         "username": "",
         "password": "",
         "grantType": "",
@@ -25,6 +26,7 @@
         "type": "apikey",
         "apiKeyIdentifier": "Authorization",
         "apiKeyValue": "123",
+        "apiKeyIdentifierType": "HEADER",
         "username": "",
         "password": null,
         "grantType": "",