zuora_connect 2.0.5y → 2.0.5zj

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee905da43d4b965a647b9149ec7988f032c76afcc37dbffc934ac70eed7a8e2f
-  data.tar.gz: fc34629d958f8330fdabe0894f8e9d6c7af82b8b578ca3e2136b187c47dc3e00
+  metadata.gz: f10b5356c58827088e546bfdfc7af921c9201dc2336eaaea93888c2fae6c4dfc
+  data.tar.gz: 95421312ce2d6db05906b94c0b9ff17086aa77096eebe85306bdbe90cbd410a4
 SHA512:
-  metadata.gz: f686fd92b5118df058d1cfb25ab3c21496e6b31d0271de5173be08d7d4731b80a13f22d103af39e57f0ba2c24a84810bd2adc3df147ca6f02cce5ff1bfb0267b
-  data.tar.gz: 78744edba395438dbd76f94c68b1cdcacb5896e4f509e302267df5654ad5ef87356ef65cf17be9e0da594fed1d72dc7408c12428581ccc18fe7ec8870dfb6c57
+  metadata.gz: aa67f91a130f7313c8bafb4ec2823dd1262cc87aa7b7c8540e55acb3ada8d0295f8e4915af87e95e119ec79184f62952d128c441648e8deff5e223629223865a
+  data.tar.gz: 5b0758681cebaded75aa9060b55a5470468e28d1e1e98956e533bab7c6db67ba96313e8195ff478720b4917bbaa987795b03df52fea9f80f781d4e919f22aa47

data/app/helpers/zuora_connect/application_helper.rb

@@ -1,5 +1,15 @@
 module ZuoraConnect
   module ApplicationHelper
+    def is_app_admin?
+      return @appinstance.blank? ? false : session["#{@appinstance.id}::admin"]
+    end
 
+    def zuora_user
+      return @zuora_user
+    end
+
+    def connect_meta_tags
+      "<meta name=\"z-hallway-prefix\" content=\"#{ Thread.current[:isHallway] }\">".html_safe
+    end
   end
 end

data/app/models/zuora_connect/app_instance_base.rb

@@ -89,7 +89,11 @@ module ZuoraConnect
       Thread.current[:appinstance] = self
     end
 
-    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false, log_level: Logger::DEBUG)
+    def default_ougai_items
+      return {app_instance_id: self.id}
+    end
+
+    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false, **args)
       self.api_version = "v2"
       self.username = username
       self.password = password
@@ -123,26 +127,26 @@ module ZuoraConnect
 
         if session.empty?
           self.new_session_message = "REFRESHING - Session Empty"
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif (self.id != session["appInstance"].to_i)
           self.new_session_message = "REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})"
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif session["#{self.id}::task_data"].blank?
           self.new_session_message = "REFRESHING - Task Data Blank"
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif session["#{self.id}::last_refresh"].blank?
           self.new_session_message = "REFRESHING - No Time on Cookie"
           recoverable_session = true
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
@@ -150,7 +154,7 @@ module ZuoraConnect
         elsif (session["#{self.id}::last_refresh"].to_i < INSTANCE_REFRESH_WINDOW.ago.to_i) && self.mark_for_refresh
           self.new_session_message = "REFRESHING - Session Old by #{time_expire.abs} second"
           recoverable_session = true
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           self.refresh(session: session)
 
         else
@@ -159,14 +163,14 @@ module ZuoraConnect
           else
             self.new_session_message = "REBUILDING - Expires in #{time_expire} seconds"
           end
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         end
       end
       return self
     rescue ZuoraConnect::Exceptions::HoldingPattern => ex
       while self.marked_for_refresh?
-        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'")
+        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'", self.default_ougai_items)
         sleep(HOLDING_PATTERN_SLEEP)
       end
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
@@ -174,10 +178,11 @@ module ZuoraConnect
       retry
     rescue => ex
       if recoverable_session
-        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache")
+        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
+        ZuoraConnect.logger.error("Failed new session", ex, self.default_ougai_items)
         raise
       end
     ensure
@@ -187,21 +192,26 @@ module ZuoraConnect
         ZuoraConnect.logger.error(ex) if !IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
       end
       Time.zone = self.timezone
