rack-oauth2 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e09ccf53817af77d1e714e25e20e9b76fd63de080fb1f3d9617fff3aef126a32
-  data.tar.gz: '088a7815b796f5c05ac3445ee39cc997bcc20964a66c1d4fc7a5c3906e27eb36'
+  metadata.gz: 15c2f24e86e767637d2796e7b66391355736973f1ee698d6431833e854f1b938
+  data.tar.gz: eb49532f9f13f99a485c9298807fdda909a68f2bc57e15666d6618b304efa5c8
 SHA512:
-  metadata.gz: b261cc8b398a4b02797b581d455307bc46f0f248990c4fef7b0286eb7eb2e191568ecb5c8c0b6123ef5cd43f5f517c0980bf405b9b3efd0874c29b8e97218696
-  data.tar.gz: adf42215042112d7577d76b35437fa2b2b45f8a259a896c5621790a7603053e6ea1ada28ba2d27330e5338689061002cc870969a8895ba040349faea5ec7340b
+  metadata.gz: 436dc9861ffb108fbbbf305a5b539fe8d94096eceed2361a3061993ab0d3fd734e7219446e00639e596b28c86f0609cd801285bf62a3e686604876f1538d7275
+  data.tar.gz: 365e8aca4188e2ed5c9a973bb2f91050a76d6843de0dfd73e9c4304d7dbdb675f380084fc618663f4b69b4b33f8baa94d4ac5021f63e789fdd630c4c9a2589d2

data/VERSION

@@ -1 +1 @@
-1.10.1
+1.11.0

data/lib/rack/oauth2/server/rails/response_ext.rb

@@ -5,7 +5,7 @@ module Rack
         module ResponseExt
           def redirect?
             ensure_finish do
-              @response.redirect?
+              super
             end
           end
 
@@ -17,7 +17,7 @@ module Rack
 
           def json
             ensure_finish do
-              @response.body
+              @body
             end
           end
 
@@ -39,7 +39,7 @@ module Rack
           end
 
           def ensure_finish
-            @status, @header, @response = finish unless finished?
+            @status, @header, @body = finish unless finished?
             yield
           end
         end

data/lib/rack/oauth2/util.rb

@@ -35,11 +35,12 @@ module Rack
 
         def redirect_uri(base_uri, location, params)
           redirect_uri = parse_uri base_uri
+          encoded_response_params = Util.compact_hash(params).to_query.gsub('+', '%20')
           case location
           when :query
-            redirect_uri.query = [redirect_uri.query, Util.compact_hash(params).to_query].compact.join('&')
+            redirect_uri.query = [redirect_uri.query, encoded_response_params].compact.join('&')
           when :fragment
-            redirect_uri.fragment = Util.compact_hash(params).to_query
+            redirect_uri.fragment = encoded_response_params
           end
           redirect_uri.to_s
         end
@@ -59,4 +60,4 @@ module Rack
       end
     end
   end
-end
+end

data/rack-oauth2.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.add_runtime_dependency 'rack'
+  s.add_runtime_dependency 'rack', '>= 2.1.0'
   s.add_runtime_dependency 'httpclient'
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'attr_required'

data/spec/rack/oauth2/client_spec.rb

@@ -49,12 +49,12 @@ describe Rack::OAuth2::Client do
 
     context 'when response_type is an Array' do
       subject { client.authorization_uri(response_type: [:token, :code]) }
-      it { should include 'response_type=token+code' }
+      it { should include 'response_type=token%20code' }
     end
 
     context 'when scope is given' do
       subject { client.authorization_uri(scope: [:scope1, :scope2]) }
-      it { should include 'scope=scope1+scope2' }
+      it { should include 'scope=scope1%20scope2' }
     end
   end
 

data/spec/rack/oauth2/server/authorize/code_spec.rb

@@ -51,7 +51,7 @@ describe Rack::OAuth2::Server::Authorize::Code do
         error: :access_denied,
         error_description: Rack::OAuth2::Server::Authorize::ErrorMethods::DEFAULT_DESCRIPTION[:access_denied]
       }
-      response.location.should == "#{redirect_uri}?#{error_message.to_query}&state=state"
+      response.location.should == "#{redirect_uri}?#{error_message.to_query.gsub('+', '%20')}&state=state"
     end
   end
 end

data/spec/rack/oauth2/server/authorize/extensions/code_and_token_spec.rb

