mirror of
https://github.com/ditkrg/rswag.git
synced 2026-01-23 06:16:42 +00:00
Fix Authorization header missing and duplicating
This commit is contained in:
parent
07ae261e54
commit
05e1e2271f
@ -29,12 +29,15 @@ module Rswag
|
||||
path_item_params = metadata[:path_item][:parameters] || []
|
||||
security_params = derive_security_params(metadata, swagger_doc)
|
||||
|
||||
operation_params
|
||||
operation_params = operation_params
|
||||
.concat(path_item_params)
|
||||
.concat(security_params)
|
||||
.map { |p| p['$ref'] ? resolve_parameter(p['$ref'], swagger_doc) : p }
|
||||
.uniq { |p| p[:name] }
|
||||
.reject { |p| p[:required] == false && !example.respond_to?(p[:name]) }
|
||||
|
||||
metadata[:operation][:parameters] = operation_params unless operation_params.empty?
|
||||
operation_params
|
||||
end
|
||||
|
||||
def derive_security_params(metadata, swagger_doc)
|
||||
|
||||
@ -235,6 +235,34 @@ module Rswag
|
||||
expect(request[:headers]).to eq('api_key' => 'foobar')
|
||||
end
|
||||
end
|
||||
|
||||
context 'in header with no other params' do
|
||||
let(:key_location) { :header }
|
||||
|
||||
it 'adds name and example value to the headers' do
|
||||
expect(request[:headers]).to eq('api_key' => 'foobar')
|
||||
expect(metadata[:operation][:parameters]).to(
|
||||
include(name: 'api_key', in: :header, type: :string, required: true)
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
context 'in header with auth param already added' do
|
||||
let(:key_location) { :header }
|
||||
before do
|
||||
metadata[:operation][:parameters] = [
|
||||
{ name: 'q1', in: :query, type: :string },
|
||||
{ name: 'api_key', in: :header, type: :string }
|
||||
]
|
||||
allow(example).to receive(:q1).and_return('foo')
|
||||
allow(example).to receive(:api_key).and_return('foobar')
|
||||
end
|
||||
|
||||
it 'adds authorization parameter only once' do
|
||||
expect(request[:headers]).to eq('api_key' => 'foobar')
|
||||
expect(metadata[:operation][:parameters].size).to eq 2
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'oauth2' do
|
||||
|
||||
Loading…
Reference in New Issue
Block a user