openid_connect 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.1.2)
+    openid_connect (0.1.3)
       activemodel (>= 3)
       attr_required (>= 0.0.5)
       json (>= 1.4.3)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/rack/oauth2/server/authorize/extension/code_and_id_token_and_token.rb

@@ -0,0 +1,36 @@
+module Rack
+  module OAuth2
+    module Server
+      class Authorize
+        module Extension
+          class CodeAndIdTokenAndToken < Abstract::Handler
+            class << self
+              def response_type_for?(response_type)
+                response_type.split.sort == ['code', 'id_token', 'token']
+              end
+            end
+
+            def call(env)
+              @request  = Request.new env
+              @response = Response.new request
+              super
+            end
+
+            class Request < Authorize::Extension::CodeAndToken::Request
+              def initialize(env)
+                super
+                @response_type = [:code, :id_token, :token]
+                attr_missing!
+              end
+            end
+
+            class Response < Authorize::Extension::CodeAndToken::Response
+              include IdTokenResponse
+              attr_required :id_token
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rack/oauth2/server/id_token_response.rb

@@ -20,5 +20,7 @@ module Rack::OAuth2::Server
 end
 
 require 'rack/oauth2/server/authorize/extension/code_and_id_token'
+require 'rack/oauth2/server/authorize/extension/code_and_token'
+require 'rack/oauth2/server/authorize/extension/code_and_id_token_and_token'
 require 'rack/oauth2/server/authorize/extension/id_token'
 require 'rack/oauth2/server/authorize/extension/id_token_and_token'

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

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Rack::OAuth2::Server::Authorize::Extension::CodeAndIdTokenAndToken do
+  subject { response }
+  let(:request)      { Rack::MockRequest.new app }
+  let(:response)     { request.get('/?response_type=code%20id_token%20token&client_id=client&state=state') }
+  let(:redirect_uri) { 'http://client.example.com/callback' }
+  let(:bearer_token) { Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token') }
+  let(:code)         { 'authorization_code' }
+  let :id_token do
+    OpenIDConnect::ResponseObject::IdToken.new(
+      :iss => 'https://server.example.com',
+      :user_id => 'user_id',
+      :aud => 'client_id',
+      :nonce => 'nonce',
+      :exp => 1313424327
+    ).to_jwt private_key
+  end
+
+  context 'when id_token is given' do
+    let :app do
+      Rack::OAuth2::Server::Authorize.new do |request, response|
+        response.redirect_uri = redirect_uri
+        response.code = code
+        response.id_token = id_token
+        response.access_token = bearer_token
+        response.approve!
+      end
+    end
+    its(:status)   { should == 302 }
+    its(:location) { should include "#{redirect_uri}#" }
+    its(:location) { should include "access_token=#{bearer_token.access_token}" }
+    its(:location) { should include "id_token=#{id_token}" }
+    its(:location) { should include "token_type=#{bearer_token.token_type}" }
+    its(:location) { should include "code=#{code}" }
+    its(:location) { should include 'state=state' }
+
+    context 'when id_token is String' do
+      let(:id_token) { 'id_token' }
+      its(:location) { should include 'id_token=id_token' }
+    end
+  end
+
+  context 'otherwise' do
+    let :app do
+      Rack::OAuth2::Server::Authorize.new do |request, response|
+        response.redirect_uri = redirect_uri
+        response.approve!
+      end
+    end
+    it do
+      expect { response }.should raise_error AttrRequired::AttrMissing, "'access_token', 'code', 'id_token' required."
+    end
+  end
+end

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

@@ -26,11 +26,10 @@ describe Rack::OAuth2::Server::Authorize::Extension::IdTokenAndToken do
       end
     end
     its(:status)   { should == 302 }
-    its(:location) { should_not include '?' }
-    its(:location) { should include '#' }
-    its(:location) { should include 'access_token=access_token' }
+    its(:location) { should include "#{redirect_uri}#" }
+    its(:location) { should include "access_token=#{bearer_token.access_token}" }
     its(:location) { should include "id_token=#{id_token}" }
-    its(:location) { should include 'token_type=bearer' }
+    its(:location) { should include "token_type=#{bearer_token.token_type}" }
     its(:location) { should include 'state=state' }
 
     context 'when id_token is String' do

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

@@ -24,8 +24,7 @@ describe Rack::OAuth2::Server::Authorize::Extension::IdToken do
       end
     end
     its(:status)   { should == 302 }
-    its(:location) { should_not include '?' }
-    its(:location) { should include '#' }
+    its(:location) { should include "#{redirect_uri}#" }
     its(:location) { should include "id_token=#{id_token}" }
     its(:location) { should include 'state=state' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000Z
+date: 2012-02-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70146497161760 !ruby/object:Gem::Requirement
+  requirement: &70121141941000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70146497161760
+  version_requirements: *70121141941000
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70146497161120 !ruby/object:Gem::Requirement
+  requirement: &70121141939640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70146497161120
+  version_requirements: *70121141939640
 - !ruby/object:Gem::Dependency
   name: attr_required
-  requirement: &70146497159480 !ruby/object:Gem::Requirement
+  requirement: &70121141938520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70146497159480
+  version_requirements: *70121141938520
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70146497158360 !ruby/object:Gem::Requirement
+  requirement: &70121141937300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70146497158360
+  version_requirements: *70121141937300
 - !ruby/object:Gem::Dependency
   name: validate_url
-  requirement: &70146497148360 !ruby/object:Gem::Requirement
+  requirement: &70121141931520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70146497148360
+  version_requirements: *70121141931520
 - !ruby/object:Gem::Dependency
   name: validate_email
-  requirement: &70146497147620 !ruby/object:Gem::Requirement
+  requirement: &70121141912840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70146497147620
+  version_requirements: *70121141912840
 - !ruby/object:Gem::Dependency
   name: json-jwt
-  requirement: &70146497146960 !ruby/object:Gem::Requirement
+  requirement: &70121141907020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70146497146960
+  version_requirements: *70121141907020
 - !ruby/object:Gem::Dependency
   name: swd
-  requirement: &70146497146440 !ruby/object:Gem::Requirement
+  requirement: &70121141903880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70146497146440
+  version_requirements: *70121141903880
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
-  requirement: &70146497145960 !ruby/object:Gem::Requirement
+  requirement: &70121141901320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.14.2
   type: :runtime
   prerelease: false
-  version_requirements: *70146497145960
+  version_requirements: *70121141901320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70146497145480 !ruby/object:Gem::Requirement
+  requirement: &70121141899780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70146497145480
+  version_requirements: *70121141899780
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70146497144840 !ruby/object:Gem::Requirement
+  requirement: &70121141892320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70146497144840
+  version_requirements: *70121141892320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70146497144140 !ruby/object:Gem::Requirement
+  requirement: &70121141886580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70146497144140
+  version_requirements: *70121141886580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70146497143120 !ruby/object:Gem::Requirement
+  requirement: &70121141874380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70146497143120
+  version_requirements: *70121141874380
 description: OpenID Connect Server & Client Library
 email:
 - nov@matake.jp
@@ -192,6 +192,7 @@ files:
 - lib/openid_connect/response_object/user_info/open_id.rb
 - lib/openid_connect/response_object/user_info/open_id/address.rb
 - lib/rack/oauth2/server/authorize/extension/code_and_id_token.rb
+- lib/rack/oauth2/server/authorize/extension/code_and_id_token_and_token.rb
 - lib/rack/oauth2/server/authorize/extension/id_token.rb
 - lib/rack/oauth2/server/authorize/extension/id_token_and_token.rb
 - lib/rack/oauth2/server/authorize/request_with_connect_params.rb
@@ -229,6 +230,7 @@ files:
 - spec/openid_connect/response_object/user_info/open_id_spec.rb
 - spec/openid_connect/response_object_spec.rb
 - spec/openid_connect_spec.rb
+- spec/rack/oauth2/server/authorize/extension/code_and_id_token_and_token_spec.rb
 - 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
@@ -292,6 +294,7 @@ test_files:
 - spec/openid_connect/response_object/user_info/open_id_spec.rb
 - spec/openid_connect/response_object_spec.rb
 - spec/openid_connect_spec.rb
+- spec/rack/oauth2/server/authorize/extension/code_and_id_token_and_token_spec.rb
 - 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