active_record_api-request 0.3.12 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 033313ffd55eed06728b0d905b0230b4d712e741975be067388881b48245f54d
-  data.tar.gz: c5283f9e03b7fd551a434000c297bab38e1a71a5f5862775080264c2b97a17fe
+  metadata.gz: 3e1be4753a2cf5b8394c7313ee0b005a6228646fa71b92fa6574cc73e1825d5f
+  data.tar.gz: 43ae9b78126a3880af7a5796dcef31c86b11aa283f6291e078a57915414bf5be
 SHA512:
-  metadata.gz: 4c21b2c4099b26ad55ff913a126443323639c1060b0e3934b23a82b9a76404369c070ba9989b8562247b0af12cf6a2c3390b12a76281abff51ee2e736a251891
-  data.tar.gz: 1b034d3d746aaa71493fc9c498d43b3916089556704e931ad6d13de91294975bc62d56d2dc651f0997b01aa1ad2d93f4859f4896da007f8f83063741945e8c19
+  metadata.gz: '008d6a81a7346699fc0cb9f0089ba6ecc7d7cd0b33fe48238e4cedad91ff9914d0cc111df64b20b5e60ad0d2625860ae6a3e1aa36e35f44b7f73c19de3513945'
+  data.tar.gz: 96ad30c6ff561125efbee2238c8f4bafbbf282528326ec1d593b74d15489787db01c7530b68971a838342b7262aff14b4437a8e330bfab8de85f6c09199c2bc7

data/lib/active_record_api/request/token_cache.rb

@@ -3,17 +3,17 @@ module ActiveRecordApi
   module Request
     class TokenCache
       include ActiveAttr::Model
-      attr_accessor  :debug
+      attr_accessor :debug
 
       def flush
         return unless defined? AUTH_REDIS_POOL
         debug_log 'flushing token cache'
-        Honeybadger.notify(StandardError.new('token cache has been flushed'))
         AUTH_REDIS_POOL.with do |client|
           @redis_client = client
           @redis_client.del('auth_token')
           release_lock
         end
+        debug_log 'token cache has been flushed'
       end
 
       def fetch_token(token_proc)
@@ -21,28 +21,27 @@ module ActiveRecordApi
       end
 
       def retrieve_token_from_redis(token_proc)
-        debug_log 'looking?'
+        debug_log 'looking for token in cache'
         unless defined? AUTH_REDIS_POOL
-          debug_log 'no auth redis pool'
-          Honeybadger.notify(StandardError.new('no auth redis pool for token cache'))
-          return token_proc.call()
+          debug_log 'no auth redis pool. getting new token'
+          token = token_proc.call
+          raise "no token returned! #{token}" if token.nil?
+          return token
         end
-        debug_log 'looking for token in cache'
         AUTH_REDIS_POOL.with do |client|
           @redis_client = client
           @token = nil
           @retry = 0
           while @token.nil? && @retry < 5
-            @retry += 1
             @token = @redis_client.get('auth_token')
             debug_log "retry ##{@retry}"
             debug_log "found token: #{@token}"
-            if @token.nil?
+            @retry += 1
+            if @token.nil? || session_missing_for?(@token)
               if acquire_lock
                 begin
-                  debug_log "acquired lock"
-                  Honeybadger.notify(StandardError.new('acquired lock and fetching token for cache'))
-                  @token = token_proc.call()
+                  debug_log 'acquired lock and fetching token for cache'
+                  @token = token_proc.call
                   raise "no token returned! #{@token}" if @token.nil?
                   @redis_client.set 'auth_token', @token
                 ensure
@@ -60,14 +59,36 @@ module ActiveRecordApi
         @token
       end
 
+      def redis_session_impossible?
+        return true unless defined? Redis
+        ENV['REDIS_SESSION_HOST'].nil? || ENV['REDIS_SESSION'].nil?
+      end
+
+      def redis_session
+        if redis_session_impossible?
+          debug_log 'Redis session environment variables not present.'
+          return nil
+        end
+
+        @redis_session ||= Redis.new({ url: "redis://#{ENV['REDIS_SESSION_HOST']}", db: ENV['REDIS_SESSION'] })
+      end
+
+      def session_missing_for?(token)
+        return false if redis_session.nil?
+        session = (redis_session.send(:get, token) if redis_session.respond_to?(:get))
+        debug_log("Session located for token #{token}") unless session.nil?
+        debug_log("Session could not be located for token #{token}") if session.nil?
+        session.nil?
+      end
+
       def debug_log(message)
-        Rails.logger.info message if debug
+        Rails.logger.info message if debug && defined? Rails
       end
 
       def acquire_lock
-        @redis_client.set 'auth_token_lock', unique_key, nx: true, ex: 60
+        @redis_client.set 'auth_token_lock', unique_key, nx: true, ex: 8
         current_lock_value = @redis_client.get 'auth_token_lock'
-        Rails.logger.info "#{current_lock_value} == #{unique_key}" if debug
+        debug_log "#{current_lock_value} == #{unique_key}"
         current_lock_value == unique_key
       end
 
@@ -81,4 +102,5 @@ module ActiveRecordApi
     end
   end
 end
+
 #:nocov:#

data/lib/active_record_api/request/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecordApi
   module Request
-    VERSION = '0.3.12'.freeze
+    VERSION = '0.3.16'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_api-request
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.16
 platform: ruby
 authors:
 - Full Measure Education
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr