zuora_connect 2.0.5zg → 2.0.5zh

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2c5af96c2a7a00a74b397b942817ab2ce03622761e92c2b25ff81c4734eba4
-  data.tar.gz: 293379013a5d86e12b8eab8f735ca92879ef0b1874d973059d24aa7358e2e4d0
+  metadata.gz: 36a2f9d675095af97d07555d1aa875e5ba22b039262959a43d9a90966f45eaf3
+  data.tar.gz: 492c05ace818806101c42c5b4534d21227d0db38a19c11f39ce1183163a58df9
 SHA512:
-  metadata.gz: df998490776be8d9147eb2a4aea83d48b8bce197d96218e94f72fe539601f0ee295720e9aa32d9519ca9fd6a5e3684f77a4aa5a556c2680d78889b325e4d6824
-  data.tar.gz: 37305db8b3f4eb55034f36b170ba88ee50df7ffae2c9fe8194f9742b4b6c2f6df5a0c6ab9b8c112984a9fa6545f1d886f3413b8bbd774262ac7df2211ddb9c05
+  metadata.gz: 593d8e422bf1edb7959bc8fd8878ad28e4219f5b42bbc73687e05540aca05995c6a1002cdec6272c037b8e904f3ff5b0e0b43290324b1e415225531c5ddc91b9
+  data.tar.gz: 05671c2dd8641935619eee8de03ae5f62d721df3e8a9d113b29d889b8cfe407c9e9bbd27c85f4b54cc2c2acc9ba70f52d2b3f778009f56216dd28e231654ca5f

data/app/models/zuora_connect/app_instance_base.rb

@@ -182,6 +182,7 @@ module ZuoraConnect
         self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         return self
       else
+        ZuoraConnect.logger.error("Failed new session", ex, self.default_ougai_items)
         raise
       end
     ensure
@@ -221,39 +222,39 @@ module ZuoraConnect
 
         ZuoraConnect.logger.debug("REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}", self.default_ougai_items)
         if response.code == 200
-          self.build_task(task_data: JSON.parse(response.body), session: session)
-          self.last_refresh = Time.now.to_i
-          self.cache_app_instance
-          self.reset_mark_for_refresh
+          begin
+            parsed_json = JSON.parse(response.body)
+          rescue JSON::ParserError => ex
+            raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("JSON parse error", response.body, response.code)
+          end
+          self.build_task(task_data: parsed_json, session: session)          
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
       else
         self.build_task(task_data: self.zuora_logins, session: session)
-        self.last_refresh = Time.now.to_i
-        self.cache_app_instance
-        self.reset_mark_for_refresh
       end
+      self.last_refresh = Time.now.to_i
+      self.cache_app_instance
+      self.reset_mark_for_refresh
     rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
       if (refresh_count += 1) < 3
         sleep(30)
-        ZuoraConnect.logger.info("REFRESH TASK - #{ex.class} Retrying(#{refresh_count})", self.default_ougai_items)
+        ZuoraConnect.logger.warn("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", self.default_ougai_items)
         retry
       else
-        ZuoraConnect.logger.fatal("REFRESH TASK - #{ex.class} Failed #{refresh_count}x", self.default_ougai_items)
+        ZuoraConnect.logger.fatal("REFRESH TASK - Connection Failed", ex, self.default_ougai_items)
         raise
       end
     rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
       if (refresh_count += 1) < 3
+        ZuoraConnect.logger.warn("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", self.default_ougai_items)
         if ex.code == 401
-          ZuoraConnect.logger.info("REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})", self.default_ougai_items)
           self.refresh_oauth
-        else
-          ZuoraConnect.logger.warn("REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})", self.default_ougai_items)
         end
         retry
       else
-        ZuoraConnect.logger.fatal("REFRESH TASK - Failed #{ex.code} - #{refresh_count}x", self.default_ougai_items)
+        ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex, self.default_ougai_items)
         raise
       end
     end
@@ -520,14 +521,14 @@ module ZuoraConnect
           self.oauth_expires_at = Time.at(response_body["created_at"].to_i) + response_body["expires_in"].seconds
           self.save(:validate => false)
         else
-          raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Refreshing Access Token for #{self.id}", response.body, response.code)
+          raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Refreshing Access Token", response.body, response.code)
         end
       rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.info("REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})", self.default_ougai_items)
+          ZuoraConnect.logger.warn("REFRESH OAUTH - Connection Failure Retrying(#{refresh_oauth_count})", self.default_ougai_items)
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x", self.default_ougai_items)
+          ZuoraConnect.logger.fatal("REFRESH OAUTH - Connection Failed", ex, self.default_ougai_items)
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
@@ -538,10 +539,10 @@ module ZuoraConnect
         return if !self.oauth_expired?
 
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.info("REFRESH OAUTH - Failed #{ex.code} - Retrying(#{refresh_oauth_count})", self.default_ougai_items)
+          ZuoraConnect.logger.warn("REFRESH OAUTH - Communication Failure Retrying(#{refresh_oauth_count})", self.default_ougai_items)
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH OAUTH - Failed #{ex.code} - #{refresh_oauth_count}x", self.default_ougai_items)
+          ZuoraConnect.logger.fatal("REFRESH OAUTH - Communication Failed #{ex.code}", ex, self.default_ougai_items)
           raise
         end
       end
