openid_connect 0.0.9 → 0.0.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.0.8)
+    openid_connect (0.0.9)
       activemodel (>= 3)
       attr_required (>= 0.0.3)
       json (>= 1.4.3)

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/openid_connect.rb

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

data/lib/openid_connect/access_token.rb

@@ -1,6 +1,7 @@
 module OpenIDConnect
   class AccessToken < Rack::OAuth2::AccessToken::Bearer
     attr_required :client
+    attr_optional :id_token
 
     def initialize(attributes = {})
       super

data/lib/openid_connect/client.rb

@@ -1,14 +1,11 @@
-require 'rack/oauth2/client/error'
-require 'rack/oauth2/client/grant'
-
 module OpenIDConnect
   class Client < Rack::OAuth2::Client
-    attr_optional :introspection_endpoint, :user_info_endpoint
+    attr_optional :check_session_endpoint, :user_info_endpoint
 
     def initialize(attributes = {})
       super
       @user_info_endpoint     ||= '/user_info'
-      @introspection_endpoint ||= '/id_tokens'
+      @check_session_endpoint ||= '/id_token'
     end
 
     def authorization_uri(params = {})
@@ -20,14 +17,8 @@ module OpenIDConnect
       )
     end
 
-    def access_token!
-      token = super
-      raise Exception.new("Unexpected Token Type: #{token.token_type}") unless token.token_type == :bearer
-      AccessToken.new token.token_response.merge(:client => self)
-    end
-
-    def introspection_uri
-      absolute_uri_for introspection_endpoint
+    def check_session_uri
+      absolute_uri_for check_session_endpoint
     end
 
     def user_info_uri
@@ -44,5 +35,17 @@ module OpenIDConnect
         (scopes << 'openid')
       end.join(' ')
     end
+
+    def handle_success_response(response)
+      token_hash = JSON.parse(response.body).with_indifferent_access
+      case token_type = token_hash[:token_type].try(:downcase)
+      when 'bearer'
+        AccessToken.new token_hash.merge(:client => self)
+      else
+        raise Exception.new("Unexpected Token Type: #{token_type}")
+      end
+    rescue JSON::ParserError
+      raise Exception.new("Unknown Token Type")
+    end
   end
 end

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

@@ -0,0 +1,17 @@
+module Rack::OAuth2::Server
+  module IdTokenResponse
+    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
+  Token::Response.send :include, IdTokenResponse
+  Authorize::Token::Response.send :include, IdTokenResponse
+end

data/spec/openid_connect/access_token_spec.rb

@@ -39,23 +39,13 @@ describe OpenIDConnect::AccessToken do
         )
       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
+      its(:token_response) { should_not include :id_token }
     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
+      its(:token_response) { should_not include :id_token }
     end
   end
 

data/spec/openid_connect/client_spec.rb

@@ -19,12 +19,12 @@ describe OpenIDConnect::Client do
       end
       its(:authorization_uri) { should include 'https://server.example.com/oauth2/authorize' }
       its(:authorization_uri) { should include 'scope=openid' }
-      its(:introspection_uri) { should == 'https://server.example.com/id_tokens' }
+      its(:check_session_uri) { should == 'https://server.example.com/id_token' }
       its(:user_info_uri)     { should == 'https://server.example.com/user_info' }
     end
 
     context 'otherwise' do
-      [:authorization_uri, :introspection_uri, :user_info_uri].each do |endpoint|
+      [:authorization_uri, :check_session_uri, :user_info_uri].each do |endpoint|
         describe endpoint do
           it do
             expect { client.send endpoint }.should raise_error 'No Host Info'

data/spec/openid_connect/response_object/user_info/open_id_spec.rb

@@ -94,8 +94,7 @@ describe OpenIDConnect::ResponseObject::UserInfo::OpenID do
         }
       }
     end
-    its(:to_json) do
-      should == attributes.to_json
-    end
+    its(:to_json) { should include '"id":"http://example.com/nov.matake#12345"'}
+    its(:to_json) { should include '"address":{"formatted":"Tokyo, Japan"}'}
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: openid_connect
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - nov matake
@@ -171,7 +171,7 @@ 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/id_token_support.rb
+- lib/rack/oauth2/server/id_token_response.rb
 - openid_connect.gemspec
 - spec/helpers/webmock_helper.rb
 - spec/mock_response/access_token/bearer.json

data/lib/rack/oauth2/id_token_support.rb

@@ -1,42 +0,0 @@
-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