Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for ApiKey Endpoint config type #13563

Merged
merged 4 commits into from
Oct 11, 2024
Merged

Add support for ApiKey Endpoint config type #13563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a16d65b
Add ApiKey mediator
PasanT9 Oct 4, 2024
f90498a
Bump carbon apimgt version
PasanT9 Oct 10, 2024
ea68910
Bump UI version
PasanT9 Oct 10, 2024
600f5e3
Add missing apiKeyIdentifierType config to mistral-add-props.json
PasanT9 Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions modules/distribution/resources/api_templates/velocity_template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')"/>
Expand Down Expand Up @@ -100,6 +111,7 @@
#end
#end
#end
#end
<send>

## If endpoint is http
Expand Down
2 changes: 2 additions & 0 deletions ...egration/tests-integration/tests-backend/src/test/resources/ai-api/mistral-add-props.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"type": "apikey",
"apiKeyIdentifier": "Authorization",
"apiKeyValue": "Bearer 123",
"apiKeyIdentifierType": "HEADER",
"username": "",
"password": "",
"grantType": "",
Expand All @@ -25,6 +26,7 @@
"type": "apikey",
"apiKeyIdentifier": "Authorization",
"apiKeyValue": "123",
"apiKeyIdentifierType": "HEADER",
"username": "",
"password": null,
"grantType": "",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1284,11 +1284,11 @@
<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 -->

<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>

Expand Down
Loading