openid_connect 0.2.3 → 0.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.2.1)
+    openid_connect (0.2.3)
       activemodel (>= 3)
       attr_required (>= 0.0.5)
       json (>= 1.4.3)

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/openid_connect/request_object/claimable.rb

@@ -13,7 +13,7 @@ module OpenIDConnect
           _claims_ = {}
           claims.each do |key, value|
             _claims_[key] = case value.to_s
-            when 'optional'
+            when 'optional', 'voluntary'
               {
                 :essential => false
               }
@@ -39,12 +39,14 @@ module OpenIDConnect
       end
 
       def required?(claim)
-        accessible?(claim) && !optional?(claim)
+        accessible?(claim) && claims[claim].is_a?(Hash) && claims[claim][:essential]
       end
+      alias_method :essential?, :required?
 
       def optional?(claim)
-        accessible?(claim) && claims[claim].is_a?(Hash) && claims[claim][:optional]
+        accessible?(claim) && !required?(claim)
       end
+      alias_method :voluntary?, :optional?
 
       def accessible?(claim)
         claims.try(:include?, claim)

data/spec/openid_connect/request_object_spec.rb

@@ -32,7 +32,7 @@ describe OpenIDConnect::RequestObject do
       }
     end
     let(:jwtnized) do
-      'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjbGllbnRfaWQiOiJjbGllbnRfaWQiLCJyZXNwb25zZV90eXBlIjoidG9rZW4gaWRfdG9rZW4iLCJyZWRpcmVjdF91cmkiOiJodHRwczovL2NsaWVudC5leGFtcGxlLmNvbSIsInNjb3BlIjoib3BlbmlkIGVtYWlsIiwic3RhdGUiOiJzdGF0ZTEyMzQiLCJub25jZSI6Im5vbmNlMTIzNCIsImRpc3BsYXkiOiJ0b3VjaCIsInByb21wdCI6Im5vbmUiLCJpZF90b2tlbiI6eyJjbGFpbXMiOnsiYWNyIjp7InZhbHVlcyI6WyIyIiwiMyIsIjQiXX19LCJtYXhfYWdlIjoxMH0sInVzZXJpbmZvIjp7ImNsYWltcyI6eyJuYW1lIjpudWxsLCJlbWFpbCI6eyJvcHRpb25hbCI6dHJ1ZX19fX0.ARgNywrsRkQtTFIqWnl38JLDYfb2g91yLY04l5-yQvQ'
+      'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjbGllbnRfaWQiOiJjbGllbnRfaWQiLCJyZXNwb25zZV90eXBlIjoidG9rZW4gaWRfdG9rZW4iLCJyZWRpcmVjdF91cmkiOiJodHRwczovL2NsaWVudC5leGFtcGxlLmNvbSIsInNjb3BlIjoib3BlbmlkIGVtYWlsIiwic3RhdGUiOiJzdGF0ZTEyMzQiLCJub25jZSI6Im5vbmNlMTIzNCIsImRpc3BsYXkiOiJ0b3VjaCIsInByb21wdCI6Im5vbmUiLCJpZF90b2tlbiI6eyJjbGFpbXMiOnsiYWNyIjp7InZhbHVlcyI6WyIyIiwiMyIsIjQiXX19LCJtYXhfYWdlIjoxMH0sInVzZXJpbmZvIjp7ImNsYWltcyI6eyJuYW1lIjp7ImVzc2VudGlhbCI6dHJ1ZX0sImVtYWlsIjp7ImVzc2VudGlhbCI6ZmFsc2V9fX19.MLTDQVPdhAdkJhboM06IRtjHJrvamJ_H2vFGRupXmTA'
     end
     let(:jsonized) do
       {
@@ -54,9 +54,11 @@ describe OpenIDConnect::RequestObject do
         },
         :userinfo => {
           :claims => {
-            :name => nil,
+            :name => {
+              :essential => true
+            },
             :email => {
-              :optional => true
+              :essential => false
             }
           }
         }

data/spec/openid_connect/response_object/id_token_spec.rb

@@ -19,7 +19,7 @@ describe OpenIDConnect::ResponseObject::IdToken do
   describe 'attributes' do
     subject { klass }
     its(:required_attributes) { should == [:iss, :user_id, :aud, :exp, :iat] }
-    its(:optional_attributes) { should == [:acr, :auth_time, :nonce, :at_hash] }
+    its(:optional_attributes) { should == [:acr, :auth_time, :nonce, :at_hash, :c_hash] }
   end
 
   describe '#verify!' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors: