made security scheme comparison case insensitive (#16934)

This commit is contained in:
devhl-labs 2023-10-29 22:54:58 -04:00 committed by GitHub
parent 5a5ee163dc
commit c1c6237eec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View File

@ -9,6 +9,7 @@ import org.openapitools.codegen.model.ModelMap;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
public class ProcessUtils {
@ -306,7 +307,7 @@ public class ProcessUtils {
final Map<String, SecurityScheme> securitySchemes = getSecuritySchemes(openAPI);
if (securitySchemes != null) {
for (Map.Entry<String, SecurityScheme> scheme : securitySchemes.entrySet()) {
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "bearer".equals(scheme.getValue().getScheme())) {
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "bearer".equals(scheme.getValue().getScheme().strip().toLowerCase(Locale.ROOT))) {
return true;
}
}
@ -325,7 +326,7 @@ public class ProcessUtils {
final Map<String, SecurityScheme> securitySchemes = getSecuritySchemes(openAPI);
if (securitySchemes != null) {
for (Map.Entry<String, SecurityScheme> scheme : securitySchemes.entrySet()) {
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "basic".equals(scheme.getValue().getScheme())) {
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "basic".equals(scheme.getValue().getScheme().strip().toLowerCase(Locale.ROOT))) {
return true;
}
}
@ -344,7 +345,7 @@ public class ProcessUtils {
final Map<String, SecurityScheme> securitySchemes = getSecuritySchemes(openAPI);
if (securitySchemes != null) {
for (Map.Entry<String, SecurityScheme> scheme : securitySchemes.entrySet()) {
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "signature".equals(scheme.getValue().getScheme())) {
if (SecurityScheme.Type.HTTP.equals(scheme.getValue().getType()) && "signature".equals(scheme.getValue().getScheme().strip().toLowerCase(Locale.ROOT))) {
return true;
}
}

View File

@ -468,9 +468,9 @@ namespace {{packageName}}.{{apiPackage}}
{{#authMethods}}
{{#-first}}
List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
ApiKeyToken apiKeyTokenLocalVar;
{{/-first}}
{{#isApiKey}}
ApiKeyToken apiKeyTokenLocalVar;
apiKeyTokenLocalVar = (ApiKeyToken) await ApiKeyProvider.GetAsync(cancellationToken).ConfigureAwait(false);
tokenBaseLocalVars.Add(apiKeyTokenLocalVar);{{#isKeyInHeader}}
apiKeyTokenLocalVar.UseInHeader(httpRequestMessageLocalVar, "{{keyParamName}}");