apple_id 1.4.3 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d4855e908fa2ef52663c918a00ae521a50b3c103c56f437756d05038e8d6925
-  data.tar.gz: a9e6b71347db257406b0872c699aaf6213459fa195365e0de28a7481d72b67a0
+  metadata.gz: f98e97285a171e21f76635a56de17bc6a35b1ccc1bdbfcf100a9bead34674d49
+  data.tar.gz: fb44c3be978d89306011c2f43108578582e4b45ea1a5fa9ac19e182ca53c3b40
 SHA512:
-  metadata.gz: df5c25f4b7df766422954e4cb7d2dac4d088cc3422a6d4e4d3c12aac7119da58959604a37d310e8814dff3430db82ca83348c18e383c941bfac1494c88b2d2db
-  data.tar.gz: cac72a8111c8644f2c7b44fc8185ef0c84c6b4d46f855b7d19c4debf4cb5badc483886434ec505ac5171ef2a0698730cba5117f8c429c29ad05ac82bd00c389e
+  metadata.gz: 48643a881f3bcfaa84d2e6a543d055b9a9e8b6005d883b35d38425b1e7d5f75829e6914a3f2172cda3e277ed2b849f0c9835f032c8f261ccf45bf74166a25b53
+  data.tar.gz: f27853d56f96451f342a44ba0fd534cfd81327755a1e850fd29a39294cbacc9a99bd999029ac8b50cd0a796eb26e2dfd25a97b666488d58ef7a70bd96de8bb50

data/.travis.yml

@@ -4,7 +4,7 @@ language: ruby
 cache: bundler
 before_install: gem install bundler
 rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - 3.0.2
+  - 2.6.10
+  - 2.7.6
+  - 3.0.4
+  - 3.1.2

data/VERSION

@@ -1 +1 @@
-1.4.3
+1.5.2

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.2'
   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/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, options = {})
+      JSON::JWK::Set::Fetcher.fetch JWKS_URI, kid: kid, **options
     end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: apple_id
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.2
 platform: ruby
 authors:
 - nov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-08-14 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.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.2
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
   requirement: !ruby/object:Gem::Requirement