From 0d9ca8a2d5dd8ac134d0745eb539cdbdd2feea54 Mon Sep 17 00:00:00 2001 From: Tiffany Marrel Date: Mon, 5 Jun 2023 11:13:27 +0200 Subject: [PATCH] [C# csharp] fix security features listed in documentation (#15687) --- docs/generators/csharp-netcore.md | 4 ++-- .../languages/CSharpNetCoreClientCodegen.java | 4 +++- .../languages/CSharpNetCoreReducedClientCodegen.java | 4 +++- .../CsharpNetcoreFunctionsServerCodegen.java | 12 +++--------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/docs/generators/csharp-netcore.md b/docs/generators/csharp-netcore.md index 9f7adf42d6d..32f1448d696 100644 --- a/docs/generators/csharp-netcore.md +++ b/docs/generators/csharp-netcore.md @@ -311,12 +311,12 @@ These options may be applied as additional-properties (cli) or configOptions (pl |BasicAuth|✓|OAS2,OAS3 |ApiKey|✓|OAS2,OAS3 |OpenIDConnect|✗|OAS3 -|BearerToken|✗|OAS3 +|BearerToken|✓|OAS3 |OAuth2_Implicit|✓|OAS2,OAS3 |OAuth2_Password|✗|OAS2,OAS3 |OAuth2_ClientCredentials|✓|OAS2,OAS3 |OAuth2_AuthorizationCode|✗|OAS2,OAS3 -|SignatureAuth|✗|OAS3 +|SignatureAuth|✓|OAS3 ### Wire Format Feature | Name | Supported | Defined By | diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java index 33d8254d40f..78c900a5c35 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java @@ -135,7 +135,9 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { SecurityFeature.OAuth2_Implicit, SecurityFeature.OAuth2_ClientCredentials, SecurityFeature.BasicAuth, - SecurityFeature.ApiKey + SecurityFeature.BearerToken, + SecurityFeature.ApiKey, + SecurityFeature.SignatureAuth )) .excludeGlobalFeatures( GlobalFeature.XMLStructureDefinitions, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java index 5884aa99e48..bff3d3c9008 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreReducedClientCodegen.java @@ -113,7 +113,9 @@ public class CSharpNetCoreReducedClientCodegen extends AbstractCSharpCodegen { .securityFeatures(EnumSet.of( SecurityFeature.OAuth2_Implicit, SecurityFeature.BasicAuth, - SecurityFeature.ApiKey + SecurityFeature.BearerToken, + SecurityFeature.ApiKey, + SecurityFeature.SignatureAuth )) .excludeGlobalFeatures( GlobalFeature.XMLStructureDefinitions, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CsharpNetcoreFunctionsServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CsharpNetcoreFunctionsServerCodegen.java index 60886a15db4..a085bcc5e30 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CsharpNetcoreFunctionsServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CsharpNetcoreFunctionsServerCodegen.java @@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.net.URL; import java.util.Arrays; +import java.util.EnumSet; import java.util.List; import java.util.Locale; import java.util.Map; @@ -86,18 +87,11 @@ public class CsharpNetcoreFunctionsServerCodegen extends AbstractCSharpCodegen { modifyFeatureSet(features -> features .includeDocumentationFeatures(DocumentationFeature.Readme) .excludeWireFormatFeatures(WireFormatFeature.PROTOBUF) - .includeSecurityFeatures( + .securityFeatures(EnumSet.of( SecurityFeature.ApiKey, SecurityFeature.BasicAuth, SecurityFeature.BearerToken - ) - .excludeSecurityFeatures( - SecurityFeature.OpenIDConnect, - SecurityFeature.OAuth2_Password, - SecurityFeature.OAuth2_AuthorizationCode, - SecurityFeature.OAuth2_ClientCredentials, - SecurityFeature.OAuth2_Implicit - ) + )) .excludeGlobalFeatures( GlobalFeature.XMLStructureDefinitions, GlobalFeature.Callbacks,