zuora_connect 2.0.5zh → 2.0.5zi

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36a2f9d675095af97d07555d1aa875e5ba22b039262959a43d9a90966f45eaf3
-  data.tar.gz: 492c05ace818806101c42c5b4534d21227d0db38a19c11f39ce1183163a58df9
+  metadata.gz: 1e225cbc2b46a9186017ebe18ab9d044ab6f64978caa2655a815c19629160240
+  data.tar.gz: d91c300ababad49297f2391fc2fad6264a3db233974dcede676c3b7f7f9c389c
 SHA512:
-  metadata.gz: 593d8e422bf1edb7959bc8fd8878ad28e4219f5b42bbc73687e05540aca05995c6a1002cdec6272c037b8e904f3ff5b0e0b43290324b1e415225531c5ddc91b9
-  data.tar.gz: 05671c2dd8641935619eee8de03ae5f62d721df3e8a9d113b29d889b8cfe407c9e9bbd27c85f4b54cc2c2acc9ba70f52d2b3f778009f56216dd28e231654ca5f
+  metadata.gz: 9585fb1c69ad98eb15eb4909ef1187ffff48ea6297bc0e686e54f9f4fa6d2a9a078f6fd8f617889b0ba3128786d46c9ab3f2dce5491ad15a28c6533c2e12d0a0
+  data.tar.gz: 321b5a5ef4e139dc813287e36260b015ee6e8293705085db59b3406049ab939b2f335a4a24b5ceefbc86712caaa331a7504456f796dcb08ec0b6c138ff4fc3a7

data/app/models/zuora_connect/app_instance_base.rb

@@ -178,7 +178,7 @@ module ZuoraConnect
       retry
     rescue => ex
       if recoverable_session
-        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache", self.default_ougai_items)
+        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
@@ -240,7 +240,7 @@ module ZuoraConnect
     rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
       if (refresh_count += 1) < 3
         sleep(30)
-        ZuoraConnect.logger.warn("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", self.default_ougai_items)
+        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, self.default_ougai_items)
@@ -248,7 +248,7 @@ module ZuoraConnect
       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)
+        ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
         if ex.code == 401
           self.refresh_oauth
         end
@@ -525,7 +525,8 @@ module ZuoraConnect
         end
       rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.warn("REFRESH OAUTH - Connection Failure Retrying(#{refresh_oauth_count})", self.default_ougai_items)
+          sleep(5)
+          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, self.default_ougai_items)
@@ -539,7 +540,7 @@ module ZuoraConnect
         return if !self.oauth_expired?
 
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.warn("REFRESH OAUTH - Communication Failure Retrying(#{refresh_oauth_count})", self.default_ougai_items)
+          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, self.default_ougai_items)

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."
-                }, :layout => false
-                return
-              end
               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.
@@ -261,12 +272,16 @@ 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)
+              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)
+              ZuoraConnect.logger.error(ex, zuora: zuora_details)
               render "zuora_connect/static/error_unhandled", :locals => {:exception => ex}, :layout => false
               return              
             end

data/lib/zuora_connect/version.rb

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

metadata

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