zuora_connect 2.0.57q → 2.0.57v

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c995e980fc49090f445c00d1983f0beff9659d1bad0cce9e4614d049f9ca2d54
-  data.tar.gz: 4a8c8d1b677c670b2d85556285483ec6e8bfaec5a2b43c8d1f2464c840ea9d57
+  metadata.gz: 93c1dee03d87f58c7830c73dccfbfeca3d3bc58843cfa550d5395b8c350dc1b8
+  data.tar.gz: 768068d2557358a6931d86f4a75c60830e7fb27f487126cd63bff272e059fbed
 SHA512:
-  metadata.gz: 29326ffff3c7c8c7407b1f8c8ac17688112c141f99faa93a58df4bf33f40ebbee48d29a00f6db702309691d77e1f31aa3662dfd5364dc857beb3ba76f2c3c911
-  data.tar.gz: 2740a87852d216d2e954de4573b45b098ecbcaf53fb28cf77683ed449e24e28c553e9e4aab47ee18a6fc7d62457ae8178b65371e9b052b48418b330c8dc28eaf
+  metadata.gz: 62e81faf9dd8b28fa61976624c93c1c4a56124289e3796a4984ce45878a2373716e6c04b317e20a39b19a0673dfe620d30e6f56b1083e6b61ccf4dad1ea5a7f7
+  data.tar.gz: 9c107f53da71710702b7086b01bd2eee851ddf1b3281ed82648436e3916dfe34dc2862f2c04061b37a1868d5daf6527ed2686d746467029ea5e924aebd91c4bd

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
@@ -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|
@@ -518,8 +510,6 @@ module ZuoraConnect
             session["#{values["appInstance"]}::user::email"] = values["current_user"]["email"]
           end
 
-          ZuoraConnect.logger.debug({msg: 'Setup values', connect: values}) if Rails.env != "production"
-
           @appinstance = ZuoraConnect::AppInstance.find_by(:id => values["appInstance"].to_i)
 
           if @appinstance.blank?

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.57q"
+  VERSION = "2.0.57v"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.57q
+  version: 2.0.57v
 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