openid_connect 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.0.2)
+    openid_connect (0.0.3)
       activemodel (>= 3)
       attr_required (>= 0.0.3)
       json (>= 1.4.3)
@@ -14,16 +14,16 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.9)
+      i18n (~> 0.4)
+    activesupport (3.0.5)
     attr_required (0.0.3)
     builder (2.1.2)
     diff-lcs (1.1.2)
     httpclient (2.2.1)
-    i18n (0.5.0)
+    i18n (0.6.0)
     json (1.5.3)
     jwt (0.1.3)
       json (>= 1.2.4)
@@ -34,7 +34,7 @@ GEM
     mime-types (1.16)
     polyglot (0.3.2)
     rack (1.3.2)
-    rack-oauth2 (0.9.1)
+    rack-oauth2 (0.9.2)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/openid_connect.rb

@@ -3,6 +3,7 @@ require 'rack/oauth2'
 require 'rack/oauth2/server/authorize/extension/id_token'
 require 'rack/oauth2/server/authorize/extension/id_token_and_token'
 
+require 'openid_connect/exception'
 require 'openid_connect/client'
 require 'openid_connect/access_token'
 require 'openid_connect/response_object'

data/lib/openid_connect/access_token.rb

@@ -5,25 +5,26 @@ module OpenIDConnect
     def user_info!(scheme = :openid)
       klass = case scheme
       when :openid
-        UserInfo::OpenID
+        ResponseObject::UserInfo::OpenID
       else
         raise "Unknown Scheme: #{scheme}"
       end
-      klass.new resource_request do
-        get absolute_uri_for(user_info_endpoint)
+      hash = resource_request do
+        get client.user_info_uri
       end
+      klass.new hash
     end
 
     def id_token!
-      IdToken.new resource_request do
-        get absolute_uri_for(introspection_endpoint)
+      hash = resource_request do
+        get client.introspection_uri
       end
+      ResponseObject::IdToken.new hash
     end
 
     private
 
     def resource_request
-      access_token_requied!
       res = yield
       case res.status
       when 200

data/lib/openid_connect/client.rb

@@ -22,6 +22,14 @@ module OpenIDConnect
       AccessToken.new token.token_response.merge(:client => self)
     end
 
+    def introspection_uri
+      absolute_uri_for introspection_endpoint
+    end
+
+    def user_info_uri
+      absolute_uri_for user_info_endpoint
+    end
+
     private
 
     def setup_required_scope(scopes)

data/lib/openid_connect/response_object.rb

@@ -20,6 +20,10 @@ module OpenIDConnect
       required_attributes + optional_attributes
     end
 
+    def hidden_attributes
+      nil
+    end
+
     def require_at_least_one_attributes
       all_blank = all_attriutes.all? do |key|
         self.send(key).blank?
@@ -28,7 +32,7 @@ module OpenIDConnect
     end
 
     def as_json(options = {})
-      all_attriutes.inject({}) do |hash, _attr_|
+      (all_attriutes - Array(hidden_attributes)).inject({}) do |hash, _attr_|
         hash.merge! _attr_ => self.send(_attr_)
       end.delete_if do |key, value|
         value.nil?

data/lib/openid_connect/response_object/id_token.rb

@@ -3,15 +3,11 @@ require 'jwt'
 module OpenIDConnect
   class ResponseObject
     class IdToken < ResponseObject
-      attr_required :iss, :user_id, :aud, :exp, :secret
-      attr_optional :iso29115, :nonce, :issued_to
+      attr_required :iss, :user_id, :aud, :exp
+      attr_optional :iso29115, :nonce, :issued_to, :secret
 
-      def as_json
-        (required_attributes + optional_attributes - [:secret]).inject({}) do |hash, key|
-          hash.merge! key => self.send(key)
-        end.delete_if do |key, value|
-          value.nil?
-        end
+      def hidden_attributes
+        :secret
       end
 
       def to_jwt

data/spec/openid_connect/response_object/id_token_spec.rb

