openid_connect 0.4.0 → 0.4.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.3.7)
+    openid_connect (0.4.1)
       activemodel (>= 3)
       attr_required (>= 0.0.5)
       json (>= 1.4.3)
@@ -15,10 +15,10 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activesupport (3.2.8)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
@@ -35,18 +35,17 @@ GEM
     httpclient (2.3.0.1)
     i18n (0.6.1)
     json (1.7.5)
-    json (1.7.5-java)
-    json-jwt (0.3.3)
+    json-jwt (0.4.0)
       activesupport (>= 2.3)
       i18n
       json (>= 1.4.3)
       url_safe_base64
-    mail (2.4.4)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    multi_json (1.3.6)
+    multi_json (1.5.0)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-oauth2 (1.0.0)
@@ -56,32 +55,32 @@ GEM
       i18n
       multi_json (>= 1.3.6)
       rack (>= 1.1)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rake (10.0.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
+    rspec-mocks (2.12.0)
     swd (0.2.1)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.2.1)
       i18n
       json (>= 1.4.3)
-    treetop (1.4.11)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.35)
     url_safe_base64 (0.2.1)
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
     validate_url (0.2.0)
       activemodel (>= 3.0.0)
-    webmock (1.8.11)
+    webmock (1.9.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yamler (0.1.0)

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/openid_connect/response_object/id_token.rb

@@ -72,8 +72,8 @@ module OpenIDConnect
         def self_issued(attributes = {})
           attributes[:user_jwk] ||= JSON::JWK.new attributes.delete(:public_key)
           _attributes_ = {
-            iss:      'https://self-issued.me',
-            user_id:  self_issued_user_id(attributes[:user_jwk])
+            iss:     'https://self-issued.me',
+            user_id: self_issued_user_id(attributes[:user_jwk])
           }.merge(attributes)
           new _attributes_
         end
@@ -81,7 +81,7 @@ module OpenIDConnect
         def self_issued_user_id(jwk)
           user_id_base_string = case jwk[:alg].to_s
           when 'RSA'
-            [jwk[:mod], jwk[:xpo]].join
+            [jwk[:n], jwk[:e]].join
           when 'EC'
             raise NotImplementedError.new('Not Implemented Yet')
           else

data/lib/openid_connect/response_object/user_info/open_id.rb

@@ -5,23 +5,23 @@ module OpenIDConnect
         attr_optional(
           :user_id,
           :name,
-          :family_name,
           :given_name,
+          :family_name,
           :middle_name,
           :nickname,
           :preferred_username,
           :profile,
           :picture,
           :website,
+          :email,
+          :email_verified,
           :gender,
-          :birthday,
+          :birthdate,
           :zoneinfo,
           :locale,
-          :updated_time,
-          :email,
-          :email_verified,
+          :phone_number,
           :address,
-          :phone_number
+          :updated_time
         )
 
         validates :email_verified, inclusion: {in: [true, false]},                             allow_nil: true
@@ -57,6 +57,6 @@ module OpenIDConnect
   end
 end
 
-Dir[File.dirname(__FILE__) + '/open_id/*.rb'].each do |file| 
+Dir[File.dirname(__FILE__) + '/open_id/*.rb'].each do |file|
   require file
 end

data/spec/mock_response/public_keys/jwk.json

@@ -1,7 +1,7 @@
 {
   "keys": [{
     "alg": "RSA",
-    "xpo": "AQAB",
-    "mod": "u4liYNFzgsRr1ERdUY7CY6r4nefi3RzIhK5fdPgdZSMEEflACWAuJu21_TcDpbZ1-6Kbq7zShFsVTAnBkWdO7EP1Rsn11fZpi9m_zEq_uRY-4RpNwp3S9xSdoQ4F3-js1EMaDQ6km0-c0gvr_TyhFqDj_6w_Bb0vFptfGXwfKewPPnhsi7GJ62ihZ32PzxOvEIYcaoXr9xaeudYD3BzWSDmjKGA7PMaEuBhScdUAoibCmsKB-yAGsz2amHnUhcl4B_EBs6wk65Y7ge0ZQJUOGPdUQL49VuALKmr7cMhHKh5KuQmPAi_20K2uZL_EFDaObDWZrclx98s0DmfTRKINtw"
+    "e": "AQAB",
+    "n": "u4liYNFzgsRr1ERdUY7CY6r4nefi3RzIhK5fdPgdZSMEEflACWAuJu21_TcDpbZ1-6Kbq7zShFsVTAnBkWdO7EP1Rsn11fZpi9m_zEq_uRY-4RpNwp3S9xSdoQ4F3-js1EMaDQ6km0-c0gvr_TyhFqDj_6w_Bb0vFptfGXwfKewPPnhsi7GJ62ihZ32PzxOvEIYcaoXr9xaeudYD3BzWSDmjKGA7PMaEuBhScdUAoibCmsKB-yAGsz2amHnUhcl4B_EBs6wk65Y7ge0ZQJUOGPdUQL49VuALKmr7cMhHKh5KuQmPAi_20K2uZL_EFDaObDWZrclx98s0DmfTRKINtw"
   }]
 }

data/spec/mock_response/user_info/openid.json

@@ -11,7 +11,7 @@
   "picture": "http://example.com/johndoe/me.jpg",
   "website": "http://john.doe.blogs.example.net/",
   "gender": "male",
-  "birthday": "05/02/0000",
+  "birthdate": "05/02/0000",
   "zoneinfo": "America/Los_Angeles",
   "locale": "en_US",
   "phone_number": "+1 (425) 555-1212",

data/spec/openid_connect/response_object/id_token_spec.rb

@@ -225,7 +225,7 @@ describe OpenIDConnect::ResponseObject::IdToken do
     context 'when self-issued' do
       context 'when valid' do
         let(:self_issued) do
-          'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJodHRwczovL3NlbGYtaXNzdWVkLm1lIiwidXNlcl9pZCI6ImhXSnphYnYweEY2Q08ycmJMb0hhMGlHamVSOWFCTFFUaDBYbkhPR2xYNk0iLCJhdWQiOiJiYWZkOGI3ODdhMDQyOWRiZDBiNmY5ZTE4Mzk3OThjNDFkNGQxOTJhYWYzMTFhZGY0MGRhMmM0ZDQxNGU1OGZkIiwiZXhwIjoxMzUwMzI1OTg3LCJpYXQiOjEzNTAzMjIzODcsInVzZXJfandrIjp7ImFsZyI6IlJTQSIsIm1vZCI6InB4WmNhN1hrajFZalR5dlNOLThNaFlPU1RuMGluTF9fYTNEZWg5dlZoS1dLaG9FWFlENHNpR0RGSTVIaFBrLWp1SU5HWk9IX0FDc1hIOFNoRWlqMXZzSHpmSTRKeDdxOFREc2ZmZzNNT0d0aWFqZjFJZ250SjR6ck9OeHYzOU5QdEJ6dml2Q3ZLa2MzSXJsSS00X216ajg4R2JER1B6NnBLRDRhcmNndFg0VEdCYmdPTUZaa09nRWk5bml0VzhDbV9zMHFlQ3FtMWxMS0l0QXFaYWJYa2d2cGN5Qjdjb1ZNNnZkLWNYVXY3TDg5MmgxVm9uenVRZTNfUF9MTy1HNV9FNGRVY1B0NmJDbUo4QjNPd3A0bmdQQmpKSHdiTHlqT0F5VjZ2aXRPeUdjZnVPRVE3dkZQdGRNc0hLX29TZnZqU2s2My1xdjRiRDFKaml3OVBBU1NRUSIsInhwbyI6IkFRQUIifX0.YbcccWDBwgtvIMravxJQi3Wmq4fH2BR1Y7qBpt39QH3MKpaHbfpRfkpU2H9SPS4tJZzHnz-iDPVghrWTyLeBZHZigES8oMPM28NxswSKNuDYid-G4d0DAN1A2LdMBPqZd-pAbjop6o8FU1V11WTUoWcQR8OJg912q6I_zZIvCUnlGc9Jx0hnDioW7j2DAYfwji9sLtRybE85-KC8dHwRjrgl5doh3J72QQAi9Vn-KkHz3d5nTFngE-7MFa2ndLiR_7qcqWlCLjEOEDFyj2GtLv-aDYRocOt7TDJmxzDnzRPuNoTuiPiHmSM599kbiKBR_734wqUBunbRQCIOhOrp9Q'
+          'eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJodHRwczovL3NlbGYtaXNzdWVkLm1lIiwidXNlcl9pZCI6ImY2UW1VLVFEbEtmanlwMHd3UmNnRms3QUhIYVMyZnFud2lIMlRCdDl5WDgiLCJhdWQiOiJiYWZkOGI3ODdhMDQyOWRiZDBiNmY5ZTE4Mzk3OThjNDFkNGQxOTJhYWYzMTFhZGY0MGRhMmM0ZDQxNGU1OGZkIiwiZXhwIjoxMzUwMzI1OTg3LCJpYXQiOjEzNTAzMjIzODcsInVzZXJfandrIjp7ImFsZyI6IlJTQSIsImUiOiJBUUFCIiwibiI6Im9iSGdFR01ITU9JVU1OZmkxMFY1RXhCai10d3ljY0txV0hhb2tvaUs4TGRGazdTNnpLYndjUUUtaGRXc0NvT0xfZVhaU2VZRHp1UjhGbG1NcVYxdzB5LUlkdERaRmFBcHgxLTJhWWVnRGJwQmxRc29UWURvU09xVmpfeFRPNTlQX2s0bHk0WHk4bUp0UUktX1dlR3lLZXV2SXItQzVUV1RnYnBobkZaVjA4a29KOHE1WHZRRjJpdndoZ1cweXRvYi1fdzNtWkFOb1FDUGxhSWV3WUFXSGdMdFZ6OElweVVhTWlDWU5kVkZoQjlzMjdRLU1CVGw3OHMtcm01VjhJZXZWZE1jcFVGTDhNSktGaC0ydklhcHljZjhCVmtGUmUzYW42eV9BY2c3eEQ4RFFSc3N3SHRlMkFiT3FENkZrLTJMM255SUdyOVJUM0tKY3ByaFlwYkJndyJ9fQ.H4lZwnV4nY3eWPTSi3anelcQPvAs7zzwChYuHWnKGUSalLO53vQ9XNV8klrEAq8UQntNMtIly-DeCVBU6Hcg3W_ZBuB2EXn1X4Lc6vRRCPeHBFwt085m6zanQsvuiTllUJssUjTnFJvBO9juopMJvisJX7cxDfHpZQF52bWYXuDp5UEFs-8TXQuDpn02BaOnzW32vaf1Vx871EdlGj-NrOpzwWaqnDM0p0o6j8tQPl76WJIB8LIGWxA7sNMnt8YCykzZXofK17veogrFd4tsLYbzFp80oqz0vsCsw4Q3WgLBRgOfoCGB8wfFt7Wdu6clotDIviPqmfPPx1gls2_JJw'
         end
 
         context 'when key == :self_issued' do
@@ -297,7 +297,7 @@ describe OpenIDConnect::ResponseObject::IdToken do
       it do
         user_id = klass.self_issued_user_id jwk
         user_id.should == UrlSafeBase64.encode64(
-          OpenSSL::Digest::SHA256.digest([jwk[:mod], jwk[:xpo]].join)
+          OpenSSL::Digest::SHA256.digest([jwk[:n], jwk[:e]].join)
         )
       end
     end

data/spec/openid_connect/response_object/user_info/open_id_spec.rb

@@ -12,23 +12,23 @@ describe OpenIDConnect::ResponseObject::UserInfo::OpenID do
       should == [
         :user_id,
         :name,
-        :family_name,
         :given_name,
+        :family_name,
         :middle_name,
         :nickname,
         :preferred_username,
         :profile,
         :picture,
         :website,
+        :email,
+        :email_verified,
         :gender,
-        :birthday,
+        :birthdate,
         :zoneinfo,
         :locale,
-        :updated_time,
-        :email,
-        :email_verified,
+        :phone_number,
         :address,
-        :phone_number
+        :updated_time
       ]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -328,12 +328,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3886993201268064457
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3886993201268064457
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24