openid_connect 0.0.8 → 0.0.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.0.7)
+    openid_connect (0.0.8)
       activemodel (>= 3)
       attr_required (>= 0.0.3)
       json (>= 1.4.3)
@@ -14,18 +14,18 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.5)
+      i18n (~> 0.5.0)
+    activesupport (3.0.10)
     addressable (2.2.6)
     attr_required (0.0.3)
     builder (2.1.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
     httpclient (2.2.1)
-    i18n (0.6.0)
+    i18n (0.5.0)
     json (1.5.3)
     jwt (0.1.3)
       json (>= 1.2.4)
@@ -62,8 +62,8 @@ GEM
       mail (>= 2.2.5)
     validate_url (0.2.0)
       activemodel (>= 3.0.0)
-    webmock (1.6.4)
-      addressable (> 2.2.5, ~> 2.2)
+    webmock (1.7.2)
+      addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/openid_connect/access_token.rb

@@ -14,15 +14,6 @@ module OpenIDConnect
       ResponseObject::UserInfo::OpenID.new hash
     end
 
-    def id_token!
-      hash = resource_request do
-        get client.introspection_uri
-      end
-      id_token = ResponseObject::IdToken.new hash
-      id_token.verify! client.identifier
-      id_token
-    end
-
     private
 
     def resource_request

data/lib/openid_connect/client.rb

@@ -1,3 +1,6 @@
+require 'rack/oauth2/client/error'
+require 'rack/oauth2/client/grant'
+
 module OpenIDConnect
   class Client < Rack::OAuth2::Client
     attr_optional :introspection_endpoint, :user_info_endpoint

data/lib/openid_connect.rb

@@ -1,6 +1,6 @@
 require 'json'
 require 'rack/oauth2'
-require 'rack/oauth2/server/id_token_support'
+require 'rack/oauth2/id_token_support'
 
 require 'openid_connect/exception'
 require 'openid_connect/client'

data/lib/rack/oauth2/id_token_support.rb

@@ -0,0 +1,42 @@
+module Rack::OAuth2
+  module IdTokenSupport
+    def self.included(klass)
+      klass.send :attr_optional, :id_token
+    end
+
+    module AccessTokenExt
+      def self.included(klass)
+        klass.send :include, IdTokenSupport
+        klass.class_eval do
+          def token_response_with_id_token(options = {})
+            token_response_without_id_token.merge(
+              :id_token => if id_token.respond_to?(:to_jwt)
+                id_token.to_jwt
+              else
+                id_token
+              end
+            )
+          end
+          alias_method_chain :token_response, :id_token
+        end
+      end
+    end
+    AccessToken::Bearer.send :include, IdTokenSupport, AccessTokenExt
+
+    module ServerResponseExt
+      def self.included(klass)
+        klass.send :include, IdTokenSupport
+        klass.class_eval do
+          def protocol_params_with_id_token
+            protocol_params_without_id_token.merge(
+              :id_token => id_token.try(:to_jwt)
+            )
+          end
+          alias_method_chain :protocol_params, :id_token
+        end
+      end
+    end
+    Server::Token::Response.send :include, ServerResponseExt
+    Server::Authorize::Token::Response.send :include, ServerResponseExt
+  end
+end

data/spec/mock_response/access_token/bearer_with_id_token.json

@@ -0,0 +1,7 @@
+{
+  "access_token":"access_token",
+  "id_token":"id_token",
+  "refresh_token":"refresh_token",
+  "token_type":"bearer",
+  "expires_in":3600
+}

data/spec/openid_connect/access_token_spec.rb

@@ -1,25 +1,68 @@
 require 'spec_helper'
 
 describe OpenIDConnect::AccessToken do
-  subject { token }
+  subject { access_token }
   let :client do
     OpenIDConnect::Client.new(
       :identifier => 'client_id',
       :host => 'server.example.com'
     )
   end
-  let :token do
+  let :access_token do
     OpenIDConnect::AccessToken.new(
       :access_token => 'access_token',
       :client => client
     )
   end
+
   its(:token_type) { should == :bearer }
+  its(:optional_attributes) { should include :id_token }
+
+  context 'when id_token is given' do
+    subject { access_token }
+    let :access_token do
+      OpenIDConnect::AccessToken.new(
+        :access_token => 'access_token',
+        :id_token => id_token,
+        :client => client
+      )
+    end
+
+    context 'when IdToken object' do
+      let :id_token do
+        OpenIDConnect::ResponseObject::IdToken.new(
+          :iss => 'https://server.example.com',
+          :user_id => 'user_id',
+          :aud => 'client_id',
+          :exp => 1313424327,
+          :secret => 'secret'
+        )
+      end
+      its(:id_token) { should be_a OpenIDConnect::ResponseObject::IdToken }
+      describe '#token_response' do
+        let(:token_response) { access_token.token_response }
+        it 'should stringfy it' do
+          token_response[:id_token].should be_a String
+        end
+      end
+    end
+
+    context 'when JWT string' do
+      let(:id_token) { 'id_token' }
+      its(:id_token) { should == 'id_token' }
+      describe '#token_response' do
+        let(:token_response) { access_token.token_response }
+        it 'should keep it as is' do
+          token_response[:id_token].should == 'id_token'
+        end
+      end
+    end
+  end
 
   describe '#user_info!' do
     it 'should return OpenIDConnect::ResponseObject::UserInfo::OpenID' do
       mock_json :get, client.user_info_uri, 'user_info/openid', :HTTP_AUTHORIZATION => 'Bearer access_token' do
-        token.user_info!.should be_a OpenIDConnect::ResponseObject::UserInfo::OpenID
+        access_token.user_info!.should be_a OpenIDConnect::ResponseObject::UserInfo::OpenID
       end
     end
 
@@ -27,7 +70,7 @@ describe OpenIDConnect::AccessToken do
       context 'when bad_request' do
         it 'should raise OpenIDConnect::Forbidden' do
           mock_json :get, client.user_info_uri, 'errors/invalid_request', :HTTP_AUTHORIZATION => 'Bearer access_token', :status => 400 do
-            expect { token.user_info! }.should raise_error OpenIDConnect::BadRequest
+            expect { access_token.user_info! }.should raise_error OpenIDConnect::BadRequest
           end
         end
       end
@@ -35,7 +78,7 @@ describe OpenIDConnect::AccessToken do
       context 'when unauthorized' do
         it 'should raise OpenIDConnect::Unauthorized' do
           mock_json :get, client.user_info_uri, 'errors/invalid_access_token', :HTTP_AUTHORIZATION => 'Bearer access_token', :status => 401 do
-            expect { token.user_info! }.should raise_error OpenIDConnect::Unauthorized
+            expect { access_token.user_info! }.should raise_error OpenIDConnect::Unauthorized
           end
         end
       end
@@ -43,7 +86,7 @@ describe OpenIDConnect::AccessToken do
       context 'when forbidden' do
         it 'should raise OpenIDConnect::Forbidden' do
           mock_json :get, client.user_info_uri, 'errors/insufficient_scope', :HTTP_AUTHORIZATION => 'Bearer access_token', :status => 403 do
-            expect { token.user_info! }.should raise_error OpenIDConnect::Forbidden
+            expect { access_token.user_info! }.should raise_error OpenIDConnect::Forbidden
           end
         end
       end
@@ -51,33 +94,10 @@ describe OpenIDConnect::AccessToken do
       context 'when unknown' do
         it 'should raise OpenIDConnect::HttpError' do
           mock_json :get, client.user_info_uri, 'errors/unknown', :HTTP_AUTHORIZATION => 'Bearer access_token', :status => 500 do
-            expect { token.user_info! }.should raise_error OpenIDConnect::HttpError
+            expect { access_token.user_info! }.should raise_error OpenIDConnect::HttpError
           end
         end
       end
     end
   end
-
-  describe '#id_token!' do
-    it 'should return OpenIDConnect::ResponseObject::IdToken' do
-      mock_json :get, client.introspection_uri, 'id_token', :HTTP_AUTHORIZATION => 'Bearer access_token' do
-        token.id_token!.should be_a OpenIDConnect::ResponseObject::IdToken
-      end
-    end
-
-    context 'when invalid client is given' do
-      let :client do
-        OpenIDConnect::Client.new(
-          :identifier => 'invalid_client',
-          :host => 'server.example.com'
-        )
-      end
-
-      it 'should raise OpenIDConnect::ResponseObject::IdToken::InvalidToken' do
-        mock_json :get, client.introspection_uri, 'id_token', :HTTP_AUTHORIZATION => 'Bearer access_token' do
-          expect { token.id_token! }.should raise_error OpenIDConnect::ResponseObject::IdToken::InvalidToken
-        end
-      end
-    end
-  end
 end

data/spec/openid_connect/client_spec.rb

@@ -80,12 +80,23 @@ describe OpenIDConnect::Client do
         :code => 'code'
       }
     end
