cache only when kid is found, even unless auto_detect mode. and pass …

…options to delete
nov · Jan 24, 2023 · e5eff66 · e5eff66
1 parent 3acd910
commit e5eff66
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/lib/json/jwk/set/fetcher.rb b/lib/json/jwk/set/fetcher.rb
@@ -72,14 +72,10 @@ def self.fetch(jwks_uri, kid:, auto_detect: true, **options)
               end
             )
           )
+          cache.delete(cache_key, options) if jwks[kid].blank?
 
           if auto_detect
-            if jwks[kid]
-              jwks[kid]
-            else
-              cache.delete(cache_key)
-              raise KidNotFound
-            end
+            jwks[kid] or raise KidNotFound
           else
             jwks
           end

diff --git a/spec/json/jwk/set/fetcher_spec.rb b/spec/json/jwk/set/fetcher_spec.rb
@@ -122,7 +122,7 @@ def delete(cache_key)
           end
 
           it do
-            expect(JSON::JWK::Set::Fetcher.cache).to receive(:delete).with(cache_key)
+            expect(JSON::JWK::Set::Fetcher.cache).to receive(:delete).with(cache_key, {})
             expect do
               mock_json :get, jwks_uri, 'jwks' do
                 subject