openid_connect 0.12.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3680ddb689fddf4c9acb2c53e70484ae8ff35ef4
-  data.tar.gz: 56d09c9c222ad546aa0dddfb0b74aa76a48453cb
+  metadata.gz: 578c7069558b2b2d8de668f316f0282e19f439e0
+  data.tar.gz: f4231dc452dc98badea4a43df6764d4de4823fb7
 SHA512:
-  metadata.gz: 8532c4c8a9c6b382d522bd86477cf05e1e27398f7a2f7f590158e6fe08fa3206fdd7cdb10de5bec32eecfddeb10062708fe8239b2f1da23817f7bcbe41b000c7
-  data.tar.gz: f06a962a78730924277a2e86ba6d6d6283b3d33b4152c5d918ce584d62185d5af47d95dfcaeb2095aa5274cbf9df7a7c0239cdc2989a46fec5c2272fd24cdc99
+  metadata.gz: 9f6a3722dfe462d799e874d9218f9e783e8f8f298cba3d686c3fbebe5c35bcd8b25eb124dc6bb4b622b8a4cbfa390ec670409ed99f943573addf3ab5034aabbd
+  data.tar.gz: d4ac8a152776e4cf5a3190f60b203a7ae2bb4566ee2632da8c4d0e651c4503d90c5acbdcebe88f0035440737f893069d0d37e059dde8af3aa6ce3ece0abd0982

data/.travis.yml

@@ -2,7 +2,6 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.2.2
+  - 2.2.5
+  - 2.3.1

data/VERSION

@@ -1 +1 @@
-0.12.0
+1.0.0

data/lib/openid_connect/client.rb

@@ -9,6 +9,7 @@ module OpenIDConnect
 
     def authorization_uri(params = {})
       params[:scope] = setup_required_scope params[:scope]
+      params[:prompt] = Array(params[:prompt]).join(' ')
       super
     end
 
@@ -19,7 +20,7 @@ module OpenIDConnect
     private
 
     def setup_required_scope(scopes)
-      _scopes_ = Array(scopes).collect(&:to_s).join(' ').split(' ')
+      _scopes_ = Array(scopes).join(' ').split(' ')
       _scopes_ << 'openid' unless _scopes_.include?('openid')
       _scopes_
     end

data/lib/rack/oauth2/server/authorize/request_with_connect_params.rb

@@ -14,6 +14,7 @@ class Rack::OAuth2::Server::Authorize
       CONNECT_EXT_PARAMS.each do |attribute|
         self.send :"#{attribute}=", params[attribute.to_s]
       end
+      self.prompt = Array(prompt.to_s.split(' '))
       self.max_age = max_age.try(:to_i)
     end
 

data/spec/helpers/crypto_spec_helper.rb

@@ -8,7 +8,7 @@ module CryptoSpecHelper
   end
 
   def private_key
-    @private_key ||= OpenSSL::PKey::RSA.new rsa_key.export(OpenSSL::Cipher::Cipher.new('DES-EDE3-CBC'), 'pass-phrase'), 'pass-phrase'
+    @private_key ||= OpenSSL::PKey::RSA.new rsa_key.export(OpenSSL::Cipher.new('DES-EDE3-CBC'), 'pass-phrase'), 'pass-phrase'
   end
 
   def ec_key

data/spec/openid_connect/client_spec.rb

@@ -35,10 +35,12 @@ describe OpenIDConnect::Client do
 
   describe '#authorization_uri' do
     let(:scope) { nil }
+    let(:prompt) { nil }
     let(:response_type) { nil }
     let(:query) do
       params = {
         scope: scope,
+        prompt: prompt,
         response_type: response_type
       }.reject do |k,v|
         v.blank?
@@ -97,6 +99,27 @@ describe OpenIDConnect::Client do
         it { should == 'openid' }
       end
     end
+
+    describe 'prompt' do
+      subject do
+        query[:prompt]
+      end
+
+      context 'when prompt is a scalar value' do
+        let(:prompt) { :login }
+        it { should == 'login' }
+      end
+
+      context 'when prompt is a space-delimited string' do
+        let(:prompt) { 'login consent' }
+        it { should == 'login consent' }
+      end
+
+      context 'when prompt is an array' do
+        let(:prompt) { [:login, :consent] }
+        it { should == 'login consent' }
+      end
+    end
   end
 
   describe '#access_token!' do

data/spec/rack/oauth2/server/authorize/extension/code_and_id_token_and_token_spec.rb

@@ -53,4 +53,15 @@ describe Rack::OAuth2::Server::Authorize::Extension::CodeAndIdTokenAndToken do
       expect { response }.to raise_error AttrRequired::AttrMissing, "'access_token', 'code', 'id_token' required."
     end
   end
+
+  context 'when error response' do
+    let(:env)     { Rack::MockRequest.env_for("/authorize?client_id=client_id") }
+    let(:request) { Rack::OAuth2::Server::Authorize::Extension::CodeAndIdTokenAndToken::Request.new env }
+
+    it 'should set protocol_params_location = :fragment' do
+      expect { request.bad_request! }.to raise_error(Rack::OAuth2::Server::Authorize::BadRequest) { |e|
+        e.protocol_params_location.should == :fragment
+      }
+    end
+  end
 end

data/spec/rack/oauth2/server/authorize/extension/code_and_id_token_spec.rb

@@ -50,4 +50,15 @@ describe Rack::OAuth2::Server::Authorize::Extension::CodeAndIdToken do
       expect { response }.to raise_error AttrRequired::AttrMissing, "'id_token' required."
     end
   end
+
+  context 'when error response' do
+    let(:env)     { Rack::MockRequest.env_for("/authorize?client_id=client_id") }
+    let(:request) { Rack::OAuth2::Server::Authorize::Extension::CodeAndIdToken::Request.new env }
+
+    it 'should set protocol_params_location = :fragment' do
+      expect { request.bad_request! }.to raise_error(Rack::OAuth2::Server::Authorize::BadRequest) { |e|
+        e.protocol_params_location.should == :fragment
+      }
+    end
+  end
 end

data/spec/rack/oauth2/server/authorize/extension/id_token_and_token_spec.rb

@@ -51,4 +51,15 @@ describe Rack::OAuth2::Server::Authorize::Extension::IdTokenAndToken do
       expect { response }.to raise_error AttrRequired::AttrMissing, "'id_token' required."
     end
   end
+
+  context 'when error response' do
+    let(:env)     { Rack::MockRequest.env_for("/authorize?client_id=client_id") }
+    let(:request) { Rack::OAuth2::Server::Authorize::Extension::IdTokenAndToken::Request.new env }
+
+    it 'should set protocol_params_location = :fragment' do
+      expect { request.bad_request! }.to raise_error(Rack::OAuth2::Server::Authorize::BadRequest) { |e|
+        e.protocol_params_location.should == :fragment
+      }
+    end
+  end
 end

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

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Rack::OAuth2::Server::Authorize::RequestWithConnectParams do
+  let(:base_params) do
+    {
+      client_id: 'client_id',
+      redirect_uri: 'https://client.example.com/callback'
+    }
+  end
+  let(:env)     { Rack::MockRequest.env_for("/authorize?#{base_params.to_query}&#{params.to_query}") }
+  let(:request) { Rack::OAuth2::Server::Authorize::Request.new env }
+  subject { request }
+
+  describe 'prompt' do
+    context 'when a space-delimited string given' do
+      let(:params) do
+        {prompt: 'login consent'}
+      end
+      its(:prompt) { should == ['login', 'consent']}
+    end
+
+    context 'when a single string given' do
+      let(:params) do
+        {prompt: 'login'}
+      end
+      its(:prompt) { should == ['login']}
+    end
+  end
+
+  describe 'max_age' do
+    context 'when numeric value given' do
+      let(:params) do
+        {max_age: '5'}
+      end
+      its(:max_age) { should == 5}
+    end
+
+    context 'when non-numeric string given' do
+      let(:params) do
+        {max_age: 'foo'}
+      end
+      its(:max_age) { should == 0}
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 1.0.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -309,6 +309,7 @@ files:
 - spec/rack/oauth2/server/authorize/extension/code_and_id_token_spec.rb
 - spec/rack/oauth2/server/authorize/extension/id_token_and_token_spec.rb
 - spec/rack/oauth2/server/authorize/extension/id_token_spec.rb
+- spec/rack/oauth2/server/authorize/request_with_connect_params_spec.rb
 - spec/rack/oauth2/server/token/authorization_code_spec.rb
 - spec/rack/oauth2/server/token/refresh_token_spec.rb
 - spec/spec_helper.rb
@@ -332,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: OpenID Connect Server & Client Library
@@ -380,6 +381,7 @@ test_files:
 - spec/rack/oauth2/server/authorize/extension/code_and_id_token_spec.rb
 - spec/rack/oauth2/server/authorize/extension/id_token_and_token_spec.rb
 - spec/rack/oauth2/server/authorize/extension/id_token_spec.rb
+- spec/rack/oauth2/server/authorize/request_with_connect_params_spec.rb
 - spec/rack/oauth2/server/token/authorization_code_spec.rb
 - spec/rack/oauth2/server/token/refresh_token_spec.rb
 - spec/spec_helper.rb