+    let :access_token do
+      client.authorization_code = 'code'
+      client.access_token!
+    end
 
     context 'when bearer token is returned' do
       it 'should return OpenIDConnect::AccessToken' do
         mock_json :post, client.token_endpoint, 'access_token/bearer', :params => protocol_params do
-          client.authorization_code = 'code'
-          client.access_token!.should be_a OpenIDConnect::AccessToken
+          access_token.should be_a OpenIDConnect::AccessToken
+        end
+      end
+
+      context 'when id_token is returned' do
+        it 'should include id_token' do
+          mock_json :post, client.token_endpoint, 'access_token/bearer_with_id_token', :params => protocol_params do
+            access_token.id_token.should == 'id_token'
+          end
         end
       end
     end
@@ -93,8 +104,7 @@ describe OpenIDConnect::Client do
     context 'otherwise' do
       it 'should raise Unexpected Token Type exception' do
         mock_json :post, client.token_endpoint, 'access_token/mac', :params => protocol_params do
-          client.authorization_code = 'code'
-          expect { client.access_token! }.should raise_error OpenIDConnect::Exception, 'Unexpected Token Type: mac'
+          expect { access_token }.should raise_error OpenIDConnect::Exception, 'Unexpected Token Type: mac'
         end
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: openid_connect
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - nov matake
@@ -171,10 +171,11 @@ files:
 - lib/openid_connect/response_object/user_info.rb
 - 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/id_token_support.rb
+- lib/rack/oauth2/id_token_support.rb
 - openid_connect.gemspec
 - spec/helpers/webmock_helper.rb
 - spec/mock_response/access_token/bearer.json
+- spec/mock_response/access_token/bearer_with_id_token.json
 - spec/mock_response/access_token/mac.json
 - spec/mock_response/errors/insufficient_scope.json
 - spec/mock_response/errors/invalid_access_token.json
@@ -224,6 +225,7 @@ summary: OpenID Connect Server & Client Library
 test_files: 
 - spec/helpers/webmock_helper.rb
 - spec/mock_response/access_token/bearer.json
+- spec/mock_response/access_token/bearer_with_id_token.json
 - spec/mock_response/access_token/mac.json
 - spec/mock_response/errors/insufficient_scope.json
 - spec/mock_response/errors/invalid_access_token.json

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

@@ -1,21 +0,0 @@
-module IdTokenSupport
-  def self.included(klass)
-    klass.send :attr_optional, :id_token
-    klass.class_eval do
-      def protocol_params_with_id_token
-        protocol_params_without_id_token.merge(
-          :id_token => id_token.try(:to_jwt)
-        )
-      end
-      alias_method_chain :protocol_params, :id_token
-    end
-  end
-end
-
-class Rack::OAuth2::Server::Token::Response
-  include TokenWithIdToken
-end
-
-class Rack::OAuth2::Server::Authorize::Token::Response
-  include TokenWithIdToken
-end