apple_id 1.4.2 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fee18e5a9878a0458806d26573fc4434ced6d9cec92700189c8f31077874280
-  data.tar.gz: 18bbca83bb744fe286e908785418eb0583fa3f3b3f059dbba56f4166be3bb496
+  metadata.gz: 30783167b911191c1e590bf91b9377044129a89a4cd97e1af57eb4ccf5f0d27e
+  data.tar.gz: 9d1c86ca627ca14b4fd2c37172cb0808398583ffb1a09359fefdb3d8181b012e
 SHA512:
-  metadata.gz: 3d01d0cf6e69b4146b58c9d2a5354bdf235bd836b3778fcc90d89d2d760c40272182df367f665cf1e8137a397921867df7d3bfc4fec056bd3b48724773f8b371
-  data.tar.gz: 8d2410bbd7134dde8a58ab157717d35880b397810c5769ab2bf673f1d6a1b4c11658f781f29e51f6f6d705d3bf8d9bc3763da8ce444969d1f7e6682918029a98
+  metadata.gz: 48179d986d4d6a7a94a5f50ac7d832823a6fc5070804a55da8fd309ee43873c97bac0eba0c0732c555a5084882f2a175c85f6ea745384332e426204971fb2610
+  data.tar.gz: 91201d90d8a9c6168d0f80da32b8359a9eb9f40e3d00e731ec7851743995a3ff5d3424a86c05aed6beb809f37b2c33d14597e1bdf7f11d6f41ef4eddc8fe2d12

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.5.1

data/apple_id.gemspec

@@ -18,6 +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 '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'

data/lib/apple_id/event_token/event.rb

@@ -1,6 +1,7 @@
 module AppleID
   class EventToken::Event < OpenIDConnect::ConnectObject
     attr_required :type, :sub, :event_time
+    attr_optional :email, :is_private_email
 
     module Type
       EMAIL_ENABLED   = 'email-enabled'
@@ -26,6 +27,14 @@ module AppleID
     end
     alias_method :account_delete?, :account_deleted?
 
+    def is_private_email?
+      if is_private_email.is_a? String
+        is_private_email == 'true'
+      else
+        !!is_private_email
+      end
+    end
+
     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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: apple_id
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.1
 platform: ruby
 authors:
 - nov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-08-13 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