-      tenants = self.task_data.dig('tenant_ids') || []
-      organizations = self.task_data.dig('organizations') || []
-      if defined?(ElasticAPM) && ElasticAPM.running?
-        ElasticAPM.set_tag(:tenant_id, tenants.first) 
-        ElasticAPM.set_tag(:organization, organizations.first) 
+      if self.task_data.present?
+        tenants = self.task_data.fetch('tenant_ids', [])
+        organizations = self.task_data.fetch('organizations', [])
+        if defined?(ElasticAPM) && ElasticAPM.running?
+          ElasticAPM.set_tag(:tenant_id, tenants.first) 
+          ElasticAPM.set_tag(:organization, organizations.first) 
+        end
+        self.logitem(item: {tenant_ids: tenants, organization: organizations})
+
+        params = {
+          :name => self.task_data.dig('name'), 
+          :zuora_entity_ids => (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).map{|e| e['id']},
+          :zuora_tenant_ids => tenants.map(&:to_s),
+        }
+        zuora_domain = self.send(LOGIN_TENANT_DESTINATION).client.rest_domain
+        ZuoraConnect::RequestIdMiddleware.zuora_rest_domain = zuora_domain
+        params.merge!({:zuora_domain => zuora_domain }) if self.methods.include?(LOGIN_TENANT_DESTINATION.to_sym)
+        params = params.reject{|k,v| !self.attributes.keys.member?(k.to_s) || self[k] == v}
+        self.update_columns(params) if params.present?
       end
-      self.logitem(item: {tenant_ids: tenants, organization: organizations})
-      params = {
-        :name => self.task_data.dig('name'), 
-        :zuora_entity_ids => (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).map{|e| e['id']},
-        :zuora_tenant_ids => self.task_data.fetch('tenant_ids', []).map(&:to_s),
-      } 
-      params.merge!({:zuora_domain => self.send(LOGIN_TENANT_DESTINATION).client.rest_domain })
-      params = params.reject{|k,v| !self.attributes.keys.member?(k.to_s) || self[k] == v}
-      self.update_columns(params) if params.present?
     end
 
     def refresh(session: {}, session_fallback: false)
@@ -212,41 +222,41 @@ module ZuoraConnect
         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("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
+        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
-    rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+      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("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
+        ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
         retry
       else
-        ZuoraConnect.logger.fatal("[#{self.id}] REFRESH TASK - #{ex.class} Failed #{refresh_count}x")
+        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.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
         if ex.code == 401
-          ZuoraConnect.logger.info("[#{self.id}] REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})")
           self.refresh_oauth
-        else
-          ZuoraConnect.logger.warn("[#{self.id}] REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})")
         end
         retry
       else
-        ZuoraConnect.logger.fatal("[#{self.id}] REFRESH TASK - Failed #{ex.code} - #{refresh_count}x")
+        ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex, self.default_ougai_items)
         raise
       end
     end
@@ -434,7 +444,7 @@ module ZuoraConnect
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
-      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (update_login_count += 1) < 3
           retry
         else
@@ -462,7 +472,7 @@ module ZuoraConnect
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
-      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (update_task_count += 1) < 3
           retry
         else
@@ -484,7 +494,7 @@ module ZuoraConnect
       def check_oauth_state(method)
         #Refresh token if already expired
         if self.oauth_expired?
-          ZuoraConnect.logger.debug("[#{self.id}] Before '#{method}' method, Oauth expired")
+          ZuoraConnect.logger.debug("Before '#{method}' method, Oauth expired", self.default_ougai_items)
           self.refresh_oauth
         end
       end
@@ -503,7 +513,7 @@ module ZuoraConnect
                 }
         response = HTTParty.post("#{ZuoraConnect.configuration.url}/oauth/token",:body => params)
         response_time = Time.now - start
-        ZuoraConnect.logger.debug("[#{self.id}] REFRESH OAUTH - In #{response_time.round(2).to_s}")
+        ZuoraConnect.logger.debug("REFRESH OAUTH - In #{response_time.round(2).to_s}", self.default_ougai_items)
 
         if response.code == 200
           response_body = JSON.parse(response.body)
