Merge remote-tracking branch 'origin/master' into 5.1.x

This commit is contained in:
William Cheng
2021-01-08 21:06:47 +08:00
954 changed files with 41988 additions and 4607 deletions

View File

@@ -308,7 +308,7 @@ module Petstore
case auth_setting[:in]
when 'header' then header_params[auth_setting[:key]] = auth_setting[:value]
when 'query' then query_params[auth_setting[:key]] = auth_setting[:value]
else fail ArgumentError, 'Authentication token must be in `query` of `header`'
else fail ArgumentError, 'Authentication token must be in `query` or `header`'
end
end
end

View File

@@ -197,11 +197,13 @@ module Petstore
# Gets API key (with prefix if set).
# @param [String] param_name the parameter name of API key auth
def api_key_with_prefix(param_name)
def api_key_with_prefix(param_name, param_alias = nil)
key = @api_key[param_name]
key = @api_key.fetch(param_alias, key) unless param_alias.nil?
if @api_key_prefix[param_name]
"#{@api_key_prefix[param_name]} #{@api_key[param_name]}"
"#{@api_key_prefix[param_name]} #{key}"
else
@api_key[param_name]
key
end
end