@@ -6,6 +6,6 @@ describe OpenIDConnect::ResponseObject::IdToken do
   describe 'attributes' do
     subject { klass }
     its(:required_attributes) { should == [:iss, :user_id, :aud, :exp] }
-    its(:optional_attributes) { should == [:iso29115, :nonce, :issued_to] }
+    its(:optional_attributes) { should == [:iso29115, :nonce, :issued_to, :secret] }
   end
 end

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

@@ -7,6 +7,15 @@ describe Rack::OAuth2::Server::Authorize::Extension::IdTokenAndToken do
   let(:response) do
     request.get("/?response_type=id_token%20token&client_id=client&redirect_uri=#{redirect_uri}")
   end
+  let(:id_token) do
+    OpenIDConnect::ResponseObject::IdToken.new(
+      :iss => 'iss',
+      :user_id => 'user_id',
+      :aud => 'aud',
+      :exp => 10.minutes.from_now,
+      :secret => 'secret'
+    )
+  end
 
   context "when approved" do
     subject { response }
@@ -15,11 +24,12 @@ describe Rack::OAuth2::Server::Authorize::Extension::IdTokenAndToken do
       Rack::OAuth2::Server::Authorize.new do |request, response|
         response.redirect_uri = redirect_uri
         response.access_token = bearer_token
+        response.id_token = id_token
         response.approve!
       end
     end
     its(:status)   { should == 302 }
-    its(:location) { should == "#{redirect_uri}#access_token=#{access_token}&token_type=bearer" }
+    its(:location) { should == "#{redirect_uri}#access_token=#{access_token}&id_token=#{id_token.to_jwt}&token_type=bearer" }
 
     context 'when refresh_token is given' do
       let :bearer_token do
@@ -28,7 +38,7 @@ describe Rack::OAuth2::Server::Authorize::Extension::IdTokenAndToken do
           :refresh_token => 'refresh'
         )
       end
-      its(:location) { should == "#{redirect_uri}#access_token=#{access_token}&token_type=bearer" }
+      its(:location) { should == "#{redirect_uri}#access_token=#{access_token}&id_token=#{id_token.to_jwt}&token_type=bearer" }
     end
   end
 

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

@@ -3,33 +3,31 @@ require 'spec_helper'
 describe Rack::OAuth2::Server::Authorize::Extension::IdToken do
   let(:request)      { Rack::MockRequest.new app }
   let(:redirect_uri) { 'http://client.example.com/callback' }
-  let(:access_token) { 'access_token' }
   let(:response) do
     request.get("/?response_type=id_token&client_id=client&redirect_uri=#{redirect_uri}")
   end
+  let(:id_token) do
+    OpenIDConnect::ResponseObject::IdToken.new(
+      :iss => 'iss',
+      :user_id => 'user_id',
+      :aud => 'aud',
+      :exp => 10.minutes.from_now,
+      :secret => 'secret'
+    )
+  end
 
   context "when approved" do
     subject { response }
-    let(:bearer_token) { Rack::OAuth2::AccessToken::Bearer.new(:access_token => access_token) }
+    
     let :app do
       Rack::OAuth2::Server::Authorize.new do |request, response|
         response.redirect_uri = redirect_uri
-        response.access_token = bearer_token
+        response.id_token = id_token
         response.approve!
       end
     end
     its(:status)   { should == 302 }
-    its(:location) { should == "#{redirect_uri}#access_token=#{access_token}&token_type=bearer" }
-
-    context 'when refresh_token is given' do
-      let :bearer_token do
-        Rack::OAuth2::AccessToken::Bearer.new(
-          :access_token => access_token,
-          :refresh_token => 'refresh'
-        )
-      end
-      its(:location) { should == "#{redirect_uri}#access_token=#{access_token}&token_type=bearer" }
-    end
+    its(:location) { should == "#{redirect_uri}#id_token=#{id_token.to_jwt}" }
   end
 
   context 'when denied' do

metadata

@@ -2,7 +2,7 @@
 name: openid_connect
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - nov matake