zuora_connect 2.0.57r → 2.0.57w

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21a1c72866b5be334143271719a3ae634aa0d6c3d7a2ed2be19ae31abc0478ce
-  data.tar.gz: 91921959627af05b7418817c154124b5a32394c3af51b30578b423e476fceaf6
+  metadata.gz: d2caec5e77f73729b027d91180190ec5fde18ab6258870aac6ce1ab308da086f
+  data.tar.gz: ec7825ad450ecc9dab4a6830cf878ebe2638dfa2686501db5eab16621d99d3e2
 SHA512:
-  metadata.gz: 3e07e1f22b96386376e6cfb9877825bc8a145d9dbba2c603f16013124991b74502a25caf05b3efdac8450daa116956540c452e39bd21fe18c93eed13f65f3671
-  data.tar.gz: 159d30660b0b7d70d3094db575b12f508ae7569d6234822144bec1cada26eb4e86069f3b00e0e0ae422a507b0ea4d97815b0b52b7723a12e1387e672360fb7ff
+  metadata.gz: c89bd41a4619b94e106dfb1935e092537548c6a09b20446686866ee470f9aba1ca5d9bf1bd4845d86ccb04693cd49039504394d9278ea84b6ac8ab5a57a2925f
+  data.tar.gz: acd7a106898ce3325893caeb1680907dd58b249ab184cbb150f292b3456ac1936adfbf1309cbe78b5224c83b15973b5107590eb2d25f7d047cc2e99453b00a5a

data/app/models/zuora_connect/app_instance_base.rb

@@ -98,7 +98,9 @@ module ZuoraConnect
         Redis.current.zrem("InstanceRefreshing", self.id)
       end
       if defined?(Resque.redis)
-        Resque.redis.zrem("PauseQueue", self.id)
+        Resque.redis.zrange("PauseQueue", 0, -1).each do |key|
+          Resque.redis.zrem("PauseQueue", key) if key.split("__").first.to_i == self.id
+        end
       end
       return true
     end
@@ -203,7 +205,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 +1219,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
@@ -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.57r"
+  VERSION = "2.0.57w"
 end

metadata

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