openid_connect 0.0.32 → 0.0.33

data/VERSION

@@ -1 +1 @@
-0.0.32
+0.0.33

data/lib/openid_connect.rb

@@ -63,6 +63,5 @@ require 'openid_connect/exception'
 require 'openid_connect/client'
 require 'openid_connect/access_token'
 require 'openid_connect/response_object'
-require 'openid_connect/server'
 require 'openid_connect/discovery'
 require 'openid_connect/debugger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70144609969240 !ruby/object:Gem::Requirement
+  requirement: &70133003870780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70144609969240
+  version_requirements: *70133003870780
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70144609968320 !ruby/object:Gem::Requirement
+  requirement: &70133003869280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144609968320
+  version_requirements: *70133003869280
 - !ruby/object:Gem::Dependency
   name: attr_required
-  requirement: &70144609967380 !ruby/object:Gem::Requirement
+  requirement: &70133003868260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70144609967380
+  version_requirements: *70133003868260
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70144609959280 !ruby/object:Gem::Requirement
+  requirement: &70133003867720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70144609959280
+  version_requirements: *70133003867720
 - !ruby/object:Gem::Dependency
   name: validate_url
-  requirement: &70144609958200 !ruby/object:Gem::Requirement
+  requirement: &70133003867260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144609958200
+  version_requirements: *70133003867260
 - !ruby/object:Gem::Dependency
   name: validate_email
-  requirement: &70144609956520 !ruby/object:Gem::Requirement
+  requirement: &70133003866700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144609956520
+  version_requirements: *70133003866700
 - !ruby/object:Gem::Dependency
   name: json-jwt
-  requirement: &70144609955380 !ruby/object:Gem::Requirement
+  requirement: &70133003866120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70144609955380
+  version_requirements: *70133003866120
 - !ruby/object:Gem::Dependency
   name: swd
-  requirement: &70144609953140 !ruby/object:Gem::Requirement
+  requirement: &70133003865600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70144609953140
+  version_requirements: *70133003865600
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
-  requirement: &70144609952600 !ruby/object:Gem::Requirement
+  requirement: &70133003865040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70144609952600
+  version_requirements: *70133003865040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70144609951520 !ruby/object:Gem::Requirement
+  requirement: &70133003864480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70144609951520
+  version_requirements: *70133003864480
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70144609946820 !ruby/object:Gem::Requirement
+  requirement: &70133003863680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70144609946820
+  version_requirements: *70133003863680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144609945900 !ruby/object:Gem::Requirement
+  requirement: &70133003862600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70144609945900
+  version_requirements: *70133003862600
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70144609944820 !ruby/object:Gem::Requirement
+  requirement: &70133003861140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70144609944820
+  version_requirements: *70133003861140
 description: OpenID Connect Server & Client Library
 email:
 - nov@matake.jp
@@ -191,9 +191,6 @@ 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/openid_connect/server.rb
-- lib/openid_connect/server/id_token.rb
-- lib/openid_connect/server/id_token/error.rb
 - lib/rack/oauth2/server/authorize/extension/code_and_id_token.rb
 - lib/rack/oauth2/server/authorize/extension/id_token.rb
 - lib/rack/oauth2/server/authorize/extension/id_token_and_token.rb
@@ -227,7 +224,6 @@ files:
 - spec/openid_connect/response_object/user_info/open_id/address_spec.rb
 - spec/openid_connect/response_object/user_info/open_id_spec.rb
 - spec/openid_connect/response_object_spec.rb
-- spec/openid_connect/server/id_token_spec.rb
 - spec/openid_connect_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
@@ -288,7 +284,6 @@ test_files:
 - spec/openid_connect/response_object/user_info/open_id/address_spec.rb
 - spec/openid_connect/response_object/user_info/open_id_spec.rb
 - spec/openid_connect/response_object_spec.rb
-- spec/openid_connect/server/id_token_spec.rb
 - spec/openid_connect_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

data/lib/openid_connect/server.rb

