apple_id 1.4.0 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4447d024e910da0480e07d58164eefce5daa78c1389ecb8a571ad20bf969c291
-  data.tar.gz: 9ad9be586a2c3e96e7fc3d35eb07c2c6360cde0736b705c7584bdd0fc5a6aac1
+  metadata.gz: 9d4855e908fa2ef52663c918a00ae521a50b3c103c56f437756d05038e8d6925
+  data.tar.gz: a9e6b71347db257406b0872c699aaf6213459fa195365e0de28a7481d72b67a0
 SHA512:
-  metadata.gz: c8655e9f56f4ba8e4e71b5048be8d637bb9e798acd48a5cccd979f6f55ef1d73cb1b7a2cf9e84c46a6d95727b8cf749f5b4e4a8bc7fe7a28170acea05e7581e5
-  data.tar.gz: a097b0398ac8da49da3874a6c073abbe844339773b638761a6f33a204c9c0207a72fdab38d2eb10cf5c0edddddb4562dfd7189ad8b2e7bc8d5dfec9064903eeb
+  metadata.gz: df5c25f4b7df766422954e4cb7d2dac4d088cc3422a6d4e4d3c12aac7119da58959604a37d310e8814dff3430db82ca83348c18e383c941bfac1494c88b2d2db
+  data.tar.gz: cac72a8111c8644f2c7b44fc8185ef0c84c6b4d46f855b7d19c4debf4cb5badc483886434ec505ac5171ef2a0698730cba5117f8c429c29ad05ac82bd00c389e

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.3

data/apple_id.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rack-oauth2', '~> 1.21'
+  spec.add_runtime_dependency 'rack-oauth2', '~> 1.21.2'
   spec.add_runtime_dependency 'openid_connect', '~> 1.3.0'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/apple_id/event_token/event.rb

@@ -2,6 +2,30 @@ module AppleID
   class EventToken::Event < OpenIDConnect::ConnectObject
     attr_required :type, :sub, :event_time
 
+    module Type
+      EMAIL_ENABLED   = 'email-enabled'
+      EMAIL_DISABLED  = 'email-disabled'
+      CONSENT_REVOKED = 'consent-revoked'
+      ACCOUNT_DELETED = 'account-delete'
+    end
+
+    def email_enabled?
+      type == Type::EMAIL_ENABLED
+    end
+
+    def email_disabled?
+      type == Type::EMAIL_DISABLED
+    end
+
+    def consent_revoked?
+      type == Type::CONSENT_REVOKED
+    end
+
+    def account_deleted?
+      type == Type::ACCOUNT_DELETED
+    end
+    alias_method :account_delete?, :account_deleted?
+
     class << self
       def decode(json_string)
         new JSON.parse(json_string).with_indifferent_access

data/lib/apple_id/event_token.rb

@@ -2,19 +2,20 @@ module AppleID
   class EventToken < OpenIDConnect::ConnectObject
     class VerificationFailed < Error; end
 
-    # NOTE: Apple uses `events` for the JWT key, but this gem uses `event` since it's always a single JSON Object.
-    #       Once they start returning an array of events, this gem might use `events` as the attribute name.
-    attr_required :iss, :aud, :exp, :iat, :jti, :event
+    attr_required :iss, :aud, :exp, :iat, :jti, :events
     alias_method :original_jwt, :raw_attributes
+    alias_method :event, :events
+
+    delegate :type, :sub, :event_time, :email_enabled?, :email_disabled?, :consent_revoked?, :account_deleted?, to: :event
 
     def initialize(attributes = {})
       super
-      @event = Event.decode attributes[:events]
+      @events = Event.decode attributes[:events]
     end
 
     def verify!(verify_signature: true, client: nil)
       verify_signature! if verify_signature
-      verify_claims! client, nonce, state, access_token, code
+      verify_claims! client
       self
     end
 
@@ -32,7 +33,7 @@ module AppleID
       raise VerificationFailed, 'Signature Verification Failed'
     end
 
-    def verify_claims!(client, nonce, state, access_token, code)
+    def verify_claims!(client)
       aud = if client.respond_to?(:identifier)
         client.identifier
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apple_id
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.3
 platform: ruby
 authors:
 - nov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: 1.21.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: 1.21.2
 - !ruby/object:Gem::Dependency
   name: openid_connect
   requirement: !ruby/object:Gem::Requirement