openid_connect 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/openid_connect/request_object/claimable.rb

@@ -12,13 +12,15 @@ module OpenIDConnect
         if claims.present?
           _claims_ = {}
           claims.each do |key, value|
-            _claims_[key] = case value
-            when :optional, 'optional'
+            _claims_[key] = case value.to_s
+            when 'optional'
               {
-                :optional => true
+                :essential => false
+              }
+            when 'required', 'essential'
+              {
+                :essential => true
               }
-            when :required, 'required'
-              nil
             else
               value
             end

data/lib/openid_connect/response_object/id_token.rb

@@ -6,7 +6,7 @@ module OpenIDConnect
       class InvalidToken < Exception; end
 
       attr_required :iss, :user_id, :aud, :exp, :iat
-      attr_optional :acr, :auth_time, :nonce, :at_hash
+      attr_optional :acr, :auth_time, :nonce, :at_hash, :c_hash
 
       def initialize(attributes = {})
         super

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

@@ -0,0 +1,34 @@
+module Rack
+  module OAuth2
+    module Server
+      class Authorize
+        module ErrorWithConnectExt
+          DEFAULT_DESCRIPTION = {
+            :invalid_redirect_uri => 'The redirect_uri in the request does not match any of pre-registered redirect_uris.',
+            :interaction_required => 'End-User interaction required.',
+            :login_required => 'End-User authentication required.',
+            :session_selection_required => 'The End-User is required to select a session at the Authorization Server.',
+            :consent_required => 'End-User consent required.',
+            :invalid_request_uri => 'The request_uri in the request returns an error or invalid data.',
+            :invalid_openid_request_object => 'The request parameter contains an invalid OpenID Request Object.'
+          }
+
+          def self.included(klass)
+            DEFAULT_DESCRIPTION.each do |error, default_description|
+              # NOTE:
+              #  Connect Message spec doesn't say anything about HTTP status code for each error code.
+              #  It probably means "use 400".
+              error_method = :bad_request!
+              klass.class_eval <<-ERROR
+                def #{error}!(description = "#{default_description}", options = {})
+                  #{error_method} :#{error}, description, options
+                end
+              ERROR
+            end
+          end
+        end
+        Request.send :include, ErrorWithConnectExt
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 class Rack::OAuth2::Server::Authorize
   module RequestWithConnectParams
-    CONNECT_EXT_PARAMS = [:nonce, :display, :prompt, :request, :request_uri]
+    CONNECT_EXT_PARAMS = [:nonce, :display, :prompt, :request, :request_uri, :id_token]
 
     def self.included(klass)
       klass.send :attr_optional, *CONNECT_EXT_PARAMS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -261,6 +261,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/error_with_connect_ext.rb
 - lib/rack/oauth2/server/authorize/extension/code_and_id_token.rb
 - lib/rack/oauth2/server/authorize/extension/code_and_id_token_and_token.rb
 - lib/rack/oauth2/server/authorize/extension/id_token.rb