@@ -54,7 +54,7 @@ describe Rack::OAuth2::Server::Authorize::Extension::CodeAndToken do
         error: :access_denied,
         error_description: Rack::OAuth2::Server::Authorize::ErrorMethods::DEFAULT_DESCRIPTION[:access_denied]
       }
-      response.location.should == "#{redirect_uri}##{error_message.to_query}"
+      response.location.should == "#{redirect_uri}##{error_message.to_query.gsub('+', '%20')}"
     end
   end
 end

data/spec/rack/oauth2/server/authorize/token_spec.rb

@@ -67,7 +67,7 @@ describe Rack::OAuth2::Server::Authorize::Token do
         error: :access_denied,
         error_description: Rack::OAuth2::Server::Authorize::ErrorMethods::DEFAULT_DESCRIPTION[:access_denied]
       }
-      response.location.should == "#{redirect_uri}##{error_message.to_query}&state=state"
+      response.location.should == "#{redirect_uri}##{error_message.to_query.gsub('+', '%20')}&state=state"
     end
   end
 end

data/spec/rack/oauth2/server/resource/error_spec.rb

@@ -10,7 +10,7 @@ describe Rack::OAuth2::Server::Resource::BadRequest do
       status, header, response = error.finish
       status.should == 400
       header['Content-Type'].should == 'application/json'
-      response.body.should == ['{"error":"invalid_request"}']
+      response.should == ['{"error":"invalid_request"}']
     end
   end
 end
@@ -44,7 +44,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
         status.should == 401
         header['Content-Type'].should == 'application/json'
         header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\", error=\"invalid_token\""
-        response.body.should == ['{"error":"invalid_token"}']
+        response.should == ['{"error":"invalid_token"}']
       end
 
       context 'when error_code is not invalid_token' do
@@ -53,7 +53,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
         it 'should have error_code in body but not in WWW-Authenticate header' do
           status, header, response = error_with_scheme.finish
           header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\""
-          response.body.first.should include '"error":"something"'
+          response.first.should include '"error":"something"'
         end
       end
 
@@ -63,7 +63,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
         it 'should have error_code in body but not in WWW-Authenticate header' do
           status, header, response = error_with_scheme.finish
           header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\""
-          response.body.first.should == '{"error":"unauthorized"}'
+          response.first.should == '{"error":"unauthorized"}'
         end
       end
 
@@ -74,7 +74,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
         it 'should use given realm' do
           status, header, response = error_with_scheme.finish
           header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\""
-          response.body.first.should include '"error":"something"'
+          response.first.should include '"error":"something"'
         end
       end
     end
@@ -91,7 +91,7 @@ describe Rack::OAuth2::Server::Resource::Forbidden do
       status, header, response = error.finish
       status.should == 403
       header['Content-Type'].should == 'application/json'
-      response.body.should == ['{"error":"insufficient_scope"}']
+      response.should == ['{"error":"insufficient_scope"}']
     end
   end
 
@@ -100,7 +100,7 @@ describe Rack::OAuth2::Server::Resource::Forbidden do
 
     it 'should have blank WWW-Authenticate header' do
       status, header, response = error.finish
-      response.body.first.should include '"scope":"scope1 scope2"'
+      response.first.should include '"scope":"scope1 scope2"'
     end
   end
 end

data/spec/rack/oauth2/server/token/error_spec.rb

@@ -10,7 +10,7 @@ describe Rack::OAuth2::Server::Token::BadRequest do
       status, header, response = error.finish
       status.should == 400
       header['Content-Type'].should == 'application/json'
-      response.body.should == ['{"error":"invalid_request"}']
+      response.should == ['{"error":"invalid_request"}']
     end
   end
 end
@@ -26,7 +26,7 @@ describe Rack::OAuth2::Server::Token::Unauthorized do
       status.should == 401
       header['Content-Type'].should == 'application/json'
       header['WWW-Authenticate'].should == 'Basic realm="OAuth2 Token Endpoint"'
-      response.body.should == ['{"error":"invalid_request"}']
+      response.should == ['{"error":"invalid_request"}']
     end
   end
 end
@@ -74,4 +74,4 @@ describe Rack::OAuth2::Server::Token::ErrorMethods do
       end
     end
   end
-end
+end

data/spec/rack/oauth2/server/token_spec.rb

@@ -30,7 +30,7 @@ describe Rack::OAuth2::Server::Token do
       it 'should fail with unsupported_grant_type' do
         status, header, response = app.call(env)
         status.should == 400
-        response.body.first.should include '"error":"invalid_request"'
+        response.first.should include '"error":"invalid_request"'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement