zuora_connect 2.0.57p → 2.0.57u

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52deb8dab9ab286cbebb70f76bf2a7baa6a0531c9a4dc30a0ff595ed5fe473bc
-  data.tar.gz: 50193876865b0b41c7ac42799ecfed555c5f9b246cdd0274c3fbf35ba521cd47
+  metadata.gz: d6aca3131ad1e7e0d1893cdee0bf1f5e586866d5f2a723bed5a786cf54cf9526
+  data.tar.gz: 4d23ae9f2c26901f752480978013f296405c901f4983fca43b8ac474c63337f8
 SHA512:
-  metadata.gz: a502ab3c95acc1b05cebb4611374b8e2a5ed60859fbe5c3a8185ff1b9c802685722b97850a60243a77564faf55e20e19735dc8b42f82cc5b6c1d30e8162d2e34
-  data.tar.gz: 85c040a0bc92c2670917b89898cdfb3c29a45c3ad8be529c24a6e0dea0488f2f7b891a15ef22536a76268d3b01f97fafe247b0eefbe8bf2a1f1df745d1307a69
+  metadata.gz: 36e18417d268a88be0d6c6afee5cf5d3a749ac9c14a59e9c1c9fd5f515b4edb9887ec2b353cecdf1c0237c5c359c6702c040c9955a6fb9d8c7bf928f420ea6e6
+  data.tar.gz: ebee73aa95264ef9b980ddaeae11203b43891721ec2bac3e125794a24dd063ac0f8df5e3ef0fe1a6ffb13c34788b963653779f06bcd0a7db0f71da9bd229474a

data/app/models/zuora_connect/app_instance_base.rb

@@ -203,7 +203,7 @@ module ZuoraConnect
           else
             self.new_session_message = "REBUILDING - Expires in #{time_expire} seconds"
           end
-          ZuoraConnect.logger.debug(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
@@ -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'], self.default_ougai_items)
+      ZuoraConnect.logger.error(ex, self.default_ougai_items.merge({app_instance_id_new: self.task_data['id']}))
       retry
     rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
       raise
@@ -1217,6 +1217,16 @@ module ZuoraConnect
       end
     end
 
+    def self.without_sticking
+       if self.connection.respond_to?(:without_sticking)
+        self.connection.without_sticking do 
+          yield
+        end
+      else
+        yield
+      end
+    end
+
     method_hook :updateOption, :update_logins, :before => :check_oauth_state
     method_hook :new_session, :refresh, :build_task, :after => :apartment_switch
   end

data/lib/zuora_connect/controllers/helpers.rb

@@ -19,7 +19,6 @@ module ZuoraConnect
               ElasticAPM.set_label(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
             end
           end
-          start_time = Time.now
           if request.headers["API-Token"].present?
             @appinstance = ZuoraConnect::AppInstance.find_by(:api_token => request.headers["API-Token"])
             ZuoraConnect.logger.debug("API REQUEST - API token") if @appinstance.present?
@@ -48,7 +47,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
@@ -65,10 +64,6 @@ module ZuoraConnect
           else
             check_instance
           end
-
-          if @appinstance.present?
-            ZuoraConnect.logger.debug("Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
-          end
         end
       end
 
@@ -101,7 +96,6 @@ module ZuoraConnect
               ElasticAPM.set_label(:trace_id, request.uuid)
             end
           end
-          start_time = Time.now
 
           if ZuoraConnect.configuration.mode == "Production"
             setup_instance_via_prod_mode
@@ -141,8 +135,6 @@ module ZuoraConnect
           rescue
             ZuoraConnect.logger.error(ex)
           end
-
-          ZuoraConnect.logger.debug("Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
         end
       rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
         id = @appinstance.id
@@ -330,8 +322,8 @@ module ZuoraConnect
                     end
                   end
                 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
+              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']
@@ -503,7 +495,7 @@ module ZuoraConnect
             end
             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)
+        elsif request["data"].present? && (request["connectInstanceId"].present? || /^([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))
           session.clear
           values = JSON.parse(ZuoraConnect::AppInstance.decrypt_response(Base64.urlsafe_decode64(request["data"])))
           values.fetch("param_data", {}).each do |k ,v|

data/lib/zuora_connect/railtie.rb

@@ -13,6 +13,7 @@ module ZuoraConnect
       PATH_INFO
       CONTENT_TYPE
       ORIGINAL_FULLPATH
+      QUERY_STRING
     )
 
     config.before_initialize do

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.57p"
+  VERSION = "2.0.57u"
 end

metadata

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