Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/rack/oauth2/server/abstract/error.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ module OAuth2
module Server
module Abstract
class Error < StandardError
attr_accessor :status, :error, :description, :uri, :realm
attr_accessor :status, :error, :description, :uri, :realm, :resource_metadata

def initialize(status, error, description = nil, options = {})
@status = status
@error = error
@description = description
@uri = options[:uri]
@realm = options[:realm]
@resource_metadata = options[:resource_metadata]
super [error, description].compact.join(' :: ')
end

Expand Down
1 change: 1 addition & 0 deletions lib/rack/oauth2/server/resource/error.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def finish
headers << ", error_description=\"#{description}\"" if description.present?
headers << ", error_uri=\"#{uri}\"" if uri.present?
end
headers << ", resource_metadata=\"#{resource_metadata}\"" if resource_metadata.present?
end
end
end
Expand Down
11 changes: 11 additions & 0 deletions spec/rack/oauth2/server/resource/error_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,17 @@ def scheme
response.first.should include '"error":"something"'
end
end

context 'when resource_metadata is specified' do
let(:resource_metadata) { "https://resource.example.com/.well-known/oauth-protected-resource" }
let(:error) { Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(:something, nil, resource_metadata: resource_metadata) }

it 'should include resource_metadata in WWW-Authenticate header' do
_, headers, response = error_with_scheme.finish
headers['WWW-Authenticate'].should include %(resource_metadata="#{resource_metadata}")
response.first.should include '"error":"something"'
end
end
end
end
end
Expand Down