Merge pull request #1159 from O-sura/main

Adding oAuth2 disabled configuration to APK-Conf
wso2 · Apr 26, 2024 · f91e206 · f91e206
2 parents a4b769c + 490c351
commit f91e206
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/apim-apk-agent/pkg/transformer/apk_model.go b/apim-apk-agent/pkg/transformer/apk_model.go
@@ -61,7 +61,7 @@ type AuthConfiguration struct {
 	AuthType          string        `yaml:"authType,omitempty"`
 	HeaderName        string        `yaml:"headerName,omitempty"`
 	SendTokenUpStream bool          `yaml:"sendTokenToUpstream,omitempty"`
-	Enabled           bool          `yaml:"enabled,omitempty"`
+	Enabled           bool          `yaml:"enabled"`
 	QueryParamName    string        `yaml:"queryParamName,omitempty"`
 	HeaderEnabled     bool          `yaml:"headerEnable,omitempty"`
 	queryParamEnable  bool          `yaml:"queryParamEnable,omitempty"`

diff --git a/apim-apk-agent/pkg/transformer/transformer.go b/apim-apk-agent/pkg/transformer/transformer.go
@@ -399,6 +399,13 @@ func mapAuthConfigs(apiUUID string, authHeader string, secSchemes []string, cert
 
 		authConfigs = append(authConfigs, newConfig)
 	}
+	if !StringExists("oauth2", secSchemes) {
+		oAuth2DisabledConfig := AuthConfiguration{
+			AuthType: oAuth2,
+			Enabled:  false,
+		}
+		authConfigs = append(authConfigs, oAuth2DisabledConfig)
+	}
 	if StringExists("mutualssl", secSchemes) && certAvailable {
 		var newConfig AuthConfiguration
 		newConfig.AuthType = mTLS