zuora_connect 2.0.57l → 2.0.57q

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97962e636b5c230c4575bce48a28de8a0c80e44794863b27e663736013f4693e
-  data.tar.gz: 6af68f301220898a4b4c52b6cdf793ca7b956bee5c77019d53a7eb8bf79b0791
+  metadata.gz: c995e980fc49090f445c00d1983f0beff9659d1bad0cce9e4614d049f9ca2d54
+  data.tar.gz: 4a8c8d1b677c670b2d85556285483ec6e8bfaec5a2b43c8d1f2464c840ea9d57
 SHA512:
-  metadata.gz: 59ef73c6afc140eee13418a6cf9b7a2b0343f74346e57334512af25111c0a2c4e950c0eae517b44235e7e7b440cf5feee87c9a2126e57d01c9bc114fea0491eb
-  data.tar.gz: 7d94fabce0bd79d30598632922b4637fdf67cd88e2232d968a79b67f61fa2c977d75d95d79d1a6d0a531ee5ae721968ae54047a457806584b97b77f32277d770
+  metadata.gz: 29326ffff3c7c8c7407b1f8c8ac17688112c141f99faa93a58df4bf33f40ebbee48d29a00f6db702309691d77e1f31aa3662dfd5364dc857beb3ba76f2c3c911
+  data.tar.gz: 2740a87852d216d2e954de4573b45b098ecbcaf53fb28cf77683ed449e24e28c553e9e4aab47ee18a6fc7d62457ae8178b65371e9b052b48418b330c8dc28eaf

data/app/assets/javascripts/hallway_wrapper/after.js

@@ -15,8 +15,11 @@ if (isHallway()) {
 }
 
 function isHallway() {
-  var regex = new RegExp("^/services/");
-  return window.location.pathname.match(regex);
+  var regex = new RegExp("(?<=\\/)services\\/.*");
+  if (regex.test(window.location.pathname)) {
+    return window.location.pathname.match(regex)[0]
+  }
+  return null;
 }
 
 function deleteAllCookies() {

data/app/models/zuora_connect/app_instance_base.rb

@@ -210,7 +210,7 @@ module ZuoraConnect
       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])
@@ -219,7 +219,7 @@ module ZuoraConnect
     rescue ZuoraConnect::Exceptions::MissMatch => ex
       self.delete_app_instance
       session = {}
-      ZuoraConnect.logger.error(ex, app_instance_id_new: self.task_data['id'])
+      ZuoraConnect.logger.error(ex, self.default_ougai_items.merge({app_instance_id_new: self.task_data['id']}))
       retry
     rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
       raise
@@ -229,7 +229,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)
+        ZuoraConnect.logger.error("Failed new session", ex, self.default_ougai_items)
         raise
       end
     ensure
@@ -1128,7 +1128,7 @@ module ZuoraConnect
           JOIN pg_class t ON l.relation = t.oid AND t.relkind = 'r'
           WHERE t.relname = '#{aggregate_name}' AND l.mode ='AccessExclusiveLock';
         eos
-        return if sql_result.count > 0
+        raise ZuoraConnect::Exceptions::Error.new("An existing lock detected while dropping table '#{aggregate_name}'") if sql_result.count > 0
 
         if index_table
           ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Index\', \'{%s}\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause), ignore_indexes.map { |index| "\"#{index}\"" }.join(',')])

data/lib/zuora_connect/controllers/helpers.rb

@@ -316,17 +316,21 @@ module ZuoraConnect
                     }, :layout => false
                     return
                   end
-                  ZuoraConnect::Exceptions::APIError.new(message: "#{app_env} navbar url was blank", response: response)
+                  raise ZuoraConnect::Exceptions::APIError.new(message: "#{app_env} navbar url was blank", response: response)
                 else
-                  begin
-                    task_ids = JSON.parse(Base64.urlsafe_decode64(CGI.parse(URI.parse(url).query)["app_instance_ids"][0]))
-                  rescue => ex
-                    raise ZuoraConnect::Exceptions::APIError.new(message: "Failure in parsing the navbar urls.", response: response)
+                  query_params = CGI.parse(URI.parse(url).query)
+                  app_instance_ids = query_params["app_instance_ids"][0]
+                  if app_instance_ids.present?
+                    begin
+                      task_ids = JSON.parse(Base64.urlsafe_decode64(app_instance_ids))
+
+                      appinstances = ZuoraConnect::AppInstance.where(:id => task_ids).pluck(:id, :name)
+                    rescue => ex
+                      raise ZuoraConnect::Exceptions::APIError.new(message: "Failure in parsing the navbar urls.", response: response)
+                    end
                   end
                 end
-                appinstances = ZuoraConnect::AppInstance.where(:id => task_ids).pluck(:id, :name)
-              else
-                appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
+                appinstances ||= ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
               end
             end
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.57l"
+  VERSION = "2.0.57q"
 end

metadata

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