active_record_api-request 0.3.10 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5787ab176e69a554c588c635c44361a115ae1f4be46357558473aa8927d38c70
-  data.tar.gz: 8e95ef8fe4a8dc057bfbecf294d6234b64c888f9821228f1892a93e54b326c5d
+  metadata.gz: 07723fe8a0e7ef8a09d646992c72e93f334473b2f90a86e74af704beb1e8b054
+  data.tar.gz: a6a7af0c05535d34ee363e455b3f3162d27a9f8c9990e8e4349cded201e7335b
 SHA512:
-  metadata.gz: 79c3ccce8bf0637ca94531d3415f12cd5b23af4c5323454d492a4b45a126eec27539b14f61f44260bd3a353d786e76cf614882b56c5d0534b83f1d1b6e5470dd
-  data.tar.gz: 303d68460175bd23fe3da88c735bf83f62aa8ccefa7b58e0c74961e27e0f212bd6b8fff7935cd8cc32d17d50706ba32e812a34173025e9d9b6b9b7032d36afed
+  metadata.gz: 35c489d8cb6613b5b933b7a1cfdd258085a490d8cc76ad9efb908db450d27409566af8c05d5b83eabb0ddc07a57fd1c99ec9102c7b1a880979b50f6979b198b6
+  data.tar.gz: 4b4ad95507d5af98fc3a0061e3f97807d84f873c3de8e4d4bd6f35708fedbb5295e6a5f4295eda01e220d50c6df6957fcba86e628b747c23b41be81980b7c69d

data/lib/active_record_api/request/faraday_auth_token_retry.rb

@@ -27,15 +27,15 @@ module ActiveRecordApi
         end
         @app.call(env)
       rescue Faraday::ClientError => error
-        if error.respond_to?(:response) && error.response.try(:[], :status) == 401 && env.request_headers['Retries'] != '5'
+        if error.respond_to?(:response) && [401, 403].include?(error.response.try(:[], :status)) && env.request_headers['Retries'] != '5'
           if @debug
-            Honeybadger.notify(error, {details: 'faraday error, flushing'})
+            Honeybadger.notify(error, {context: {message: 'faraday error, flushing'}})
           end
           token_cache.flush
           call(env)
         else
           if @debug
-            Honeybadger.notify(error, {details: 'faraday error, not flushing'})
+            Honeybadger.notify(error, {context: {message: 'faraday error, not flushing'}})
           end
           raise error
         end

data/lib/active_record_api/request/faraday_cache_service_down.rb

@@ -22,7 +22,7 @@ module ActiveRecordApi
         hash = env.to_hash
         {
           status: hash[:status],
-          body: hash[:body],
+          body: unless hash[:body].nil? then hash[:body] else hash[:response_body] end,
           response_headers: hash[:response_headers]
         }
       end

data/lib/active_record_api/request/token_cache.rb

@@ -8,12 +8,12 @@ module ActiveRecordApi
       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,13 +21,13 @@ 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
@@ -37,12 +37,11 @@ module ActiveRecordApi
             @token = @redis_client.get('auth_token')
             debug_log "retry ##{@retry}"
             debug_log "found token: #{@token}"
-            if @token.nil?
+            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
         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
 

data/lib/active_record_api/request/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecordApi
   module Request
-    VERSION = '0.3.10'.freeze
+    VERSION = '0.3.15'.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.10
+  version: 0.3.15
 platform: ruby
 authors:
 - Full Measure Education
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr