rack-oauth2 1.6.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a2f073636f67589106aa93f4391600d582c7902
-  data.tar.gz: adce517353b54b8edb946a115f2312d836dc3eda
+  metadata.gz: 209bd4160af15825baf09e8e51de40eca26b339e
+  data.tar.gz: e597b66535c13dbe4c2d0412c3360162bbfeb010
 SHA512:
-  metadata.gz: 5dcbe63d67b03c6b26496150077109e14ec2e1d9a6714a25926f7b4c733dfa6a4740fcc8ff04c5312f9eea9540868ab3c1209173d16e1c4e37f589820a44858b
-  data.tar.gz: 1f0f366a6a0f8b7874f94613083d3ba7501e44980cafe5ca60b6e4e76eff7767183939dd6bd0e6817a8e6c251306eb1d0c71970f825a47c5f09bded70f6c2314
+  metadata.gz: c1a9d718acc695b28e290f4da72eda80d158b7f6c39b94b82b6c4d02edc6e3bc9ad3d08c5c3eb4da1728a0a0ecc77ba994f4bc523c1fef6254d9ee3da3c63042
+  data.tar.gz: 180bab02141d632c431cc90c9520effcc28dd013a18eb4d14c1499bc3e4c97b1e87e772a945d83ba9b95ae36baf870b14bbc32959516b76eeb663dbab8c16ca1

data/.travis.yml

@@ -2,7 +2,5 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 2.2.2
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.3.5
+  - 2.4.2

data/VERSION

@@ -1 +1 @@
-1.6.4
+1.7.0

data/lib/rack/oauth2/client.rb

@@ -76,18 +76,16 @@ module Rack
         params[:scope] = Array(options.delete(:scope)).join(' ') if options[:scope].present?
         params.merge! options
 
-        if secret
-          if client_auth_method == :basic
-            cred = ["#{identifier}:#{secret}"].pack('m').tr("\n", '')
-            headers.merge!(
-              'Authorization' => "Basic #{cred}"
-            )
-          else
-            params.merge!(
-              client_id: identifier,
-              client_secret: secret
-            )
-          end
+        if client_auth_method == :basic
+          cred = ["#{identifier}:#{secret}"].pack('m').tr("\n", '')
+          headers.merge!(
+            'Authorization' => "Basic #{cred}"
+          )
+        else
+          params.merge!(
+            client_id: identifier,
+            client_secret: secret
+          )
         end
         handle_response do
           Rack::OAuth2.http_client.post(

data/lib/rack/oauth2/server/abstract/error.rb

@@ -53,13 +53,13 @@ module Rack
         end
 
         class ServerError < Error
-          def initialize(error = :forbidden, description = nil, options = {})
+          def initialize(error = :server_error, description = nil, options = {})
             super 500, error, description, options
           end
         end
 
         class TemporarilyUnavailable < Error
-          def initialize(error = :forbidden, description = nil, options = {})
+          def initialize(error = :temporarily_unavailable, description = nil, options = {})
             super 503, error, description, options
           end
         end

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

@@ -57,6 +57,16 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
         end
       end
 
+      context 'when no error_code is given' do
+        let(:error) { Rack::OAuth2::Server::Resource::Unauthorized.new }
+
+        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"}'
+        end
+      end
+
       context 'when realm is specified' do
         let(:realm) { 'server.example.com' }
         let(:error) { Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(:something, nil, realm: realm) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.7.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack