Bump omniauth to 2.x

Author: oliverguenther

omniauth-openid-connect.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'omniauth', '~> 1.6'
+  spec.add_dependency 'omniauth', '~> 2.1.4'
   spec.add_dependency 'openid_connect', '~> 2.2.0'
   spec.add_dependency 'addressable', '~> 2.5'
   spec.add_development_dependency 'bundler', '>= 1.5'

test/lib/omniauth/strategies/logout_token_test.rb

@@ -54,7 +54,7 @@ def test_backchannel_logout_phase
         callback.expects(:call)
         strategy.options.backchannel_logout_callback = callback
 
-        request.stubs(:path_info).returns('/auth/openidconnect/backchannel-logout')
+        request.stubs(:path).returns('/auth/openidconnect/backchannel-logout')
         strategy.other_phase
       end
 
@@ -66,7 +66,7 @@ def test_backchannel_logout_phase_invalid_issuer
         callback.expects(:call).never
         strategy.options.backchannel_logout_callback = callback
 
-        request.stubs(:path_info).returns('/auth/openidconnect/backchannel-logout')
+        request.stubs(:path).returns('/auth/openidconnect/backchannel-logout')
         assert_raises(OmniAuth::OpenIDConnect::LogoutToken::InvalidIssuer) do
           strategy.perform_backchannel_logout!(encoded_logout_token)
         end
@@ -79,7 +79,7 @@ def test_backchannel_error_response
 
         strategy.options.backchannel_logout_callback = -> {}
 
-        request.stubs(:path_info).returns('/auth/openidconnect/backchannel-logout')
+        request.stubs(:path).returns('/auth/openidconnect/backchannel-logout')
         code, _headers, message = strategy.other_phase
         assert 400, code
         assert "foo", message.first
@@ -93,7 +93,7 @@ def test_backchannel_without_callback
 
         strategy.options.backchannel_logout_callback = nil
 
-        request.stubs(:path_info).returns('/auth/openidconnect/backchannel-logout')
+        request.stubs(:path).returns('/auth/openidconnect/backchannel-logout')
         strategy.other_phase
       end
     end

test/lib/omniauth/strategies/openid_connect_test.rb

@@ -67,7 +67,7 @@ def test_logout_phase_with_discovery
         config.stubs(:end_session_endpoint).returns('https://example.com/logout')
         ::OpenIDConnect::Discovery::Provider::Config.stubs(:discover!).with('https://example.com/').returns(config)
 
-        request.stubs(:path_info).returns('/auth/openidconnect/logout')
+        request.stubs(:path).returns('/auth/openidconnect/logout')
 
         strategy.expects(:redirect).with(regexp_matches(expected_redirect))
         strategy.other_phase
@@ -102,7 +102,7 @@ def test_logout_phase_with_discovery_and_post_logout_redirect_uri
         config.stubs(:end_session_endpoint).returns('https://example.com/logout')
         ::OpenIDConnect::Discovery::Provider::Config.stubs(:discover!).with('https://example.com/').returns(config)
 
-        request.stubs(:path_info).returns('/auth/openidconnect/logout')
+        request.stubs(:path).returns('/auth/openidconnect/logout')
 
         strategy.expects(:redirect).with(expected_redirect)
         strategy.other_phase
@@ -112,7 +112,7 @@ def test_logout_phase
         strategy.options.issuer = 'example.com'
         strategy.options.client_options.host = 'example.com'
 
-        request.stubs(:path_info).returns('/auth/openidconnect/logout')
+        request.stubs(:path).returns('/auth/openidconnect/logout')
 
         strategy.expects(:call_app!)
         strategy.other_phase
@@ -164,7 +164,7 @@ def test_callback_phase(session: {}, params: {}, options: {}, userinfo: true, st
         state = SecureRandom.hex(16)
         nonce = SecureRandom.hex(16)
         request.stubs(:params).returns('code' => code, 'state' => state)
-        request.stubs(:path_info).returns('')
+        request.stubs(:path).returns('')
 
         strategy.options.issuer = 'example.com'
         strategy.options.client_signing_alg = :RS256
@@ -249,7 +249,7 @@ def test_callback_phase_with_discovery
         jwks = JSON::JWK::Set.new(JSON.parse(File.read('test/fixtures/jwks.json'))['keys'])
 
         request.stubs(:params).returns('code' => code, 'state' => state)
-        request.stubs(:path_info).returns('')
+        request.stubs(:path).returns('')
 
         strategy.options.client_options.host = 'example.com'
         strategy.options.discovery = true
@@ -290,7 +290,7 @@ def test_callback_phase_with_error
         state = SecureRandom.hex(16)
         nonce = SecureRandom.hex(16)
         request.stubs(:params).returns('error' => 'invalid_request')
-        request.stubs(:path_info).returns('')
+        request.stubs(:path).returns('')
 
         strategy.call!({'rack.session' => {'omniauth.state' => state, 'omniauth.nonce' => nonce}})
         strategy.expects(:fail!)
@@ -302,7 +302,7 @@ def test_callback_phase_with_invalid_state
         state = SecureRandom.hex(16)
         nonce = SecureRandom.hex(16)
         request.stubs(:params).returns('code' => code, 'state' => 'foobar')
-        request.stubs(:path_info).returns('')
+        request.stubs(:path).returns('')
 
         strategy.call!('rack.session' => { 'omniauth.state' => state, 'omniauth.nonce' => nonce })
         result = strategy.callback_phase
@@ -316,7 +316,7 @@ def test_callback_phase_with_timeout
         state = SecureRandom.hex(16)
         nonce = SecureRandom.hex(16)
         request.stubs(:params).returns('code' => code, 'state' => state)
-        request.stubs(:path_info).returns('')
+        request.stubs(:path).returns('')
 
         strategy.options.issuer = 'example.com'
 
@@ -331,7 +331,7 @@ def test_callback_phase_with_etimeout
         state = SecureRandom.hex(16)
         nonce = SecureRandom.hex(16)
         request.stubs(:params).returns('code' => code, 'state' => state)
-        request.stubs(:path_info).returns('')
+        request.stubs(:path).returns('')
 
         strategy.options.issuer = 'example.com'
 
@@ -346,7 +346,7 @@ def test_callback_phase_with_socket_error
         state = SecureRandom.hex(16)
         nonce = SecureRandom.hex(16)
         request.stubs(:params).returns('code' => code, 'state' => state)
-        request.stubs(:path_info).returns('')
+        request.stubs(:path).returns('')
 
         strategy.options.issuer = 'example.com'
 
@@ -500,7 +500,7 @@ def test_state
         # the following should fail because the wrong state is passed to the callback
         code = SecureRandom.hex(16)
         request.stubs(:params).returns('code' => code, 'state' => 43)
-        request.stubs(:path_info).returns('')
+        request.stubs(:path).returns('')
         strategy.call!('rack.session' => session)
 
         result = strategy.callback_phase
@@ -526,7 +526,7 @@ def test_option_client_auth_method
           token_type: 'Bearer',
         }.to_json
 
-        request.stubs(:path_info).returns('')
+        request.stubs(:path).returns('')
         strategy.call!('rack.session' => { 'omniauth.state' => state, 'omniauth.nonce' => nonce })
 
         id_token = stub('OpenIDConnect::ResponseObject::IdToken')

test/strategy_test_case.rb

@@ -40,6 +40,7 @@ def request
       request.stubs(:env).returns({})
       request.stubs(:scheme).returns({})
       request.stubs(:ssl?).returns(false)
+      request.stubs(:path).returns('/')
     end
   end