@@ -513,14 +523,15 @@ 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).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.info("[#{self.id}] REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})")
+          sleep(5)
+          ZuoraConnect.logger.debug("REFRESH OAUTH - Connection Failure Retrying(#{refresh_oauth_count})", ex, self.default_ougai_items)
           retry
         else
-          ZuoraConnect.logger.fatal("[#{self.id}] REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x")
+          ZuoraConnect.logger.fatal("REFRESH OAUTH - Connection Failed", ex, self.default_ougai_items)
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
@@ -531,10 +542,10 @@ module ZuoraConnect
         return if !self.oauth_expired?
 
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.info("[#{self.id}] REFRESH OAUTH - Failed #{ex.code} - Retrying(#{refresh_oauth_count})")
+          ZuoraConnect.logger.debug("REFRESH OAUTH - Communication Failure Retrying(#{refresh_oauth_count})", ex, self.default_ougai_items)
           retry
         else
-          ZuoraConnect.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed #{ex.code} - #{refresh_oauth_count}x")
+          ZuoraConnect.logger.fatal("REFRESH OAUTH - Communication Failed #{ex.code}", ex, self.default_ougai_items)
           raise
         end
       end
@@ -576,7 +587,7 @@ module ZuoraConnect
           begin
             redis_get_command ||= 0
             cached_instance = Redis.current.get("AppInstance:#{self.id}")
-          rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+          rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
             if (redis_get_command += 1) < 3
               retry
             else
@@ -584,10 +595,10 @@ module ZuoraConnect
             end
           end
           if cached_instance.blank?
-            ZuoraConnect.logger.debug("[#{self.id}] Cached AppInstance Missing")
+            ZuoraConnect.logger.debug("Cached AppInstance Missing", self.default_ougai_items)
             return session
           else
