Skip to content

Commit

Permalink
chore: Allow OmniAuth 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
BobbyMcWho authored Jan 14, 2021
1 parent d978d8e commit f7ec7ee
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion lib/omniauth-saml/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module OmniAuth
module SAML
VERSION = '1.10.3'
VERSION = '2.0.0'
end
end
2 changes: 1 addition & 1 deletion omniauth-saml.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = '>= 2.4'

gem.add_runtime_dependency 'omniauth', '~> 1.3', '>= 1.3.2'
gem.add_runtime_dependency 'omniauth', '~> 2.0'
gem.add_runtime_dependency 'ruby-saml', '~> 1.9'

gem.add_development_dependency 'rake', '>= 12.3.3'
Expand Down
22 changes: 11 additions & 11 deletions spec/omniauth/strategies/saml_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
end
end

def post_xml(xml=:example_response, opts = {})
def post_xml(xml = :example_response, opts = {})
post "/auth/saml/callback", opts.merge({'SAMLResponse' => load_xml(xml)})
end

Expand Down Expand Up @@ -34,10 +34,10 @@ def post_xml(xml=:example_response, opts = {})
end
let(:strategy) { [OmniAuth::Strategies::SAML, saml_options] }

describe 'GET /auth/saml' do
describe 'POST /auth/saml' do
context 'without idp runtime params present' do
before do
get '/auth/saml'
post '/auth/saml'
end

it 'should get authentication page' do
Expand All @@ -51,7 +51,7 @@ def post_xml(xml=:example_response, opts = {})

context 'with idp runtime params' do
before do
get '/auth/saml', 'original_param_key' => 'original_param_value', 'mapped_param_key' => 'mapped_param_value'
post '/auth/saml', 'original_param_key' => 'original_param_value', 'mapped_param_key' => 'mapped_param_value'
end

it 'should get authentication page' do
Expand All @@ -71,7 +71,7 @@ def post_xml(xml=:example_response, opts = {})

it 'should send the current callback_url as the assertion_consumer_service_url' do
%w(foo.example.com bar.example.com).each do |host|
get "https://#{host}/auth/saml"
post "https://#{host}/auth/saml"

expect(last_response).to be_redirect

Expand All @@ -89,7 +89,7 @@ def post_xml(xml=:example_response, opts = {})
end

context 'when authn request signing is requested' do
subject { get '/auth/saml' }
subject { post '/auth/saml' }

let(:private_key) { OpenSSL::PKey::RSA.new 2048 }

Expand Down Expand Up @@ -402,10 +402,10 @@ def test_default_relay_state(static_default_relay_state = nil, &block_default_re
end
end

describe 'GET /auth/saml/metadata' do
describe 'POST /auth/saml/metadata' do
before do
saml_options[:issuer] = 'http://example.com/SAML'
get '/auth/saml/metadata'
post '/auth/saml/metadata'
end

it 'should get SP metadata page' do
Expand All @@ -424,19 +424,19 @@ def test_default_relay_state(static_default_relay_state = nil, &block_default_re
end

context 'when hitting an unknown route in our sub path' do
before { get '/auth/saml/unknown' }
before { post '/auth/saml/unknown' }

specify { expect(last_response.status).to eql 404 }
end

context 'when hitting a completely unknown route' do
before { get '/unknown' }
before { post '/unknown' }

specify { expect(last_response.status).to eql 404 }
end

context 'when hitting a route that contains a substring match for the strategy name' do
before { get '/auth/saml2/metadata' }
before { post '/auth/saml2/metadata' }

it 'should not set the strategy' do
expect(last_request.env['omniauth.strategy']).to be_nil
Expand Down
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
TEST_LOGGER = Logger.new(StringIO.new)
OneLogin::RubySaml::Logging.logger = TEST_LOGGER
OmniAuth.config.logger = TEST_LOGGER
OmniAuth.config.request_validation_phase = proc {}

RSpec.configure do |config|
config.include Rack::Test::Methods
Expand Down

0 comments on commit f7ec7ee

Please sign in to comment.