@@ -667,9 +668,10 @@ module ZuoraConnect
           begin
             return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
           rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
-            ZuoraConnect.logger.error("Error Decrypting", self.default_ougai_items) 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, self.default_ougai_items) if log_fatal
             return encryptor.decrypt_and_verify(CGI::unescape(data))
           end
         end

data/lib/zuora_connect/controllers/helpers.rb

@@ -100,7 +100,7 @@ module ZuoraConnect
                 render "zuora_connect/static/error_handled", :locals => {
                   :title => "Missing Authorization Token", 
                   :message => "Zuora 'Zuora-Auth-Token' header and 'ZSession' cookie not present."
-                }
+                }, :layout => false
                 return
               end
               zuora_instance_id = params[:sidebar_launch].to_s.to_bool ? nil : (params[:app_instance_id] || session["appInstance"])
@@ -165,7 +165,7 @@ module ZuoraConnect
               #We have multiple, user must pick
               elsif appinstances.size > 1 
                 ZuoraConnect.logger.debug("User must select instance. #{@names}")
-                render "zuora_connect/static/launch", :locals => {:names => appinstances.to_h}
+                render "zuora_connect/static/launch", :locals => {:names => appinstances.to_h}, :layout => false
                 return
 
               #We have no deployed instance for this tenant
@@ -177,7 +177,7 @@ module ZuoraConnect
                   render "zuora_connect/static/error_handled", :locals => {
                     :title => "Application can only complete its initial setup via platform administrator", 
                     :message => "Please contact admin of tenant and have them click on link again to launch application."
-                  }
+                  }, :layout => false
                   return
                 end
                 Apartment::Tenant.switch!("public")
@@ -244,7 +244,7 @@ module ZuoraConnect
                       render "zuora_connect/static/error_handled", :locals => {
                         :title => "Application could not create unique tokens.", 
                         :message => "Please contact support or retry launching application."
-                      }
+                      }, :layout => false
                       return
                     end
                   end
@@ -267,7 +267,7 @@ module ZuoraConnect
               return
             rescue => ex
               ZuoraConnect.logger.error(ex)
-              render "zuora_connect/static/error_unhandled", :locals => {:exception => ex}
+              render "zuora_connect/static/error_unhandled", :locals => {:exception => ex}, :layout => false
               return              
             end
           elsif request["data"] && /^([A-Za-z0-9+\/\-\_]{4})*([A-Za-z0-9+\/]{4}|[A-Za-z0-9+\/]{3}=|[A-Za-z0-9+\/]{2}==)$/.match(request["data"].to_s)
@@ -279,7 +279,7 @@ module ZuoraConnect
               render "zuora_connect/static/error_handled", :locals => {
                 :title => "Application state could not be verified", 
                 :message => "Please relaunch application."
-              }
+              }, :layout => false
               return 
             end
           end
@@ -291,7 +291,7 @@ module ZuoraConnect
           render "zuora_connect/static/error_handled", :locals => {
             :title => "Application state could not be found.", 
             :message => "Please relaunch application."
-          }
+          }, :layout => false
           return 
         end
         #Call .data_lookup with the current session to retrieve session. In some cases session may be stored/cache in redis 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5zg"
+  VERSION = "2.0.5zh"
 end

data/lib/zuora_connect.rb

@@ -41,7 +41,7 @@ module ZuoraConnect
             data[:zuora_trace_id] = ZuoraConnect::RequestIdMiddleware.zuora_request_id if ZuoraConnect::RequestIdMiddleware.zuora_request_id.present?
             #data[:traces] = {amazon_id: data[:trace_id], zuora_id: data[:zuora_trace_id]}
             if !['ElasticAPM', 'ResqueScheduler', 'ResquePool', 'Resque', 'Makara'].include?(name)
-              if Thread.current[:appinstance].present?
+              if Thread.current[:appinstance].present? && Thread.current[:appinstance].id.present?
                 data[:app_instance_id] = Thread.current[:appinstance].id
                 logitems = Thread.current[:appinstance].logitems
                 if logitems.present? && logitems.class == Hash
@@ -86,7 +86,7 @@ module ZuoraConnect
               message: name == "ActionMailer" ? msg.strip : msg
             }
             if !['ElasticAPM', 'ResqueScheduler', 'ResquePool','Resque', 'Makara'].include?(name)
-              if Thread.current[:appinstance].present?
+              if Thread.current[:appinstance].present? && Thread.current[:appinstance].id.present?
                 store[:app_instance_id] = Thread.current[:appinstance].id
                 logitems = Thread.current[:appinstance].logitems
                 if logitems.present? && logitems.class == Hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5zg
+  version: 2.0.5zh
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment