rack-oauth2 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 209bd4160af15825baf09e8e51de40eca26b339e
-  data.tar.gz: e597b66535c13dbe4c2d0412c3360162bbfeb010
+  metadata.gz: d92edcb16d7166257558b555867bfc52c1770514
+  data.tar.gz: 25d1d5ee07b9fe8d2f50c93b6b6384439ef53053
 SHA512:
-  metadata.gz: c1a9d718acc695b28e290f4da72eda80d158b7f6c39b94b82b6c4d02edc6e3bc9ad3d08c5c3eb4da1728a0a0ecc77ba994f4bc523c1fef6254d9ee3da3c63042
-  data.tar.gz: 180bab02141d632c431cc90c9520effcc28dd013a18eb4d14c1499bc3e4c97b1e87e772a945d83ba9b95ae36baf870b14bbc32959516b76eeb663dbab8c16ca1
+  metadata.gz: 04d1fa45e23b7f7eafc051c84eb6d08df5234ee31c14cf06e1951df8a6a53cba636145649fbd748e7f610911b22a984a928166eb0f37e39b0d049d6b599b3de7
+  data.tar.gz: 5a45856133aed0ce20e9d8c5db3ebff15d2b5524c4bbb44a3731bf6986ce8ae5bb65f7125cba6bcdac9f14d808dc980c8ae7f5640330b522c37a428b82ea7e3f

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

data/lib/rack/oauth2/client.rb

@@ -64,6 +64,10 @@ module Rack
         )
       end
 
+      def force_token_type!(token_type)
+        @forced_token_type = token_type.to_s
+      end
+
       def access_token!(*args)
         headers, params = {}, @grant.as_json
 
@@ -119,7 +123,7 @@ module Rack
 
       def handle_success_response(response)
         token_hash = parse_json response.body
-        case token_hash[:token_type].try(:downcase)
+        case (@forced_token_type || token_hash[:token_type]).try(:downcase)
         when 'bearer'
           AccessToken::Bearer.new(token_hash)
         when 'mac'

data/spec/rack/oauth2/client_spec.rb

@@ -79,7 +79,7 @@ describe Rack::OAuth2::Client do
   describe '#access_token!' do
     subject { client.access_token! }
 
-      context 'when *args given' do
+    context 'when *args given' do
 
       describe 'client authentication method' do
         before do
@@ -169,7 +169,7 @@ describe Rack::OAuth2::Client do
     end
 
     context 'when bearer token is given' do
-      before  do
+      before do
         client.authorization_code = 'code'
         mock_response(
           :post,
@@ -184,7 +184,7 @@ describe Rack::OAuth2::Client do
       its(:expires_in) { should == 3600 }
 
       context 'when token type is "Bearer", not "bearer"' do
-        before  do
+        before do
           client.authorization_code = 'code'
           mock_response(
             :post,
@@ -198,7 +198,7 @@ describe Rack::OAuth2::Client do
     end
 
     context 'when mac token is given' do
-      before  do
+      before do
         client.authorization_code = 'code'
         mock_response(
           :post,
@@ -214,7 +214,7 @@ describe Rack::OAuth2::Client do
     end
 
     context 'when no-type token is given (JSON)' do
-      before  do
+      before do
         client.authorization_code = 'code'
         mock_response(
           :post,
@@ -227,6 +227,14 @@ describe Rack::OAuth2::Client do
       its(:access_token) { should == 'access_token' }
       its(:refresh_token) { should == 'refresh_token' }
       its(:expires_in) { should == 3600 }
+
+      context 'when token_type is forced' do
+        before do
+          client.force_token_type! :bearer
+        end
+        it { should be_instance_of Rack::OAuth2::AccessToken::Bearer }
+        its(:token_type) { should == :bearer }
+      end
     end
 
     context 'when no-type token is given (key-value)' do
@@ -255,7 +263,7 @@ describe Rack::OAuth2::Client do
     end
 
     context 'when unknown-type token is given' do
-      before  do
+      before do
         client.authorization_code = 'code'
         mock_response(
           :post,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -301,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: OAuth 2.0 Server & Client Library - Both Bearer and MAC token type are supported