diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index ea4ffbaac7e..8c818cfc0bb 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -288,9 +288,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl |OpenIDConnect|✗|OAS3 |BearerToken|✗|OAS3 |OAuth2_Implicit|✓|OAS2,OAS3 -|OAuth2_Password|✗|OAS2,OAS3 -|OAuth2_ClientCredentials|✗|OAS2,OAS3 -|OAuth2_AuthorizationCode|✗|OAS2,OAS3 +|OAuth2_Password|✓|OAS2,OAS3 +|OAuth2_ClientCredentials|✓|OAS2,OAS3 +|OAuth2_AuthorizationCode|✓|OAS2,OAS3 |SignatureAuth|✗|OAS3 ### Wire Format Feature diff --git a/docs/generators/kotlin.md b/docs/generators/kotlin.md index cd1e15b96d6..5b01ef11ccb 100644 --- a/docs/generators/kotlin.md +++ b/docs/generators/kotlin.md @@ -276,10 +276,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl |ApiKey|✓|OAS2,OAS3 |OpenIDConnect|✗|OAS3 |BearerToken|✓|OAS3 -|OAuth2_Implicit|✗|OAS2,OAS3 +|OAuth2_Implicit|✓|OAS2,OAS3 |OAuth2_Password|✗|OAS2,OAS3 |OAuth2_ClientCredentials|✗|OAS2,OAS3 -|OAuth2_AuthorizationCode|✗|OAS2,OAS3 +|OAuth2_AuthorizationCode|✓|OAS2,OAS3 |SignatureAuth|✗|OAS3 ### Wire Format Feature diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java index 4ba0d9d066b..fa7580ed314 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java @@ -18,6 +18,7 @@ package org.openapitools.codegen.languages; import java.io.File; +import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -152,13 +153,12 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { modifyFeatureSet(features -> features .includeDocumentationFeatures(DocumentationFeature.Readme) .excludeWireFormatFeatures(WireFormatFeature.XML, WireFormatFeature.PROTOBUF) - .excludeSecurityFeatures( - SecurityFeature.OpenIDConnect, - SecurityFeature.OAuth2_Password, - SecurityFeature.OAuth2_AuthorizationCode, - SecurityFeature.OAuth2_ClientCredentials, - SecurityFeature.OAuth2_Implicit - ) + .securityFeatures(EnumSet.of( + SecurityFeature.BasicAuth, + SecurityFeature.ApiKey, + SecurityFeature.BearerToken, + SecurityFeature.OAuth2_AuthorizationCode,//retrofit only + SecurityFeature.OAuth2_Implicit)) .excludeGlobalFeatures( GlobalFeature.XMLStructureDefinitions, GlobalFeature.Callbacks, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index c0cf3ca16c3..b4f4618e20b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -133,7 +133,10 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen .securityFeatures(EnumSet.of( SecurityFeature.BasicAuth, SecurityFeature.ApiKey, - SecurityFeature.OAuth2_Implicit + SecurityFeature.OAuth2_Implicit, + SecurityFeature.OAuth2_ClientCredentials, + SecurityFeature.OAuth2_Password, + SecurityFeature.OAuth2_AuthorizationCode )) .excludeGlobalFeatures( GlobalFeature.XMLStructureDefinitions,