zuora_connect 2.0.57i → 2.0.57j

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26183625c5cf9400d02272bc113e94110febd7598539087c3aff5bb562126db5
-  data.tar.gz: f583a9edecc57531b94c62d863102404a39451a8534f28cc3a83c7dd628603f3
+  metadata.gz: 20a3be40ccdd0ae006685145eb4d5500389fc6cf220402bfb93072cffb911a41
+  data.tar.gz: 9821553b9795ea6ac6d73cebabb38d881c72dc6f845af86aa5e704def9e36b55
 SHA512:
-  metadata.gz: e587ff354e885635146086c916359515dfa614448761afc07dd0a3a51114e18a55c660860f06c1bf9d07a82041d11ad72536831c83ab474194acd99a0f575066
-  data.tar.gz: fb57d8e05cc977a11f0c877ae887d764ef8ea9572c23841ccc782da228aab9aefde7b3a895d8334b63505edd3f5bc426a2b202908567583ba855d188396b175f
+  metadata.gz: 65c1c86d4dc83c3de5c9791dd2f1b688015c300111b2521f0c3f7bc4f52b4115c3bf13c9a5ff477c90734171f204df6b24966524d78d0a11aa8a21036ecf253a
+  data.tar.gz: a9675847a52ef1b26027a57f87a680a87755175ecf48ce929ae9cc7a4e740f7d090ff88dd07364f69e9ea8173a3cb0db58c1188b79cefbce6a41833711c9853c

data/app/models/zuora_connect/app_instance_base.rb

@@ -20,7 +20,7 @@ module ZuoraConnect
     BLANK_OBJECT_ID_LOOKUP = 'BlankValueSupplied'
     HOLDING_PATTERN_SLEEP = 5.seconds
     CONNECT_APPLICATION_ID = 0
-    CONNECT_COMMUNICATION_SLEEP= 5.seconds
+    CONNECT_COMMUNICATION_SLEEP = Rails.env.test? ? 0.seconds : 5.seconds
     IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de']
     INTERNAL_HOSTS = []
     LOGIN_TENANT_DESTINATION = 'target_login'
@@ -225,7 +225,7 @@ module ZuoraConnect
       raise
     rescue => ex
       if recoverable_session
-        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache", ex)
+        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache", ex, self.default_ougai_items)
         self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         return self
       else
@@ -277,11 +277,8 @@ module ZuoraConnect
         #Check how app was deployed
         if self.id < 25000000 && !skip_connect 
           self.check_oauth_state
-          start = Time.now
           response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
-          response_time = Time.now - start
 
-          ZuoraConnect.logger.debug("REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
           if response.code == 200
             begin
               parsed_json = JSON.parse(response.body)
@@ -313,7 +310,7 @@ module ZuoraConnect
         refresh_count += 1
         if refresh_count < 3
           sleep(10)
-          ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex)
+          ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
           retry
         else
           ZuoraConnect.logger.fatal("REFRESH TASK - Connection Failed", ex)
@@ -322,17 +319,17 @@ module ZuoraConnect
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
         refresh_count += 1
         if refresh_count < 3
-          ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex)
+          ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
           self.refresh_oauth if ex.code == 401
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex)
+          ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex, self.default_ougai_items)
           raise
         end
       end
     rescue => ex
       if self['zuora_logins'].present?
-        ZuoraConnect.logger.warn("REFRESH TASK - Fallback to local encrypted store", ex)
+        ZuoraConnect.logger.warn("REFRESH TASK - Fallback to local encrypted store", ex, self.default_ougai_items)
         skip_connect = true
         retry
       end
@@ -654,16 +651,12 @@ module ZuoraConnect
       end
 
       def refresh_oauth
