openid_connect 0.0.7 → 0.0.8

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/openid_connect.rb

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

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

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

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

@@ -2,6 +2,7 @@ require 'spec_helper.rb'
 require 'rack/oauth2/server/authorize/extension/code_and_token'
 
 describe Rack::OAuth2::Server::Authorize::Extension::CodeAndToken do
+  subject { response }
   let(:request)      { Rack::MockRequest.new app }
   let(:response)     { request.get("/?response_type=code%20token&client_id=client") }
   let(:redirect_uri) { 'http://client.example.com/callback' }
@@ -17,7 +18,6 @@ describe Rack::OAuth2::Server::Authorize::Extension::CodeAndToken do
   end
 
   context "when id_token is given" do
-    subject { response }
     let :app do
       Rack::OAuth2::Server::Authorize.new do |request, response|
         response.redirect_uri = redirect_uri
@@ -32,7 +32,6 @@ describe Rack::OAuth2::Server::Authorize::Extension::CodeAndToken do
   end
 
   context "otherwise" do
-    subject { response }
     let :app do
       Rack::OAuth2::Server::Authorize.new do |request, response|
         response.redirect_uri = redirect_uri

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

@@ -1,6 +1,7 @@
 require 'spec_helper.rb'
 
 describe Rack::OAuth2::Server::Authorize::Token do
+  subject { response }
   let(:request)      { Rack::MockRequest.new app }
   let(:response)     { request.get("/?response_type=token&client_id=client") }
   let(:redirect_uri) { 'http://client.example.com/callback' }
@@ -16,7 +17,6 @@ describe Rack::OAuth2::Server::Authorize::Token do
   end
 
   context "when id_token is given" do
-    subject { response }
     let :app do
       Rack::OAuth2::Server::Authorize.new do |request, response|
         response.redirect_uri = redirect_uri
@@ -30,7 +30,6 @@ describe Rack::OAuth2::Server::Authorize::Token do
   end
 
   context "otherwise" do
-    subject { response }
     let :app do
       Rack::OAuth2::Server::Authorize.new do |request, response|
         response.redirect_uri = redirect_uri

data/spec/rack/oauth2/server/token/authorization_code_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper.rb'
+
+describe Rack::OAuth2::Server::Token::AuthorizationCode do
+  subject { response }
+  let(:request) { Rack::MockRequest.new app }
+  let :response do
+    request.post('/', :params => {
+      :grant_type => 'authorization_code',
+      :client_id => 'client_id',
+      :code => 'authorization_code',
+      :redirect_uri => 'http://client.example.com/callback'
+    })
+  end
+  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
+
+  context "when id_token is given" do
+    let :app do
+      Rack::OAuth2::Server::Token.new do |request, response|
+        response.access_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token')
+        response.id_token = id_token
+      end
+    end
+    its(:status) { should == 200 }
+    its(:body)   { should include "\"id_token\":\"#{id_token.to_jwt}\"" }
+  end
+
+  context "otherwise" do
+    let :app do
+      Rack::OAuth2::Server::Token.new do |request, response|
+        response.access_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token')
+      end
+    end
+    its(:status) { should == 200 }
+    its(:body)   { should_not include "id_token" }
+  end
+end

data/spec/rack/oauth2/server/token/refresh_token_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper.rb'
+
+describe Rack::OAuth2::Server::Token::RefreshToken do
+  subject { response }
+  let(:request) { Rack::MockRequest.new app }
+  let :response do
+    request.post('/', :params => {
+      :grant_type => "refresh_token",
+      :client_id => "client_id",
+      :refresh_token => "refresh_token"
+    })
+  end
+  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
+
+  context "when id_token is given" do
+    let :app do
+      Rack::OAuth2::Server::Token.new do |request, response|
+        response.access_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token')
+        response.id_token = id_token
+      end
+    end
+    its(:status) { should == 200 }
+    its(:body)   { should include "\"id_token\":\"#{id_token.to_jwt}\"" }
+  end
+
+  context "otherwise" do
+    let :app do
+      Rack::OAuth2::Server::Token.new do |request, response|
+        response.access_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token')
+      end
+    end
+    its(:status) { should == 200 }
+    its(:body)   { should_not include "id_token" }
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: openid_connect
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 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/server/authorize/token_with_id_token.rb
+- lib/rack/oauth2/server/id_token_support.rb
 - openid_connect.gemspec
 - spec/helpers/webmock_helper.rb
 - spec/mock_response/access_token/bearer.json
@@ -191,6 +191,8 @@ files:
 - spec/openid_connect/response_object_spec.rb
 - spec/rack/oauth2/server/authorize/code_and_token_spec.rb
 - spec/rack/oauth2/server/authorize/token_spec.rb
+- spec/rack/oauth2/server/token/authorization_code_spec.rb
+- spec/rack/oauth2/server/token/refresh_token_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/nov/openid_connect
 licenses: []
@@ -238,4 +240,6 @@ test_files:
 - spec/openid_connect/response_object_spec.rb
 - spec/rack/oauth2/server/authorize/code_and_token_spec.rb
 - spec/rack/oauth2/server/authorize/token_spec.rb
+- spec/rack/oauth2/server/token/authorization_code_spec.rb
+- spec/rack/oauth2/server/token/refresh_token_spec.rb
 - spec/spec_helper.rb

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

@@ -1,10 +0,0 @@
-class Rack::OAuth2::Server::Authorize::Token::Response
-  attr_optional :id_token
-
-  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