Skip to content

Commit c1c6237

Browse files
authored
made security scheme comparison case insensitive (OpenAPITools#16934)
1 parent 5a5ee16 commit c1c6237

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ProcessUtils.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import java.util.ArrayList;
1111
import java.util.List;
12+
import java.util.Locale;
1213
import java.util.Map;
1314

1415
public class ProcessUtils {
@@ -306,7 +307,7 @@ public static boolean hasHttpBearerMethods(OpenAPI openAPI) {
306307
final Map<String, SecurityScheme> securitySchemes = getSecuritySchemes(openAPI);
307308
if (securitySchemes != null) {
308309
for (Map.Entry<String, SecurityScheme> scheme : securitySchemes.entrySet()) {
309-
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "bearer".equals(scheme.getValue().getScheme())) {
310+
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "bearer".equals(scheme.getValue().getScheme().strip().toLowerCase(Locale.ROOT))) {
310311
return true;
311312
}
312313
}
@@ -325,7 +326,7 @@ public static boolean hasHttpBasicMethods(OpenAPI openAPI) {
325326
final Map<String, SecurityScheme> securitySchemes = getSecuritySchemes(openAPI);
326327
if (securitySchemes != null) {
327328
for (Map.Entry<String, SecurityScheme> scheme : securitySchemes.entrySet()) {
328-
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "basic".equals(scheme.getValue().getScheme())) {
329+
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "basic".equals(scheme.getValue().getScheme().strip().toLowerCase(Locale.ROOT))) {
329330
return true;
330331
}
331332
}
@@ -344,7 +345,7 @@ public static boolean hasHttpSignatureMethods(OpenAPI openAPI) {
344345
final Map<String, SecurityScheme> securitySchemes = getSecuritySchemes(openAPI);
345346
if (securitySchemes != null) {
346347
for (Map.Entry<String, SecurityScheme> scheme : securitySchemes.entrySet()) {
347-
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "signature".equals(scheme.getValue().getScheme())) {
348+
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "signature".equals(scheme.getValue().getScheme().strip().toLowerCase(Locale.ROOT))) {
348349
return true;
349350
}
350351
}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,9 @@ namespace {{packageName}}.{{apiPackage}}
468468
{{#authMethods}}
469469
{{#-first}}
470470
List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
471-
ApiKeyToken apiKeyTokenLocalVar;
472471
{{/-first}}
473472
{{#isApiKey}}
473+
ApiKeyToken apiKeyTokenLocalVar;
474474
apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false);
475475
tokenBaseLocalVars.Add(apiKeyTokenLocalVar);{{#isKeyInHeader}}
476476
apiKeyTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "{{keyParamName}}");

0 commit comments

Comments
 (0)