-            ZuoraConnect.logger.debug("[#{self.id}] 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
@@ -599,7 +610,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("[#{self.id}] 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
@@ -660,9 +671,10 @@ module ZuoraConnect
           begin
             return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
           rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
-            ZuoraConnect.logger.add(Logger::ERROR, "Error Decrypting for #{self.id}") 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
@@ -1029,9 +1041,7 @@ module ZuoraConnect
 
     def method_missing(method_sym, *arguments, &block)
       if method_sym.to_s.include?("login")
-        ZuoraConnect.logger.fatal("Method Missing #{method_sym}")
-        ZuoraConnect.logger.fatal("Instance Data: #{self.task_data}")
-        ZuoraConnect.logger.fatal("Instance Logins: #{self.logins}")
+        ZuoraConnect.logger.fatal("Method Missing #{method_sym}. Instance Data: #{self.task_data} Instance Logins: #{self.logins}", self.default_ougai_items)
       end
       super
     end

data/app/models/zuora_connect/telegraf.rb

@@ -19,7 +19,7 @@ module ZuoraConnect
       end
     rescue => ex
       self.host = nil
-      ZuoraConnect.logger.warn(self.format_metric_log('Telegraf', "Failed to connect: #{ex.class}"))
+      ZuoraConnect.logger.warn(self.format_metric_log('Telegraf', "Failed to connect: #{ex.class}")) if Rails.env.to_s != 'production'
     end
 
     def write(direction: 'Unknown', tags: {}, values: {})
@@ -56,7 +56,7 @@ module ZuoraConnect
       self.host.write InfluxDB::PointValue.new({series: series, tags: tags, values: values}).dump 
     rescue => ex
       self.connect
-      ZuoraConnect.logger.warn(self.format_metric_log('Telegraf',"Failed to write udp: #{ex.class}"))
+      ZuoraConnect.logger.warn(self.format_metric_log('Telegraf',"Failed to write udp: #{ex.class}")) if Rails.env.to_s != 'production'
     end
 
     def format_metric_log(message, dump = nil)

data/app/views/zuora_connect/static/error_unhandled.erb

@@ -59,8 +59,14 @@
       <div class="dialog" style='max-width: 74em;'>
         <div><h1><%= exception.class %> - '<%= exception.message %>'</h1></div>
         <p style='text-align: left;'>
+          <% last_line = false %>
           <% exception.backtrace.each do |line| %>
-            <%= line %><br>
+            <% ending = last_line && !line.include?(Rails.root.to_s) ? false : true %> 
+            <% break if !ending%>
+            <% if ending %>
+              <%= line %><br>
+            <% end %>
+            <% last_line = line.include?(Rails.root.to_s) %>
           <% end %>
         </p>
       </div>

data/config/initializers/patches.rb

@@ -0,0 +1,9 @@
+#Used to ensure encode of UploadedFile for lograge does not dump entire file. 
+class ActionDispatch::Http::UploadedFile
+  def as_json(options = nil)
+    %w(headers).inject({}) do |hash, attr|
+      hash[attr] = send(attr).force_encoding('utf-8')
+      hash
+    end
+  end
+end

data/lib/middleware/json_parse_errors.rb

@@ -0,0 +1,22 @@
+module ZuoraConnect
+  class JsonParseErrors
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      begin
+        @app.call(env)
+      rescue ActionDispatch::ParamsParser::ParseError => error
+        if env['HTTP_ACCEPT'] =~ /application\/json/ || env['CONTENT_TYPE'] =~ /application\/json/
+          return [
+            400, { "Content-Type" => "application/json" },
+            [{"success": false, "reasons": [{"code": 50000090, "message": "Malformed json was submitted." }]}.to_json ]
+          ]
+        else
+          raise error
+        end
+      end
+    end
+  end
+end

data/lib/middleware/request_id_middleware.rb

@@ -2,7 +2,7 @@ module ZuoraConnect
   class RequestIdMiddleware
     mattr_accessor :request_id
     mattr_accessor :zuora_request_id
-
+    mattr_accessor :zuora_rest_domain
     def initialize(app)
       @app = app
     end

data/lib/zuora_connect.rb

@@ -2,7 +2,6 @@ require 'zuora_connect/configuration'
 require "zuora_connect/engine"
 require 'zuora_connect/exceptions'
 require 'zuora_connect/controllers/helpers'
-require 'zuora_connect/views/helpers'
 require 'zuora_connect/railtie'
 require 'resque/additions'
 require 'resque/dynamic_queues'
@@ -25,7 +24,7 @@ module ZuoraConnect
       else
         @logger ||= custom_logger(name: "Connect", level: Rails.logger.level)
       end
-    end    
+    end
 
     def custom_logger(name: "", level: Rails.logger.present? ? Rails.logger.level : MonoLogger::INFO, type: :ougai)
       #puts name + ' - ' + {Logger::WARN => 'Logger::WARN', Logger::ERROR => 'Logger::ERROR', Logger::DEBUG => 'Logger::DEBUG', Logger::INFO => 'Logger::INFO' }[level] + ' - '
@@ -33,7 +32,7 @@ module ZuoraConnect
         require 'ougai'
         require "ougai/formatters/customizable"
         #logger = Ougai::Logger.new(MonoLogger.new(STDOUT))
-        logger = Ougai::Logger.new(STDOUT) 
+        logger = Ougai::Logger.new(STDOUT)
         logger.level = level
         if ZuoraConnect.configuration.json_logging
           logger.formatter = Ougai::Formatters::ConnectFormatter.new(name)
@@ -41,8 +40,8 @@ module ZuoraConnect
             data[:trace_id] = ZuoraConnect::RequestIdMiddleware.request_id if ZuoraConnect::RequestIdMiddleware.request_id.present?
             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 !['ElasticAPM', 'ResqueScheduler', 'ResquePool', 'Resque', 'Makara'].include?(name)
+              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,8 +85,8 @@ module ZuoraConnect
               pid: Process.pid,
               message: name == "ActionMailer" ? msg.strip : msg
             }
-            if !['ElasticAPM', 'ResqueScheduler', 'ResquePool','Resque', 'Makara'].include?(name) 
-              if Thread.current[:appinstance].present? 
+            if !['ElasticAPM', 'ResqueScheduler', 'ResquePool','Resque', 'Makara'].include?(name)
+              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
@@ -103,17 +102,13 @@ module ZuoraConnect
         end
       end
       return logger
-    end      
+    end
   end
 
   module Controllers
     autoload :Helpers,        'zuora_connect/controllers/helpers'
   end
 
-  module Views
-    ActionView::Base.send(:include, Helpers)
-  end
-
   def self.configuration
     @configuration ||= Configuration.new
   end
@@ -151,23 +146,23 @@ module ZuoraConnect
       }
     when 'test'
       defaults = {
-        active: false, 
+        active: false,
         disable_send: true
       }
     end
 
     defaults.merge!({
       disable_start_message: true,
-      pool_size: 1, 
-      transaction_max_spans: 500, 
-      ignore_url_patterns: ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*'], 
+      pool_size: 1,
+      transaction_max_spans: 500,
+      ignore_url_patterns: ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*'],
       verify_server_cert: false,
       log_level: Logger::INFO,
       service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : Rails.application.class.parent_name,
       logger: ZuoraConnect.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN)
     })
     defaults.merge!({disable_send: true}) if defined?(Rails::Console)
-    
+
     return defaults
   end
 end

data/lib/zuora_connect/controllers/helpers.rb

@@ -88,35 +88,46 @@ module ZuoraConnect
           zuora_entity_id = request.headers['ZuoraCurrentEntity'] || cookies['ZuoraCurrentEntity']
 
           if zuora_entity_id.present?
+            zuora_tenant_id = cookies['Zuora-Tenant-Id']
+            zuora_user_id = cookies['Zuora-User-Id']
             zuora_host = request.headers["HTTP_X_FORWARDED_HOST"] || "apisandbox.zuora.com"
 
+            zuora_details = {'host' => zuora_host, 'user_id' => zuora_user_id, 'tenant_id' => zuora_tenant_id, 'entity_id' => zuora_entity_id}
+
+            #Do we need to refresh session identity
+            if request.headers["Zuora-Auth-Token"].present?
+              zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", bearer_token: request.headers["Zuora-Auth-Token"], oauth_session_expires_at: Time.now + 5.minutes )
+            elsif cookies['ZSession'].present?
+              zuora_client = ZuoraAPI::Basic.new(url: "https://#{zuora_host}", session: cookies['ZSession'])
+            else
+              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
+
             begin
-              #Do we need to refresh session identity
-              if request.headers["Zuora-Auth-Token"].present?
-                zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", bearer_token: request.headers["Zuora-Auth-Token"], oauth_session_expires_at: Time.now + 5.minutes )
-              elsif cookies['ZSession'].present?
-                zuora_client = ZuoraAPI::Basic.new(url: "https://#{zuora_host}", session: cookies['ZSession'])
-              else
-                render "zuora_connect/static/error_handled", :locals => {
-                  :title => "Missing Authorization Token", 
-                  :message => "Zuora 'Zuora-Auth-Token' header and 'ZSession' cookie not present."
-                }
-                return
-              end
-              zuora_instance_id = params[:sidebar_launch].to_bool ? nil : (params[:app_instance_id] || session["appInstance"])
+              zuora_instance_id = params[:sidebar_launch].to_s.to_bool ? nil : (params[:app_instance_id] || session["appInstance"])
 
               #Identity blank or current entity different
-              if (session["ZuoraCurrentIdentity"].blank? || (session["ZuoraCurrentEntity"] != zuora_entity_id) || (session["ZSession"] != cookies['ZSession']))
+              different_zsession = session["ZSession"] != cookies['ZSession']
+              missmatched_entity = session["ZuoraCurrentEntity"] != zuora_entity_id
+              missing_identity = session["ZuoraCurrentIdentity"].blank?
+
+              if (missing_identity || missmatched_entity || different_zsession)
+                zuora_details.merge!({'identity' => {'different_zsession' => different_zsession, 'missing_identity' => missing_identity, 'missmatched_entity' => missmatched_entity}})
                 identity, response = zuora_client.rest_call(url: zuora_client.rest_endpoint("identity"))
                 session["ZuoraCurrentIdentity"] = identity
                 session["ZuoraCurrentEntity"] = identity['entityId']
                 session["ZSession"] = cookies['ZSession']
                 zuora_instance_id = nil
+                zuora_details["identity"]["entityId"] = identity['entityId']
 
                 client_describe, response = zuora_client.rest_call(url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''), session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic, headers: zuora_client.class == ZuoraAPI::Oauth ? {} : {'Authorization' => "ZSession-a3N2w #{zuora_client.get_session(prefix: false, auth_type: :basic)}"})
                 session["ZuoraCurrentUserInfo"] = client_describe
               
-                raise ZuoraConnect::Exceptions::Error.new("Header entity id, '#{zuora_entity_id}' does not match identity call entity id, '#{identity['entityId']}'.") if zuora_entity_id != identity['entityId']
+                raise ZuoraConnect::Exceptions::Error.new("Header entity id does not match identity call entity id.") if zuora_entity_id != identity['entityId']
               end
 
               #Find matching app instances.
@@ -165,7 +176,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 +188,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")
@@ -211,7 +222,7 @@ module ZuoraConnect
                     client_describe = session["ZuoraCurrentUserInfo"]
                   end
 
-                  available_entities = client_describe["accessibleEntities"].select {|entity| entity['id'] == client_describe['defaultEntityId']}
+                  available_entities = client_describe["accessibleEntities"].select {|entity| entity['id'] == zuora_entity_id}
                   task_data = {
                     "id": next_id,
                     "name": client_describe["tenantName"],
@@ -227,7 +238,7 @@ module ZuoraConnect
                       "authentication_type": "OAUTH",
                       "entities": available_entities.map {|e| e.merge({'displayName' => client_describe["tenantName"]})}
                     },
-                    "tenant_ids": available_entities.map{|e| e['entityId'] }.push(client_describe["tenantId"]).uniq,
+                    "tenant_ids": available_entities.map{|e| e['entityId']}.uniq,
                   }
                   mapped_values = {:id => next_id, :api_token => rand(36**64).to_s(36), :token => rand(36**64).to_s(36), :zuora_logins => task_data, :oauth_expires_at => Time.now + 1000.years, :zuora_domain => zuora_client.rest_domain, :zuora_entity_ids => [zuora_entity_id]}
                   @appinstance = ZuoraConnect::AppInstance.new(mapped_values)
@@ -244,7 +255,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
@@ -261,12 +272,17 @@ module ZuoraConnect
               end
 
             rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
+              output_xml, input_xml = zuora_client.soap_call(errors: [], z_session: false) do |xml|
+                xml['api'].getUserInfo
+              end
+              final_error = output_xml.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
               session.clear
+              ZuoraConnect.logger.warn(ex, zuora: zuora_details.merge({:error => final_error}))
               redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
               return
             rescue => ex
-              ZuoraConnect.logger.error(ex)
-              render "zuora_connect/static/error_unhandled", :locals => {:exception => ex}
+              ZuoraConnect.logger.error(ex, zuora: zuora_details)
+              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)
@@ -278,7 +294,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
@@ -290,7 +306,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 
@@ -384,7 +400,7 @@ module ZuoraConnect
           if @appinstance.access_token_changed? && @appinstance.refresh_token_changed?
             @appinstance.save(:validate => false)
           else
-            raise ZuoraConnect::Exceptions::AccessDenied.new("Authorization mistmatch. Possible tampering")
+            raise ZuoraConnect::Exceptions::AccessDenied.new("Authorization mismatch. Possible tampering")
           end
         end     
       end

data/lib/zuora_connect/engine.rb

@@ -12,7 +12,7 @@ module ZuoraConnect
       Rails.application.routes.prepend do
         mount ZuoraConnect::Engine, at: "/connect"
         match '/api/connect/health', via: :all, to: 'zuora_connect/static#health'
-        match '/api/connect/internal/data', via: :all, to: 'zuora_connect/static#metrics'       
+        match '/api/connect/internal/data', via: :all, to: 'zuora_connect/static#metrics'
       end
     end
 
@@ -27,6 +27,7 @@ module ZuoraConnect
     initializer "connect.helpers" do
       ActiveSupport.on_load(:action_controller) do
         include ZuoraConnect::Controllers::Helpers
+        helper ZuoraConnect::ApplicationHelper
       end
     end
   end

data/lib/zuora_connect/railtie.rb

@@ -1,5 +1,6 @@
 require 'middleware/metrics_middleware'
 require 'middleware/request_id_middleware'
+require 'middleware/json_parse_errors'
 
 module ZuoraConnect
   class Railtie < Rails::Railtie
@@ -25,6 +26,7 @@ module ZuoraConnect
     initializer "zuora_connect.configure_rails_initialization" do |app|
       app.middleware.insert_after Rack::Sendfile, ZuoraConnect::MetricsMiddleware
       app.middleware.insert_after ActionDispatch::RequestId, ZuoraConnect::RequestIdMiddleware
+      app.config.middleware.use ZuoraConnect::JsonParseErrors
     end
 
     # hook to process_action
@@ -52,7 +54,7 @@ module ZuoraConnect
           exceptions = %w(controller action format id)
           items = {
             #time: event.time.strftime('%FT%T.%6N'),  
-            params: event.payload[:params].except(*exceptions).to_json.to_s
+            params: event.payload[:params].as_json(except: exceptions).to_json.to_s
           }
           items.merge!({exception_object: event.payload[:exception_object]}) if event.payload[:exception_object].present?
           items.merge!({exception: event.payload[:exception]}) if event.payload[:exception].present?

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5y"
+  VERSION = "2.0.5zj"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5y
+  version: 2.0.5zj
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -58,20 +58,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.48
+        version: 1.7.00
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.48
+        version: 1.7.00
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.48
+        version: 1.7.00
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.48
+        version: 1.7.00
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -92,20 +92,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.4
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: lograge
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +314,7 @@ files:
 - config/initializers/apartment.rb
 - config/initializers/aws.rb
 - config/initializers/object_method_hooks.rb
+- config/initializers/patches.rb
 - config/initializers/postgresql_adapter.rb
 - config/initializers/prometheus.rb
 - config/initializers/redis.rb
@@ -351,6 +338,7 @@ files:
 - lib/logging/connect_formatter.rb
 - lib/metrics/influx/point_value.rb
 - lib/metrics/net.rb
+- lib/middleware/json_parse_errors.rb
 - lib/middleware/metrics_middleware.rb
 - lib/middleware/request_id_middleware.rb
 - lib/resque/additions.rb
@@ -366,7 +354,6 @@ files:
 - lib/zuora_connect/exceptions.rb
 - lib/zuora_connect/railtie.rb
 - lib/zuora_connect/version.rb
-- lib/zuora_connect/views/helpers.rb
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
@@ -431,44 +418,44 @@ signing_key:
 specification_version: 4
 summary: Summary of Connect.
 test_files:
-- test/lib/generators/zuora_connect/datatable_generator_test.rb
 - test/integration/navigation_test.rb
-- test/test_helper.rb
-- test/models/zuora_connect/app_instance_test.rb
-- test/fixtures/zuora_connect/app_instances.yml
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
-- test/zuora_connect_test.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
+- test/fixtures/zuora_connect/app_instances.yml
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/environments/test.rb
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
+- test/dummy/bin/rake
+- test/dummy/bin/rails
+- test/dummy/config/routes.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb
-- test/dummy/config/database.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/secrets.yml
+- test/dummy/config/locales/en.yml
+- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/secrets.yml
-- test/dummy/bin/setup
-- test/dummy/bin/rails
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
-- test/dummy/config.ru
-- test/dummy/public/422.html
-- test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy/public/500.html
 - test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/Rakefile
+- test/dummy/README.rdoc
+- test/dummy/config.ru
+- test/lib/generators/zuora_connect/datatable_generator_test.rb
+- test/test_helper.rb
+- test/zuora_connect_test.rb
+- test/models/zuora_connect/app_instance_test.rb

data/lib/zuora_connect/views/helpers.rb

@@ -1,13 +0,0 @@
-module ZuoraConnect
-  module Views
-    module Helpers
-      def is_app_admin?
-        return @appinstance.blank? ? false : session["#{@appinstance.id}::admin"]
-      end
-
-      def zuora_user
-        return @zuora_user
-      end
-    end
-  end
-end