zuora_connect 2.0.17 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd013e5e470f8e77427754cec2bf9b0f6e9949f29636e929b95395873b6aaf95
-  data.tar.gz: 780bf3ea69add7f776ce9396bdb412909d1cf0668028c59cf56a5c97874a2f4d
+  metadata.gz: 94e552d4420ed7bac211118de33afd49128abdf44bba92f3e92ce27dd13322db
+  data.tar.gz: e2e438a6c527ba414f3186caf7b84f4175f094c5b67f2592ec6fa4fdd04df41c
 SHA512:
-  metadata.gz: 04fd8a7485573cb7e64fdbcbbdcc470dd25e5c8411899e6b22ba0c7294ea46a014a22b73bfd523971fa78a87d32c064a309f00b7d6b71b75cd6b3463525cebe1
-  data.tar.gz: a98aca369aa686a885166baa1af3fc9a57f40738b0125ddc2074c9a003932a2fb5c050e172a0be10c14f15f634a65f950db52253972c5f00b5f876138189c46a
+  metadata.gz: f753aa9944ec4c2397c5296e3cda93985e794dc7e37e65c15be1741fc130edf73eea34ea45a97cae2f7226b64e276c6e8db3cd1ad6cab4942452eb164bddf292
+  data.tar.gz: da356c6a1e2ab934b24fb435fe58b774d7b5bdea7824d4d4259b3ef554da60ea44ca550ec0b7120cd09db19b48a7db2fd073eab81321592a67b95140bac58f48

data/app/models/zuora_connect/app_instance_base.rb

@@ -180,6 +180,11 @@ module ZuoraConnect
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
       session = self.data_lookup(session: session)
       retry
+    rescue ZuoraConnect::Exceptions::MissMatch => ex
+      self.delete_app_instance
+      session = {}
+      ZuoraConnect.logger.error(ex, self.default_ougai_items.merge({retrieved_identifier: self.task_data['id']}))
+      retry
     rescue => ex
       if recoverable_session
         ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache", ex, self.default_ougai_items)
@@ -398,6 +403,11 @@ module ZuoraConnect
         session = {} if session.blank?
         self.task_data = task_data
         self.mode = self.task_data["mode"]
+
+        if task_data['id'].to_s != self.id.to_s
+          raise ZuoraConnect::Exceptions::MissMatch.new("Wrong Instance Identifier/Lookup")
+        end
+
         self.task_data.each do |k,v|
           if k.match(/^(.*)_login$/)
             tmp = ZuoraConnect::Login.new(v)
@@ -426,6 +436,8 @@ module ZuoraConnect
             self.locale = v["local"]
           end
         end
+      rescue ZuoraConnect::Exceptions::MissMatch => ex
+        raise
       rescue => ex
         ZuoraConnect.logger.error(ex)
         ZuoraConnect.logger.error("Task Data: #{task_data}") if task_data.present?
@@ -620,6 +632,10 @@ module ZuoraConnect
         end
       end
 
+      def delete_app_instance
+        Redis.current.del("AppInstance:#{self.id}")
+      end
+
       def cache_app_instance
         if defined?(Redis.current)
           #Task data must be present and the last refresh cannot be old. We dont want to overwite new cache data with old

data/lib/zuora_connect/controllers/helpers.rb

@@ -21,7 +21,7 @@ module ZuoraConnect
           ZuoraConnect.logger.debug("[#{@appinstance.id}] API REQUEST - API token") if @appinstance.present?
           check_instance
         elsif ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(request.headers.fetch("HOST", nil))
-          zuora_host, zuora_entity_id, zuora_instance_id = [request.headers['zuora-host'], (request.headers['zuora-entity-ids'] || "").gsub('-',''), request.headers['zuora-instance-id']]
+          zuora_host, zuora_entity_id, zuora_instance_id = [request.headers['zuora-host'], (request.headers['zuora-entity-ids'] || "").gsub('-',''), request.headers['zuora-instance-id'].to_i]
 
           #Validate host present
           if zuora_host.blank?
@@ -119,7 +119,7 @@ module ZuoraConnect
             end
 
             begin
-              zuora_instance_id = params[:sidebar_launch].to_s.to_bool ? nil : (params[:app_instance_id] || session["appInstance"])
+              zuora_instance_id = params[:sidebar_launch].to_s.to_bool ? nil : (params[:app_instance_id] || session["appInstance"]).to_i
 
               #Identity blank or current entity different
               different_zsession = session["ZSession"] != cookies['ZSession']

data/lib/zuora_connect/exceptions.rb

@@ -2,6 +2,7 @@ module ZuoraConnect
   module Exceptions
 
     class HoldingPattern < StandardError; end
+    class MissMatch < StandardError; end
     class Error < StandardError; end
     class AuthorizationNotPerformed < Error; end
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.17"
+  VERSION = "2.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.18
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment