zuora_connect 2.0.57s → 2.0.57x

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5e48e465fd04b36fa1992f00cdb1670a44dde0bd7bd9b121446018ec5f1da9e
-  data.tar.gz: 0e44752cdb3d4ecb9647d7965986b4cd56590fe1fdb27c4415f1b8835630b726
+  metadata.gz: d656704d0dc0ed50b602f38069081da6b580ccd03277629546ff50228a4c4a1f
+  data.tar.gz: a17eb4cab325de5e315f7aa3b2bf874173c3a8675b555e579b2e6de07cbbbb69
 SHA512:
-  metadata.gz: cecd469b3bd8d3562201d12fdb1d6860e4a0b124b7268dadd371978cf134c05fe49ec9220898505b542d0a9399c494fb929a7f9dd35ab3660beef5883c578f38
-  data.tar.gz: 47c7f48e0fd5b26f9a169690c36f0fd142820b347c1fd51cb7795280e392ad937ba4396340e7196238eddacc523384c82d254dc7df8fd8b013511370fc6e0da5
+  metadata.gz: 0da807d582322335f94436b7e44d9dbc65d38709a1147998a736deb6b70eaa3a00f47ae6f7f9c08e324b2e6ff5d8b8b3b53e0f48e7ef2174139f67ecefa2d64e
+  data.tar.gz: 670187ee47740b0fbbd82e13e1687cc51f449523a0e2f9b84b5629418a30575e20994cb28cb64c8ca98fa9c9d730d260fe56970ab41918709b250d7007352c53

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?
@@ -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/engine.rb

@@ -1,4 +1,3 @@
-require 'rails/all'
 require 'zuora_connect'
 require 'apartment'
 require 'httparty'

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.57s
+  version: 2.0.57x
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -120,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mono_logger
   requirement: !ruby/object:Gem::Requirement