Merge pull request #3605 from mevan-karu/api_key_impl

Enable Choreo API Key Authenticator for apiKey scheme
wso2 · Oct 21, 2024 · 5b262cc · 5b262cc
2 parents 8504e88 + 25190a9
commit 5b262cc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/...arent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/APIConstants.java b/...arent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/APIConstants.java
@@ -48,7 +48,6 @@ public class APIConstants {
     public static final String API_SECURITY_MUTUAL_SSL = "mutualssl";
     public static final String API_SECURITY_BASIC_AUTH = "basic_auth";
     public static final String SWAGGER_API_KEY_AUTH_TYPE_NAME = "apiKey";
-    public static final String API_SECURITY_CHOREO_API_KEY = "api_key";
     public static final String SWAGGER_API_KEY_IN_HEADER = "header";
     public static final String SWAGGER_API_KEY_IN_QUERY = "query";
     public static final String API_SECURITY_MUTUAL_SSL_MANDATORY = "mutualssl_mandatory";

diff --git a/...r-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java b/...r-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/security/AuthFilter.java
@@ -88,9 +88,8 @@ private void initializeAuthenticators(APIConfig apiConfig) {
                         equalsIgnoreCase(APIConstants.API_SECURITY_OAUTH_BASIC_AUTH_API_KEY_MANDATORY)) {
                     isOAuthBasicAuthMandatory = true;
                 } else if (apiSecurityLevel.trim().equalsIgnoreCase(APIConstants.SWAGGER_API_KEY_AUTH_TYPE_NAME)) {
-                    isApiKeyProtected = true;
-                } else if (apiSecurityLevel.trim().equalsIgnoreCase(APIConstants.API_SECURITY_CHOREO_API_KEY)) {
                     isChoreoApiKeyProtected = true;
+                    isApiKeyProtected = true;
                 }
             }
         }