rack-oauth2 1.8.2 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbac894ed9163540ac519a063032626b0a76207d
-  data.tar.gz: 8c6b39c0c3b6477fe59d507e563f81dc20e6b81a
+  metadata.gz: 6d6e275e1557d74bfbd90cdb64eedebb92969adb
+  data.tar.gz: 77da3f0c6b3eadab5de312561ec1f248c407668b
 SHA512:
-  metadata.gz: 321b9d515d5926a653c16f9dd3a58cdf900872810218bc7aad37c473b39cec07cca3579ef4b5c16ad3ba93e74eee56b0cf43711f61b04724fbf6639af8d5bb71
-  data.tar.gz: 27aec030fe85e7ef03efff02cd08b8388a2e317d2e10a6fed9cf0e3bff4052185b8545543cf4d581d9e1a0bda23368b55033398132165b068b2c184e33e31124
+  metadata.gz: 84bb75f21c6a1b69dc8cf8c9f03c9868e33b8e58973e4d8181c85ee2097e4153c6a135de43db3dcd7abbb8c88de4c8a6ec8a2a983c12018eabcf358cd1b1cd27
+  data.tar.gz: 6bbafc182dc0f894d04f6ad5746c5a3c1a5e746d51facb2cbd919c1a65212c49f52846ce804717d735c8c3207b9b39c580e4a8f115c4cd7cf6110bde008b4601

data/VERSION

@@ -1 +1 @@
-1.8.2
+1.9.0

data/rack-oauth2.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'httpclient'
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'attr_required'
-  s.add_runtime_dependency 'json-jwt'
+  s.add_runtime_dependency 'json-jwt', '>= 1.9.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rspec'

data/spec/rack/oauth2/client_spec.rb

@@ -79,8 +79,7 @@ describe Rack::OAuth2::Client do
   describe '#access_token!' do
     subject { client.access_token! }
 
-    context 'when *args given' do
-
+    context '*args handling' do
       describe 'client authentication method' do
         before do
           client.authorization_code = 'code'
@@ -98,6 +97,108 @@ describe Rack::OAuth2::Client do
           client.access_token!
         end
 
+        context 'when jwt_bearer auth method specified' do
+          context 'when client_secret is given' do
+            it 'should be JWT bearer client assertion w/ auto-generated HS256-signed JWT assertion' do
+              mock_response(
+                :post,
+                'https://server.example.com/oauth2/token',
+                'tokens/bearer.json',
+                params: {
+                  client_assertion: /^eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9\..+/, # NOTE: HS256
+                  client_assertion_type: Rack::OAuth2::URN::ClientAssertionType::JWT_BEARER,
+                  code: 'code',
+                  grant_type: 'authorization_code',
+                  redirect_uri: 'https://client.example.com/callback'
+                }
+              )
+              client.access_token! :jwt_bearer
+            end
+          end
+
+          context 'when private_key is given' do
+            context 'when RSA key' do
+              let :client do
+                Rack::OAuth2::Client.new(
+                  identifier: 'client_id',
+                  private_key: OpenSSL::PKey::RSA.generate(2048),
+                  host: 'server.example.com',
+                  redirect_uri: 'https://client.example.com/callback'
+                )
+              end
+
+              it 'should be JWT bearer client assertion w/ auto-generated RS256-signed JWT assertion' do
+                mock_response(
+                  :post,
+                  'https://server.example.com/oauth2/token',
+                  'tokens/bearer.json',
+                  params: {
+                    client_assertion: /^eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9\..+/, # NOTE: RS256
+                    client_assertion_type: Rack::OAuth2::URN::ClientAssertionType::JWT_BEARER,
+                    code: 'code',
+                    grant_type: 'authorization_code',
+                    redirect_uri: 'https://client.example.com/callback'
+                  }
+                )
+                client.access_token! :jwt_bearer
+              end
+            end
+
+            context 'when EC key' do
+              let :client do
+                Rack::OAuth2::Client.new(
+                  identifier: 'client_id',
+                  private_key: OpenSSL::PKey::EC.new('prime256v1').generate_key,
+                  host: 'server.example.com',
+                  redirect_uri: 'https://client.example.com/callback'
+                )
+              end
+
+              it 'should be JWT bearer client assertion w/ auto-generated ES256-signed JWT assertion' do
+                mock_response(
+                  :post,
+                  'https://server.example.com/oauth2/token',
+                  'tokens/bearer.json',
+                  params: {
+                    client_assertion: /^eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9\..+/, # NOTE: ES256
+                    client_assertion_type: Rack::OAuth2::URN::ClientAssertionType::JWT_BEARER,
+                    code: 'code',
+                    grant_type: 'authorization_code',
+                    redirect_uri: 'https://client.example.com/callback'
+                  }
+                )
+                client.access_token! :jwt_bearer
+              end
+            end
+          end
+
+          context 'when client_assertion is explicitly given' do
+            let :client do
+              Rack::OAuth2::Client.new(
+                identifier: 'client_id',
+                host: 'server.example.com',
+                redirect_uri: 'https://client.example.com/callback'
+              )
+            end
+
+            it 'should be JWT bearer client assertion w/ specified assertion' do
+              mock_response(
+                :post,
+                'https://server.example.com/oauth2/token',
+                'tokens/bearer.json',
+                params: {
+                  client_assertion: 'any.jwt.assertion',
+                  client_assertion_type: Rack::OAuth2::URN::ClientAssertionType::JWT_BEARER,
+                  code: 'code',
+                  grant_type: 'authorization_code',
+                  redirect_uri: 'https://client.example.com/callback'
+                }
+              )
+              client.access_token! :jwt_bearer, client_assertion: 'any.jwt.assertion'
+            end
+          end
+        end
+
         context 'when other auth method specified' do
           it 'should be body params' do
             mock_response(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement