apple_id 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d4855e908fa2ef52663c918a00ae521a50b3c103c56f437756d05038e8d6925
-  data.tar.gz: a9e6b71347db257406b0872c699aaf6213459fa195365e0de28a7481d72b67a0
+  metadata.gz: d960eb2153d5e632113ef0e7c916d1e4c98cc3c113cc3f174f6b3fbec13eb656
+  data.tar.gz: 5d894c4223f3ef3f0648736c3f9bcec50e798a59efc418526091cc740186eca7
 SHA512:
-  metadata.gz: df5c25f4b7df766422954e4cb7d2dac4d088cc3422a6d4e4d3c12aac7119da58959604a37d310e8814dff3430db82ca83348c18e383c941bfac1494c88b2d2db
-  data.tar.gz: cac72a8111c8644f2c7b44fc8185ef0c84c6b4d46f855b7d19c4debf4cb5badc483886434ec505ac5171ef2a0698730cba5117f8c429c29ad05ac82bd00c389e
+  metadata.gz: 3a14c1cb7ee1eb22b902e8f536106c2141eb03d381131603c3627767cfc78755ce7f7a71b5a244d3ecf5682d58763c8c683ace0c6d76caf91838530dd833cc18
+  data.tar.gz: 115cd71531fefe3b923a8bcd47ea82edf1f8ef5f2cf0e63ebc872fe754a2e546fa94078009e36cf740b20f6f0cff900c0325e0f9c7ee445fdfae281f53030a75

data/VERSION

@@ -1 +1 @@
-1.4.3
+1.5.0

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/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.3
+  version: 1.5.0
 platform: ruby
 authors:
 - nov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-13 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