loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Kotlin] fix security features listed in documentation (#15758)

Browse Source
This commit is contained in:
Tiffany Marrel 2023-06-06 04:45:44 +02:00 committed by GitHub
parent e439476e16
commit d3a2e0e43e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/generators/kotlin-spring.md
View File

@ -288,9 +288,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|OpenIDConnect|✗|OAS3 |OpenIDConnect|✗|OAS3
|BearerToken|✗|OAS3 |BearerToken|✗|OAS3
|OAuth2_Implicit|✓|OAS2,OAS3 |OAuth2_Implicit|✓|OAS2,OAS3
|OAuth2_Password|✗|OAS2,OAS3 |OAuth2_Password|✓|OAS2,OAS3
|OAuth2_ClientCredentials|✗|OAS2,OAS3 |OAuth2_ClientCredentials|✓|OAS2,OAS3
|OAuth2_AuthorizationCode|✗|OAS2,OAS3 |OAuth2_AuthorizationCode|✓|OAS2,OAS3
|SignatureAuth|✗|OAS3 |SignatureAuth|✗|OAS3
### Wire Format Feature ### Wire Format Feature

4
docs/generators/kotlin.md
View File

@ -276,10 +276,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|ApiKey|✓|OAS2,OAS3 |ApiKey|✓|OAS2,OAS3
|OpenIDConnect|✗|OAS3 |OpenIDConnect|✗|OAS3
|BearerToken|✓|OAS3 |BearerToken|✓|OAS3
|OAuth2_Implicit|✗|OAS2,OAS3 |OAuth2_Implicit|✓|OAS2,OAS3
|OAuth2_Password|✗|OAS2,OAS3 |OAuth2_Password|✗|OAS2,OAS3
|OAuth2_ClientCredentials|✗|OAS2,OAS3 |OAuth2_ClientCredentials|✗|OAS2,OAS3
|OAuth2_AuthorizationCode|✗|OAS2,OAS3 |OAuth2_AuthorizationCode|✓|OAS2,OAS3
|SignatureAuth|✗|OAS3 |SignatureAuth|✗|OAS3
### Wire Format Feature ### Wire Format Feature

14
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java
View File

@ -18,6 +18,7 @@
package org.openapitools.codegen.languages; package org.openapitools.codegen.languages;
import java.io.File; import java.io.File;
import java.util.EnumSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -152,13 +153,12 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
modifyFeatureSet(features -> features modifyFeatureSet(features -> features
.includeDocumentationFeatures(DocumentationFeature.Readme) .includeDocumentationFeatures(DocumentationFeature.Readme)
.excludeWireFormatFeatures(WireFormatFeature.XML, WireFormatFeature.PROTOBUF) .excludeWireFormatFeatures(WireFormatFeature.XML, WireFormatFeature.PROTOBUF)
.excludeSecurityFeatures( .securityFeatures(EnumSet.of(
SecurityFeature.OpenIDConnect, SecurityFeature.BasicAuth,
SecurityFeature.OAuth2_Password, SecurityFeature.ApiKey,
SecurityFeature.OAuth2_AuthorizationCode, SecurityFeature.BearerToken,
SecurityFeature.OAuth2_ClientCredentials, SecurityFeature.OAuth2_AuthorizationCode,//retrofit only
SecurityFeature.OAuth2_Implicit SecurityFeature.OAuth2_Implicit))
)
.excludeGlobalFeatures( .excludeGlobalFeatures(
GlobalFeature.XMLStructureDefinitions, GlobalFeature.XMLStructureDefinitions,
GlobalFeature.Callbacks, GlobalFeature.Callbacks,

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
View File

@ -133,7 +133,10 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
.securityFeatures(EnumSet.of( .securityFeatures(EnumSet.of(
SecurityFeature.BasicAuth, SecurityFeature.BasicAuth,
SecurityFeature.ApiKey, SecurityFeature.ApiKey,
SecurityFeature.OAuth2_Implicit SecurityFeature.OAuth2_Implicit,
SecurityFeature.OAuth2_ClientCredentials,
SecurityFeature.OAuth2_Password,
SecurityFeature.OAuth2_AuthorizationCode
)) ))
.excludeGlobalFeatures( .excludeGlobalFeatures(
GlobalFeature.XMLStructureDefinitions, GlobalFeature.XMLStructureDefinitions,