@@ -1 +0,0 @@
-require 'openid_connect/server/id_token'

data/lib/openid_connect/server/id_token.rb

@@ -1,46 +0,0 @@
-module OpenIDConnect
-  module Server
-    class IdToken < Rack::OAuth2::Server::Abstract::Handler
-      def call(env)
-        @request  = Request.new(env)
-        @response = Response.new(request)
-        super.finish
-      rescue Rack::OAuth2::Server::Abstract::Error => e
-        e.finish
-      end
-
-      class Request < Rack::OAuth2::Server::Abstract::Request
-        attr_required :id_token
-
-        # NOTE: client_id is required in Rack::OAuth2 and should not exist here.
-        undef_method :client_id, :client_id=
-        @required_attributes.delete :client_id
-
-        def initialize(env)
-          super
-          @id_token  = params['id_token']
-          attr_missing!
-        end
-      end
-
-      class Response < Rack::OAuth2::Server::Abstract::Response
-        attr_required :id_token
-
-        def protocol_params
-          id_token.as_json
-        end
-
-        def finish
-          attr_missing!
-          write Rack::OAuth2::Util.compact_hash(protocol_params).to_json
-          header['Content-Type'] = 'application/json'
-          header['Cache-Control'] = 'no-store'
-          header['Pragma'] = 'no-cache'
-          super
-        end
-      end
-    end
-  end
-end
-
-require 'openid_connect/server/id_token/error'

data/lib/openid_connect/server/id_token/error.rb

@@ -1,30 +0,0 @@
-module OpenIDConnect
-  module Server
-    class IdToken
-      class BadRequest < Rack::OAuth2::Server::Abstract::BadRequest; end
-
-      module ErrorMethods
-        DEFAULT_DESCRIPTION = {
-          :invalid_request => "The request is missing a required parameter.",
-          :invalid_id_token => "The ID Token is not valid for the requested resource, is malformed, is in an incorrect format, or is expired."
-        }
-
-        def self.included(klass)
-          DEFAULT_DESCRIPTION.each do |error, default_description|
-            klass.class_eval <<-ERROR
-              def #{error}!(description = "#{default_description}", options = {})
-                bad_request! :#{error}, description, options
-              end
-            ERROR
-          end
-        end
-
-        def bad_request!(error, description = nil, options = {})
-          raise BadRequest.new(error, description, options)
-        end
-      end
-
-      Request.send :include, ErrorMethods
-    end
-  end
-end

data/spec/openid_connect/server/id_token_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper.rb'
-
-describe OpenIDConnect::Server::IdToken do
-  let(:request)     { Rack::MockRequest.new app }
-  let :app do
-    OpenIDConnect::Server::IdToken.new do |req, res|
-      res.id_token = id_token
-    end
-  end
-  let :env do
-    Rack::MockRequest.env_for(
-      '/id_token',
-      :params => params
-    )
-  end
-  let :params do
-    {:id_token => id_token.to_jwt(private_key) }
-  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
-  subject { request.post('/id_token', :params => params) }
-
-  context 'when valid id_token is given' do
-    it 'should extract it' do
-      status, header, response = app.call(env)
-      status.should == 200
-      json = response.body.first
-      json.should include '"aud":"client_id"'
-      json.should include '"user_id":"user_id"'
-      json.should include '"exp":1313424327'
-      json.should include '"iss":"https://server.example.com"'
-    end
-  end
-
-  context 'otherwise' do
-    context 'when missing' do
-      let :params do
-        {}
-      end
-      it do
-        status, header, response = app.call(env)
-        status.should == 400
-        response.body.first.should include '"error":"invalid_request"'
-      end
-    end
-
-    context 'when rejected by authenticator' do
-      let :app do
-        OpenIDConnect::Server::IdToken.new do |req, res|
-          req.invalid_id_token! 'Expired or Invalid Format'
-        end
-      end
-      it do
-        status, header, response = app.call(env)
-        status.should == 400
-        response.body.first.should include '"error":"invalid_id_token"'
-      end
-    end
-  end
-end