apple_id 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a72028240d0516b2b84199b0ca75a6c6e063a99057e42f5ed9a296a037a34f0
-  data.tar.gz: f986485593e4d31a2dc51f5fb84286546331546ac82615ab8dbdf378cdc3f630
+  metadata.gz: '018fb2f186c24595a953c2fe8e79c9091fcf83d10915b701dac91021dacfc04b'
+  data.tar.gz: a8b6bf32091ff20b60779551469a383f09ccf90d736ea1004046a9a635f993d2
 SHA512:
-  metadata.gz: e3708b78af629597f380242036e79b9c36b9a00f4cb1ad878d992cd5de63e68e8d1ee7bb98fc8098ccf50bedbfe0a7cb86373905e849f6169ab0ea3834433858
-  data.tar.gz: 0037f65c22bfb46a532a8ae46d895514759ff628e1940182c53c1f56f5b9e70fbc8fba038bc151c484fd9c6658c93df301605115ac8fd0614af4f96cc5276104
+  metadata.gz: 195ae7e87dff57ca72ee84be036a2a5927c9fdb7cbd9fa2f48e3a7421a0a9d77cd9ef7a042e1c567cdfff8f72305d9623889fade86a18b3939c2d0ba1efb7d32
+  data.tar.gz: acbc83c4ceb9c38e18db63b66a55855b96a26ca1b01f208cc7258bcb4c582487026c35bbe8b0446b0d8d0118c575b0201b7aab77b74e4d48f3b89bf83bc5d46c

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/apple_id/id_token.rb

@@ -2,13 +2,22 @@ module AppleID
   class IdToken < OpenIDConnect::ResponseObject::IdToken
     class VerificationFailed < StandardError; end
 
-    attr_optional :email
+    attr_optional :email, :email_verified, :is_private_email, :nonce_supported
     attr_accessor :original_jwt_string
     alias_method :original_jwt, :raw_attributes
 
-    # NOTE:
-    #  Apple doesn't support nonce, c_hash and s_hash right now.
-    #  Don't pass nonce, code and access_token until they support them.
+    [:email_verified, :is_private_email, :nonce_supported].each do |boolean_claim|
+      define_method :"#{boolean_claim}?" do
+        claim_value = send(boolean_claim)
+        case claim_value
+        when String
+          claim_value == 'true'
+        else
+          !!claim_value
+        end
+      end
+    end
+
     def verify!(verify_signature: true, client: nil, nonce: nil, state: nil, access_token: nil, code: nil)
       verify_signature! if verify_signature
       verify_claims! client, nonce, state, access_token, code
@@ -63,8 +72,12 @@ module AppleID
       if aud.present? && self.aud != aud
         failure_reasons << :aud
       end
-      if nonce.present? && self.nonce != nonce
-        failure_reasons << :nonce
+      if !nonce_supported? && self.nonce.blank?
+        AppleID.logger.warn 'nonce is\'nt supported on this platform'
+      else
+        if nonce.present? && self.nonce != nonce
+          failure_reasons << :nonce
+        end
       end
       if s_hash.present? && self.s_hash != s_hash
         failure_reasons << :s_hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apple_id
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - nov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-oauth2