[csharp][generichost] Fix invalid key name (#19633)

* fix invalid key name * fix comment
OpenAPITools · Sep 29, 2024 · fb5e69f · fb5e69f
1 parent 0b32c50
commit fb5e69f
Show file tree

Hide file tree

Showing 93 changed files with 209 additions and 156 deletions.
diff --git a/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -450,7 +450,8 @@ protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
                 .put("uniqueLines", new UniqueLambda("\n", false))
                 .put("unique", new UniqueLambda("\n", true))
                 .put("camel_case", new CamelCaseLambda())
-                .put("escape_reserved_word", new EscapeKeywordLambda(this::escapeKeyword));
+                .put("escape_reserved_word", new EscapeKeywordLambda(this::escapeKeyword))
+                .put("alphabet_or_underscore", new ReplaceAllLambda("[^A-Za-z]", "_"));
     }
 
     @Override

diff --git a/...enerator/src/main/java/org/openapitools/codegen/templating/mustache/ReplaceAllLambda.java b/...enerator/src/main/java/org/openapitools/codegen/templating/mustache/ReplaceAllLambda.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openapitools.codegen.templating.mustache;
+
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * Replaces all regex captures with the provided string.
+ *
+ * Register:
+ * <pre>
+ * additionalProperties.put("regex", new ReplaceAllLambda());
+ * </pre>
+ *
+ * Use:
+ * <pre>
+ * {{#regex}}{{summary}}{{/regex}}
+ * </pre>
+ */
+public class ReplaceAllLambda implements Mustache.Lambda {
+    private String regex;
+    private String replacement;
+
+    public ReplaceAllLambda(String regex, String replacement) {
+        this.regex = regex;
+        this.replacement = replacement;
+    }
+
+    @Override
+    public void execute(Template.Fragment fragment, Writer writer) throws IOException {
+        writer.write(fragment.execute()
+                .replaceAll(regex, replacement));
+    }
+}
diff --git a/...s/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiTestsBase.mustache b/...s/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiTestsBase.mustache
@@ -31,7 +31,7 @@ namespace {{packageName}}.Test.{{apiPackage}}
                 {{#lambda.trimTrailingWithNewLine}}
                 {{#apiKeyMethods}}
                 string apiKeyTokenValue{{-index}} = context.Configuration["<token>"] ?? throw new Exception("Token not found.");
-                ApiKeyToken apiKeyToken{{-index}} = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}(apiKeyTokenValue{{-index}}, ClientUtils.ApiKeyHeader.{{#lambda.titlecase}}{{keyParamName}}{{/lambda.titlecase}}, timeout: TimeSpan.FromSeconds(1));
+                ApiKeyToken apiKeyToken{{-index}} = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}(apiKeyTokenValue{{-index}}, ClientUtils.ApiKeyHeader.{{#lambda.titlecase}}{{#lambda.alphabet_or_underscore}}{{keyParamName}}{{/lambda.alphabet_or_underscore}}{{/lambda.titlecase}}, timeout: TimeSpan.FromSeconds(1));
                 options.AddTokens(apiKeyToken{{-index}});
 
                 {{/apiKeyMethods}}

diff --git a/...es/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache b/...es/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache
@@ -60,7 +60,7 @@ using System.Runtime.CompilerServices;
             /// <summary>
             /// The {{keyParamName}} header
             /// </summary>
-            {{#lambda.titlecase}}{{keyParamName}}{{/lambda.titlecase}}{{^-last}},{{/-last}}
+            {{#lambda.titlecase}}{{#lambda.alphabet_or_underscore}}{{keyParamName}}{{/lambda.alphabet_or_underscore}}{{/lambda.titlecase}}{{^-last}},{{/-last}}
             {{/apiKeyMethods}}
         }
 
@@ -76,7 +76,7 @@ using System.Runtime.CompilerServices;
             return value switch
             {
                 {{#apiKeyMethods}}
-                ApiKeyHeader.{{#lambda.titlecase}}{{keyParamName}}{{/lambda.titlecase}} => "{{keyParamName}}",
+                ApiKeyHeader.{{#lambda.titlecase}}{{#lambda.alphabet_or_underscore}}{{keyParamName}}{{/lambda.alphabet_or_underscore}}{{/lambda.titlecase}} => "{{keyParamName}}",
                 {{/apiKeyMethods}}
                 _ => throw new System.ComponentModel.InvalidEnumArgumentException(nameof(value), (int)value, typeof(ApiKeyHeader)),
             };
@@ -85,7 +85,7 @@ using System.Runtime.CompilerServices;
             switch(value)
             {
                 {{#apiKeyMethods}}
-                case ApiKeyHeader.{{#lambda.titlecase}}{{keyParamName}}{{/lambda.titlecase}}:
+                case ApiKeyHeader.{{#lambda.titlecase}}{{#lambda.alphabet_or_underscore}}{{keyParamName}}{{/lambda.alphabet_or_underscore}}{{/lambda.titlecase}}:
                     return "{{keyParamName}}";
                 {{/apiKeyMethods}}
                 default:

diff --git a/...nerator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache b/...nerator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache
@@ -21,7 +21,7 @@ namespace {{packageName}}.Test.{{apiPackage}}
             {
                 {{#lambda.trimTrailingWithNewLine}}
                 {{#apiKeyMethods}}
-                ApiKeyToken apiKeyToken{{-index}} = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}("<token>", ClientUtils.ApiKeyHeader.{{#lambda.titlecase}}{{keyParamName}}{{/lambda.titlecase}}, timeout: TimeSpan.FromSeconds(1));
+                ApiKeyToken apiKeyToken{{-index}} = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}("<token>", ClientUtils.ApiKeyHeader.{{#lambda.titlecase}}{{#lambda.alphabet_or_underscore}}{{keyParamName}}{{/lambda.alphabet_or_underscore}}{{/lambda.titlecase}}, timeout: TimeSpan.FromSeconds(1));
                 options.AddTokens(apiKeyToken{{-index}});
 
                 {{/apiKeyMethods}}
@@ -55,7 +55,7 @@ namespace {{packageName}}.Test.{{apiPackage}}
             {
                 {{#lambda.trimTrailingWithNewLine}}
                 {{#apiKeyMethods}}
-                ApiKeyToken apiKeyToken{{-index}} = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}("<token>", ClientUtils.ApiKeyHeader.{{#lambda.titlecase}}{{keyParamName}}{{/lambda.titlecase}}, timeout: TimeSpan.FromSeconds(1));
+                ApiKeyToken apiKeyToken{{-index}} = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}("<token>", ClientUtils.ApiKeyHeader.{{#lambda.titlecase}}{{#lambda.alphabet_or_underscore}}{{keyParamName}}{{/lambda.alphabet_or_underscore}}{{/lambda.titlecase}}, timeout: TimeSpan.FromSeconds(1));
                 options.AddTokens(apiKeyToken{{-index}});
 
                 {{/apiKeyMethods}}
@@ -92,7 +92,7 @@ namespace {{packageName}}.Test.{{apiPackage}}
                 {
                     {{#lambda.trimTrailingWithNewLine}}
                     {{#apiKeyMethods}}
-                    ApiKeyToken apiKeyToken{{-index}} = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}("<token>", ClientUtils.ApiKeyHeader.{{#lambda.titlecase}}{{keyParamName}}{{/lambda.titlecase}}, timeout: TimeSpan.FromSeconds(1));
+                    ApiKeyToken apiKeyToken{{-index}} = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}("<token>", ClientUtils.ApiKeyHeader.{{#lambda.titlecase}}{{#lambda.alphabet_or_underscore}}{{keyParamName}}{{/lambda.alphabet_or_underscore}}{{/lambda.titlecase}}, timeout: TimeSpan.FromSeconds(1));
                     options.AddTokens(apiKeyToken{{-index}});
 
                     {{/apiKeyMethods}}
@@ -129,7 +129,7 @@ namespace {{packageName}}.Test.{{apiPackage}}
                 {
                     {{#lambda.trimTrailingWithNewLine}}
                     {{#apiKeyMethods}}
-                    ApiKeyToken apiKeyToken{{-index}} = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}("<token>", ClientUtils.ApiKeyHeader.{{#lambda.titlecase}}{{keyParamName}}{{/lambda.titlecase}}, timeout: TimeSpan.FromSeconds(1));
+                    ApiKeyToken apiKeyToken{{-index}} = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}("<token>", ClientUtils.ApiKeyHeader.{{#lambda.titlecase}}{{#lambda.alphabet_or_underscore}}{{keyParamName}}{{/lambda.alphabet_or_underscore}}{{/lambda.titlecase}}, timeout: TimeSpan.FromSeconds(1));
                     options.AddTokens(apiKeyToken{{-index}});
 
                     {{/apiKeyMethods}}

diff --git a/...urces/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/...urces/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -1379,7 +1379,7 @@ components:
             'read:pets': read your pets
     api_key:
       type: apiKey
-      name: api_key
+      name: api-key
       in: header
     api_key_query:
       type: apiKey

diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml
@@ -3045,7 +3045,7 @@ components:
       type: oauth2
     api_key:
       in: header
-      name: api_key
+      name: api-key
       type: apiKey
     api_key_query:
       in: query

diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/PetApi.md
@@ -409,9 +409,9 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             // Configure API key authorization: api_key
-            config.AddApiKey("api_key", "YOUR_API_KEY");
+            config.AddApiKey("api-key", "YOUR_API_KEY");
             // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-            // config.AddApiKeyPrefix("api_key", "Bearer");
+            // config.AddApiKeyPrefix("api-key", "Bearer");
             // Configure API key authorization: api_key_query
             config.AddApiKey("api_key_query", "YOUR_API_KEY");
             // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed

diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/StoreApi.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/StoreApi.md
@@ -122,9 +122,9 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             // Configure API key authorization: api_key
-            config.AddApiKey("api_key", "YOUR_API_KEY");
+            config.AddApiKey("api-key", "YOUR_API_KEY");
             // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-            // config.AddApiKeyPrefix("api_key", "Bearer");
+            // config.AddApiKeyPrefix("api-key", "Bearer");
 
             var apiInstance = new StoreApi(config);
 

diff --git a/...s/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/...s/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
@@ -1699,7 +1699,7 @@ public async Task<IGetPetByIdApiResponse> GetPetByIdAsync(long petId, System.Thr
                     System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);
 
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
-                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api_key", cancellationToken).ConfigureAwait(false);
+                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false);
                     tokenBaseLocalVars.Add(apiKeyTokenLocalVar1);
                     apiKeyTokenLocalVar1.UseInHeader(httpRequestMessageLocalVar);
 

diff --git a/...client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs b/...client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -618,7 +618,7 @@ public async Task<IGetInventoryApiResponse> GetInventoryAsync(System.Threading.C
                     uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/inventory";
 
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
-                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api_key", cancellationToken).ConfigureAwait(false);
+                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false);
                     tokenBaseLocalVars.Add(apiKeyTokenLocalVar1);
                     apiKeyTokenLocalVar1.UseInHeader(httpRequestMessageLocalVar);
 

diff --git a/.../petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/.../petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -58,7 +58,7 @@ static ClientUtils()
         public enum ApiKeyHeader
         {
             /// <summary>
-            /// The api_key header
+            /// The api-key header
             /// </summary>
             Api_key,
             /// <summary>
@@ -78,7 +78,7 @@ public static string ApiKeyHeaderToString(ApiKeyHeader value)
             switch(value)
             {
                 case ApiKeyHeader.Api_key:
-                    return "api_key";
+                    return "api-key";
                 case ApiKeyHeader.Api_key_query:
                     return "api_key_query";
                 default:

diff --git a/...nt/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/README.md b/...nt/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/README.md
@@ -134,7 +134,7 @@ Authentication schemes defined for the API:
 ### api_key
 
 - **Type**: API key
-- **API key parameter name**: api_key
+- **API key parameter name**: api-key
 - **Location**: HTTP header
 
 <a id="api_key_query"></a>

diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml
@@ -3069,7 +3069,7 @@ components:
       type: oauth2
     api_key:
       in: header
-      name: api_key
+      name: api-key
       type: apiKey
     api_key_query:
       in: query

diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/PetApi.md
@@ -409,9 +409,9 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             // Configure API key authorization: api_key
-            config.AddApiKey("api_key", "YOUR_API_KEY");
+            config.AddApiKey("api-key", "YOUR_API_KEY");
             // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-            // config.AddApiKeyPrefix("api_key", "Bearer");
+            // config.AddApiKeyPrefix("api-key", "Bearer");
             // Configure API key authorization: api_key_query
             config.AddApiKey("api_key_query", "YOUR_API_KEY");
             // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed

diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/StoreApi.md b/samples/client/petstore/csharp/generichost/net4.7/Petstore/docs/apis/StoreApi.md
@@ -122,9 +122,9 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             // Configure API key authorization: api_key
-            config.AddApiKey("api_key", "YOUR_API_KEY");
+            config.AddApiKey("api-key", "YOUR_API_KEY");
             // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-            // config.AddApiKeyPrefix("api_key", "Bearer");
+            // config.AddApiKeyPrefix("api-key", "Bearer");
 
             var apiInstance = new StoreApi(config);
 

diff --git a/...les/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/...les/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
@@ -1699,7 +1699,7 @@ public async Task<IGetPetByIdApiResponse> GetPetByIdAsync(long petId, System.Thr
                     System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);
 
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
-                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api_key", cancellationToken).ConfigureAwait(false);
+                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false);
                     tokenBaseLocalVars.Add(apiKeyTokenLocalVar1);
                     apiKeyTokenLocalVar1.UseInHeader(httpRequestMessageLocalVar);
 

diff --git a/...s/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs b/...s/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -618,7 +618,7 @@ public async Task<IGetInventoryApiResponse> GetInventoryAsync(System.Threading.C
                     uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/inventory";
 
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
-                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api_key", cancellationToken).ConfigureAwait(false);
+                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false);
                     tokenBaseLocalVars.Add(apiKeyTokenLocalVar1);
                     apiKeyTokenLocalVar1.UseInHeader(httpRequestMessageLocalVar);
 

diff --git a/...nt/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs b/...nt/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -58,7 +58,7 @@ static ClientUtils()
         public enum ApiKeyHeader
         {
             /// <summary>
-            /// The api_key header
+            /// The api-key header
             /// </summary>
             Api_key,
             /// <summary>
@@ -78,7 +78,7 @@ public static string ApiKeyHeaderToString(ApiKeyHeader value)
             switch(value)
             {
                 case ApiKeyHeader.Api_key:
-                    return "api_key";
+                    return "api-key";
                 case ApiKeyHeader.Api_key_query:
                     return "api_key_query";
                 default:

diff --git a/...ient/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/README.md b/...ient/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/README.md
@@ -134,7 +134,7 @@ Authentication schemes defined for the API:
 ### api_key
 
 - **Type**: API key
-- **API key parameter name**: api_key
+- **API key parameter name**: api-key
 - **Location**: HTTP header
 
 <a id="api_key_query"></a>

diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml
@@ -3045,7 +3045,7 @@ components:
       type: oauth2
     api_key:
       in: header
-      name: api_key
+      name: api-key
       type: apiKey
     api_key_query:
       in: query

diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/PetApi.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/PetApi.md
@@ -409,9 +409,9 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             // Configure API key authorization: api_key
-            config.AddApiKey("api_key", "YOUR_API_KEY");
+            config.AddApiKey("api-key", "YOUR_API_KEY");
             // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-            // config.AddApiKeyPrefix("api_key", "Bearer");
+            // config.AddApiKeyPrefix("api-key", "Bearer");
             // Configure API key authorization: api_key_query
             config.AddApiKey("api_key_query", "YOUR_API_KEY");
             // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed

diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/StoreApi.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/StoreApi.md
@@ -122,9 +122,9 @@ namespace Example
             Configuration config = new Configuration();
             config.BasePath = "http://petstore.swagger.io:80/v2";
             // Configure API key authorization: api_key
-            config.AddApiKey("api_key", "YOUR_API_KEY");
+            config.AddApiKey("api-key", "YOUR_API_KEY");
             // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-            // config.AddApiKeyPrefix("api_key", "Bearer");
+            // config.AddApiKeyPrefix("api-key", "Bearer");
 
             var apiInstance = new StoreApi(config);
 

diff --git a/...s/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/...s/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
@@ -1699,7 +1699,7 @@ public async Task<IGetPetByIdApiResponse> GetPetByIdAsync(long petId, System.Thr
                     System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);
 
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
-                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api_key", cancellationToken).ConfigureAwait(false);
+                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false);
                     tokenBaseLocalVars.Add(apiKeyTokenLocalVar1);
                     apiKeyTokenLocalVar1.UseInHeader(httpRequestMessageLocalVar);
 

diff --git a/...client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs b/...client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs
@@ -618,7 +618,7 @@ public async Task<IGetInventoryApiResponse> GetInventoryAsync(System.Threading.C
                     uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/store/inventory";
 
                     List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
-                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api_key", cancellationToken).ConfigureAwait(false);
+                    ApiKeyToken apiKeyTokenLocalVar1 = (ApiKeyToken) await ApiKeyProvider.GetAsync("api-key", cancellationToken).ConfigureAwait(false);
                     tokenBaseLocalVars.Add(apiKeyTokenLocalVar1);
                     apiKeyTokenLocalVar1.UseInHeader(httpRequestMessageLocalVar);
 

diff --git a/.../petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/.../petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -58,7 +58,7 @@ static ClientUtils()
         public enum ApiKeyHeader
         {
             /// <summary>
-            /// The api_key header
+            /// The api-key header
             /// </summary>
             Api_key,
             /// <summary>
@@ -78,7 +78,7 @@ public static string ApiKeyHeaderToString(ApiKeyHeader value)
             switch(value)
             {
                 case ApiKeyHeader.Api_key:
-                    return "api_key";
+                    return "api-key";
                 case ApiKeyHeader.Api_key_query:
                     return "api_key_query";
                 default:

diff --git a/...nt/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/README.md b/...nt/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/README.md
@@ -134,7 +134,7 @@ Authentication schemes defined for the API:
 ### api_key
 
 - **Type**: API key
-- **API key parameter name**: api_key
+- **API key parameter name**: api-key
 - **Location**: HTTP header
 
 <a id="api_key_query"></a>

diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml
@@ -3069,7 +3069,7 @@ components:
       type: oauth2
     api_key:
       in: header
-      name: api_key
+      name: api-key
       type: apiKey
     api_key_query:
       in: query