zaikio-jwt_auth 0.5.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbd7c7fb4d5cb2a3d1001e5a24036beafbf3dcf76200bd052ee4c1d731c39a2d
-  data.tar.gz: 94a597d69c55f1dee78784967f6b6fa33d0b3aee98d55b4001060bc28ad1cf97
+  metadata.gz: 5246d95da7085c56dce3719ba3bdba4c102c3b4dd01c941cacb5de5d9e813eb0
+  data.tar.gz: 354e97d2ef3972049e103fa0afea9e047f9990ab816ca8b7afec7c3671e0d90b
 SHA512:
-  metadata.gz: 6be2c8d3b1000c4dcbe09518fc4afb38a6f550fced5dfb82eca44636755adbcc50897c8ed81729346f8ab2b3838b2a033a0c6b33a7cb37d3e2027644e2e2daad
-  data.tar.gz: 370e9de4ce7973de106fb66259d43186876591770f71e819448d386d5c64f17751ebb32573130533777a4477df6cd0b93997e4fb6de5f7418ef4f2c82d22d560
+  metadata.gz: 8025ca7934fac9df869afde1fd23287208fb9edbd1970e3d065d9591062a1557a435f6cb0d7d8147d8f8f2fdbb476ae00dead2d89bb232951489de785df0e248
+  data.tar.gz: 89431f5cdf4ad50dff018a35530fb95d97d2a9a91a1908566b8d9de187dff65f1203bfb76a7eef79fcc3fca116f336ab194c18b8bd583d830098481678a53aa8

data/lib/zaikio/jwt_auth/directory_cache.rb

@@ -5,6 +5,13 @@ require "logger"
 module Zaikio
   module JWTAuth
     class DirectoryCache
+      class UpdateJob < ::ActiveJob::Base
+        def perform(directory_path)
+          DirectoryCache.fetch(directory_path)
+          true # This job will always re-queue until it succeeds.
+        end
+      end
+
       BadResponseError = Class.new(StandardError)
 
       class << self
@@ -14,7 +21,8 @@ module Zaikio
           json = Oj.load(cache) if cache
 
           if !cache || options[:invalidate] || cache_expired?(json, options[:expires_after])
-            return reload(directory_path)
+            new_values = reload_or_enqueue(directory_path)
+            return new_values || json["data"]
           end
 
           json["data"]
@@ -39,24 +47,18 @@ module Zaikio
           DateTime.strptime(json["fetched_at"].to_s, "%s") < Time.now.utc - (expires_after || 1.hour)
         end
 
-        def reload(directory_path)
-          retries = 0
-
-          begin
-            data = fetch_from_directory(directory_path)
-            Zaikio::JWTAuth.configuration.redis.set("zaikio::jwt_auth::#{directory_path}", {
-              fetched_at: Time.now.to_i,
-              data: data
-            }.to_json)
-
-            data
-          rescue Errno::ECONNREFUSED, Net::ReadTimeout, BadResponseError => e
-            raise unless (retries += 1) <= 3
+        def reload_or_enqueue(directory_path)
+          data = fetch_from_directory(directory_path)
+          Zaikio::JWTAuth.configuration.redis.set("zaikio::jwt_auth::#{directory_path}", {
+            fetched_at: Time.now.to_i,
+            data: data
+          }.to_json)
 
-            Zaikio::JWTAuth.configuration.logger.info("Timeout (#{e}), retrying in 1 second...")
-            sleep(1)
-            retry
-          end
+          data
+        rescue Errno::ECONNREFUSED, Net::ReadTimeout, BadResponseError
+          Zaikio::JWTAuth.configuration.logger.info("Error updating DirectoryCache(#{directory_path}), enqueueing job to update")
+          UpdateJob.set(wait: 10.seconds).perform_later(directory_path)
+          nil
         end
 
         def fetch_from_directory(directory_path)

data/lib/zaikio/jwt_auth/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module JWTAuth
-    VERSION = "0.5.1".freeze
+    VERSION = "1.0.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 1.0.0
 platform: ruby
 authors:
 - crispymtn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj