apple_id 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 535212dfcb103a30e0977d80a0d5b8bd21d8ce25ccd0d13bf450542ba706473b
-  data.tar.gz: df08efbc2cc0de63e9645e8d4aa9a63c5f7a632b3b61fcd27f30c47cab52c673
+  metadata.gz: d960eb2153d5e632113ef0e7c916d1e4c98cc3c113cc3f174f6b3fbec13eb656
+  data.tar.gz: 5d894c4223f3ef3f0648736c3f9bcec50e798a59efc418526091cc740186eca7
 SHA512:
-  metadata.gz: 067b35d844a7e2a2c802d0823c5ef2572e4b2d1515b7b9756c3b6393ebc0633074708656fc42d89ed7522acd69fb0d377102e770e643fe31ad6eb0cc394c0d64
-  data.tar.gz: 13439c70fc5982bd0576645b1411979f74b2adf4df0252e05fe03c55a691a218f2d0d63ae363a0e27c434abcf26dd9a9450c42e5ffb15e5388deb2344987ede9
+  metadata.gz: 3a14c1cb7ee1eb22b902e8f536106c2141eb03d381131603c3627767cfc78755ce7f7a71b5a244d3ecf5682d58763c8c683ace0c6d76caf91838530dd833cc18
+  data.tar.gz: 115cd71531fefe3b923a8bcd47ea82edf1f8ef5f2cf0e63ebc872fe754a2e546fa94078009e36cf740b20f6f0cff900c0325e0f9c7ee445fdfae281f53030a75

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

data/apple_id.gemspec

@@ -18,7 +18,8 @@ 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 'json-jwt', '~> 1.15.0'
+  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

@@ -6,6 +6,8 @@ module AppleID
     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
       @events = Event.decode attributes[:events]

data/lib/apple_id/jwks.rb

@@ -1,27 +1,14 @@
 module AppleID
   class JWKS < JSON::JWK::Set
-    class Cache
-      def fetch(cache_key)
-        yield
-      end
-    end
-
     def self.cache=(cache)
-      @@cache = cache
+      JSON::JWK::Set::Fetcher.cache = cache
     end
     def self.cache
-      @@cache
+      JSON::JWK::Set::Fetcher.cache
     end
-    self.cache = Cache.new
 
-    def self.fetch(cache_key)
-      jwks = cache.fetch("apple_id:jwks:#{cache_key}") do
-        new(
-          JSON.parse(
-            OpenIDConnect.http_client.get_content(JWKS_URI)
-          ).with_indifferent_access[:keys]
-        )
-      end
+    def self.fetch(kid)
+      JSON::JWK::Set::Fetcher.fetch JWKS_URI, kid: kid
     end
   end
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: apple_id
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - nov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json-jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
   requirement: !ruby/object:Gem::Requirement
     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