-        refresh_oauth_count ||= 0
-        start = Time.now
-        params = {
-                  :grant_type => "refresh_token",
-                  :redirect_uri => ZuoraConnect.configuration.oauth_client_redirect_uri,
-                  :refresh_token => self.refresh_token
-                }
-        response = HTTParty.post("#{ZuoraConnect.configuration.url}/oauth/token",:body => params)
-        response_time = Time.now - start
-        ZuoraConnect.logger.debug("REFRESH OAUTH - In #{response_time.round(2).to_s}")
+        refresh_oauth_count ||= 0        
+        response = HTTParty.post("#{ZuoraConnect.configuration.url}/oauth/token", body: {
+          :grant_type => "refresh_token",
+          :redirect_uri => ZuoraConnect.configuration.oauth_client_redirect_uri,
+          :refresh_token => self.refresh_token
+        })
 
         if response.code == 200
           response_body = JSON.parse(response.body)
@@ -677,11 +670,11 @@ module ZuoraConnect
         end
       rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (refresh_oauth_count += 1) < 3
-          sleep(5)
-          ZuoraConnect.logger.debug("REFRESH OAUTH - Connection Failure Retrying(#{refresh_oauth_count})", ex)
+          sleep(CONNECT_COMMUNICATION_SLEEP)
+          ZuoraConnect.logger.debug("REFRESH OAUTH - Connection Failure Retrying(#{refresh_oauth_count})", ex, self.default_ougai_items)
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH OAUTH - Connection Failed", ex)
+          Rails.logger.fatal("REFRESH OAUTH - Connection Failed", ex, self.default_ougai_items)
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
@@ -692,10 +685,10 @@ module ZuoraConnect
         return if !self.oauth_expired?
 
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.debug("REFRESH OAUTH - Communication Failure Retrying(#{refresh_oauth_count})", ex)
+          ZuoraConnect.logger.debug("REFRESH OAUTH - Communication Failure Retrying(#{refresh_oauth_count})", ex, self.default_ougai_items)
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH OAUTH - Communication Failed #{ex.code}", ex)
+          ZuoraConnect.logger.fatal("REFRESH OAUTH - Communication Failed #{ex.code}", ex, self.default_ougai_items)
           raise
         end
       end
@@ -745,10 +738,10 @@ module ZuoraConnect
             end
           end
           if cached_instance.blank?
-            ZuoraConnect.logger.debug("Cached AppInstance Missing")
+            ZuoraConnect.logger.debug("Cached AppInstance Missing", self.default_ougai_items)
             return session
           else
-            ZuoraConnect.logger.debug("Cached AppInstance Found")
+            ZuoraConnect.logger.debug("Cached AppInstance Found", self.default_ougai_items)
             return decrypt_data(data: cached_instance, rescue_return: session).merge(session)
           end
         else
@@ -764,7 +757,7 @@ module ZuoraConnect
         if defined?(Redis.current)
           #Task data must be present and the last refresh cannot be old. We dont want to overwite new cache data with old
           if self.task_data.present? &&  (self.last_refresh.to_i > INSTANCE_REFRESH_WINDOW.ago.to_i)
-            ZuoraConnect.logger.debug("Caching AppInstance")
+            ZuoraConnect.logger.debug("Caching AppInstance", self.default_ougai_items)
             Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, self.encrypt_data(data: self.save_data))
           end
         end
@@ -828,10 +821,10 @@ module ZuoraConnect
           begin
             return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
           rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
-            ZuoraConnect.logger.error("Error Decrypting", ex) if log_fatal
+            ZuoraConnect.logger.error("Error Decrypting", ex, self.default_ougai_items) if log_fatal
             return rescue_return
           rescue JSON::ParserError => ex
-            ZuoraConnect.logger.error("JSON Parse Error", ex) if log_fatal
+            ZuoraConnect.logger.error("JSON Parse Error", ex, self.default_ougai_items) if log_fatal
             return encryptor.decrypt_and_verify(CGI::unescape(data))
           end
         end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.57i"
+  VERSION = "2.0.57j"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.57i
+  version: 2.0.57j
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment