Merge pull request #13503 from RusJaI/master

Support separate client side MTLS for production and sandbox endpoints
wso2 · Aug 5, 2024 · be75e47 · be75e47
2 parents c92533f + 4a4af38
commit be75e47
Show file tree

Hide file tree

Showing 13 changed files with 2,453 additions and 90 deletions.
diff --git a/modules/distribution/resources/api_templates/velocity_template.xml b/modules/distribution/resources/api_templates/velocity_template.xml
@@ -292,17 +292,14 @@ $in_sequences.get("$resource.getUriTemplate()").get($uri)
 <loopback />
                 ## AWS Lambda: end
                 #else
-                    #if( $apiIsOauthProtected || $apiIsApiKeyProtected || $apiIsBasicAuthProtected )
 <filter source="$ctx:AM_KEY_TYPE" regex="$filterRegex">
     <then>
-                    #end
                     #if( ($environmentType == 'sandbox') || ($environmentType =='hybrid'
                         && ! $endpoint_config.get("production_endpoints")) )
                         #draw_endpoint( "sandbox" $endpoint_config )
                     #else
                         #draw_endpoint( "production" $endpoint_config )
                     #end
-                    #if( $apiIsOauthProtected || $apiIsApiKeyProtected || $apiIsBasicAuthProtected )
     </then>
     <else>
                         #if( $environmentType !='hybrid' )
@@ -335,7 +332,6 @@ $in_sequences.get("$resource.getUriTemplate()").get($uri)
                         #end
     </else>
 </filter>
-                    #end
                 #end
 </inSequence>
 <outSequence>
@@ -348,7 +344,6 @@ $out_sequences.get("$resource.getUriTemplate()").get($uri)
                 #if( $responseCacheEnabled )
 <cache scope="per-host" collector="true"/>
                 #end
-                #if( $apiIsOauthProtected || $apiIsApiKeyProtected || $apiIsBasicAuthProtected )
 <filter source="$ctx:AM_KEY_TYPE" regex="$filterRegex">
     <then>
                     #if($endpointSecurityProd.clientId && ($endpointSecurityProd.type == "oauth" || $endpointSecurityProd.type == "OAUTH"))
@@ -361,7 +356,7 @@ $out_sequences.get("$resource.getUriTemplate()").get($uri)
                     #end
     </else>
 </filter>
-                #end
+
 <send/>
 </outSequence>
         </resource>

diff --git a/...s/integration/tests-common/clients/publisher/.openapi-generator/publisher-api.yaml.sha256 b/...s/integration/tests-common/clients/publisher/.openapi-generator/publisher-api.yaml.sha256
@@ -1 +1 @@
-51e2f49c8ea45de5a84d917d28a455ab2094d705fe7c9a8f4a6aaa1fdfc80b7f
+f22432a7f6a2e79f6244e9360787b60d17a9169f9e91d69368ce8fd2a139ba5d