zuora_connect 2.0.57n → 2.0.57s

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d0c8c68944334a9f67bb9cd06ff2d22edf119e09b0f3fb09a351741b8ccc8b5
-  data.tar.gz: f09fa869a9898fb75c19c8148308d2bf0bae48e229a4ac06582d1c7dd3e9521b
+  metadata.gz: a5e48e465fd04b36fa1992f00cdb1670a44dde0bd7bd9b121446018ec5f1da9e
+  data.tar.gz: 0e44752cdb3d4ecb9647d7965986b4cd56590fe1fdb27c4415f1b8835630b726
 SHA512:
-  metadata.gz: 75625b6d8c46afb337b6be99b213be70d97c4a6e15a0e2f535a7a67c414658207c45c879c98912e052b39b29271b3a746105c54e0469a991c44f9420e2987d75
-  data.tar.gz: 37e1da652958136d6a7923ac3bcbe3164d945960b3809c11df15df956e8adff1ef4c8313fb1cdc1f0d653935e31e6efdb4da546a5f49a2406040375340210bd0
+  metadata.gz: cecd469b3bd8d3562201d12fdb1d6860e4a0b124b7268dadd371978cf134c05fe49ec9220898505b542d0a9399c494fb929a7f9dd35ab3660beef5883c578f38
+  data.tar.gz: 47c7f48e0fd5b26f9a169690c36f0fd142820b347c1fd51cb7795280e392ad937ba4396340e7196238eddacc523384c82d254dc7df8fd8b013511370fc6e0da5

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

data/lib/zuora_connect/controllers/helpers.rb

@@ -48,7 +48,7 @@ module ZuoraConnect
               render json: {"status": 401, "message": "Missing mapping or no deployment for '#{zuora_host}-#{zuora_entity_id}' ."}, status: :unauthorized
               return
             elsif appinstances.size > 1
-              render json: {"status": 401, "message": "More than one app instance binded to host and entity ids. Please indicate correct instance via 'zuora-instance-id' header", "instances": appinstances.map {|instance| instance.id } }, status: :unauthorized
+              render json: {"status": 401, "message": "More than one app instance binded to host and entity ids. Please indicate correct instance via 'zuora-instance-id' header", "instances": appinstances.map {|instance| instance.id }.sort }, status: :unauthorized
               return
             else
               @appinstance = appinstances.first
@@ -316,18 +316,22 @@ 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)
               end
+              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
 
             zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId']

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.57n"
+  VERSION = "2.0.57s"
 end

metadata

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