zuora_connect 2.0.57y → 2.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b0b99979db4af889b1c43657367d2872868a57acba85b3ab557b3607cda970e
-  data.tar.gz: e05faaef0f5cadad7ed708f2be331caf2880301c5af0b3935b46a1ae4ee56bab
+  metadata.gz: 1b0443ea374a1f1f82e212960a7df80fb9aa953fb4bf0fcb123949e73dfc622d
+  data.tar.gz: a356f5120206bf8febbdca0db439c5792dca19156776356f09f5a39da50cf7b1
 SHA512:
-  metadata.gz: 3bfa76132b7f16cc500576804c817ba94092a75725953524090f59af82808a7e537c3798774d7d6103b1345479f368523c75a46afd38229333483e6e52157d12
-  data.tar.gz: 4d73ac1a5da30a3c6e98776af80d7fa6e1f118b7167a269aa553352f0ab1d9e57e4ef1f01edbebf380082a99b0655e784385c63527f36d41d9b5bd7f2321a311
+  metadata.gz: 34e40410cfcd4752b174d584d2cf883084630b56e7e4d897733da177fa66ece76c9ec3b2556e0ea3778b05eed949c6dba9e4c37f635d178fb9d77f776ec5221f
+  data.tar.gz: '08dde90f26d809089f79928c0cfa6d7c43d551b61448b7ce040b0ba05aa64552599ff3e3c49f46feb54340d846565faa75f891730501e2ad1ffe6a8c554856e5'

data/lib/resque/plugins/app_instance_job.rb

@@ -24,9 +24,13 @@ module Resque
           @appinstance.new_session(holding_pattern: true)
         rescue ActiveRecord::RecordNotFound => exception
           # If we can't find app_instance let make sure we cleanup
-          Rails.logger.info("No instance found, purge")
-          ZuoraConnect::AppInstance.new(id: args['app_instance_id'].to_i).prune_data
-          return
+          if Redis.current.zscore("AppInstance:Deleted", args['app_instance_id'].to_i).present?
+            Rails.logger.info("No instance found, purge")
+            ZuoraConnect::AppInstance.new(id: args['app_instance_id'].to_i).prune_data
+            return
+          else
+            raise
+          end
         rescue ActiveRecord::StatementInvalid => exception
           if (connection_count += 1) <= 3 &&
             (

data/lib/zuora_connect/controllers/helpers.rb

@@ -272,12 +272,12 @@ module ZuoraConnect
               ##
               # If the ZSession was refreshed, but it's still the same user and they aren't launching from the side bar,
               # we don't need to continue
-              is_same_user = identity.slice("entityId", "tenantId", "userId", "userProfileId") == (session["ZuoraCurrentIdentity"] || {}).slice("entityId", "tenantId", "userId", "userProfileId")
+              is_different_user = identity.slice("entityId", "tenantId", "userId", "userProfileId") == (session["ZuoraCurrentIdentity"] || {}).slice("entityId", "tenantId", "userId", "userProfileId")
               zuora_details["identity"]["entityId"] = identity['entityId']
               session["ZuoraCurrentIdentity"] = identity
               session["ZuoraCurrentEntity"] = identity['entityId']
               session["ZSession"] = cookies['ZSession']
-              unless is_same_user && !params[:sidebar_launch].to_s.to_bool
+              if is_different_user || params[:sidebar_launch].to_s.to_bool
                 zuora_instance_id = nil
                 ZuoraConnect.logger.debug("UI Authorization", zuora: zuora_details)
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.57y"
+  VERSION = "2.0.58"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.57y
+  version: 2.0.58
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -429,9 +429,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: