zuora_connect 1.5.314 → 1.5.315

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0cf0420609a3c81b7024dd3903606536b411213
-  data.tar.gz: cd2ace3b4722dfd1dcd354555f097462014392f4
+  metadata.gz: 08d98d85c1fd5370e5727a33db78acd27af72bbd
+  data.tar.gz: 4e47dfba537758c949c6533e6143f3363adcb83f
 SHA512:
-  metadata.gz: 7b9a0c804973326def2ea1c754866a26dfa579647a363e1cad92d5bc832eb989d74140df5e3ec0a5b9f0eabdef3ce0f4e4445e6ce0c206fe250def9c71bb3e16
-  data.tar.gz: 77e84f038f3a121ff7fb2e9a63883a1c2dd26eb838527eaf2df30fac0053773f1828a21670e1c4190a4f54cbe3d80ef7ea720a1d27bf94eec27ef25b47e72d64
+  metadata.gz: 1ed43b34c914ac71245a470aee85124f23e763cb938f798c39838e89c046fcdce52a90963e2949a9b7fbc1f931ed772ccd9a5b1b50a7d53842f962bad0f1acc3
+  data.tar.gz: 8842598299033c67f22481924f5648b004a8eae911c158900e3f23976cda40411c67e9b50327f27e84745e76b0a01545e263e0ff0a33011ee48aa41154c8747a

data/app/models/zuora_connect/app_instance_base.rb

@@ -18,18 +18,22 @@ module ZuoraConnect
       self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
       self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
       PaperTrail.whodunnit = "Backend" if defined?(PaperTrail)
+      if INSTANCE_REFRESH_WINDOW > INSTANCE_REDIS_CACHE_PERIOD
+        raise "The instance refresh window cannot be greater than the instance cache period"
+      end
+      self.apartment_switch(nil, true)
+    end
+
+    def apartment_switch(method = nil, migrate = false)
       begin 
         Apartment::Tenant.switch!(self.id) if self.persisted?
       rescue Apartment::TenantNotFound => ex
         Apartment::Tenant.create(self.id.to_s)
         retry
       end
-      if(ActiveRecord::Migrator.needs_migration?)
+      if migrate && ActiveRecord::Migrator.needs_migration?
         Apartment::Migrator.migrate(self.id)
       end
-      if INSTANCE_REFRESH_WINDOW > INSTANCE_REDIS_CACHE_PERIOD
-        raise "The instance refresh window cannot be greater than the instance cache period"
-      end
       Thread.current[:appinstance] = self
     end
 
@@ -100,7 +104,6 @@ module ZuoraConnect
         Rails.logger.error("Invalid Locale: #{ex.message}")
       end
       Time.zone = self.timezone
-      Thread.current[:appinstance] = self
       return self
     rescue ZuoraConnect::Exceptions::HoldingPattern => ex
       while self.marked_for_refresh?
@@ -108,6 +111,7 @@ module ZuoraConnect
         sleep(5)
       end
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
+      session = self.data_lookup(session: session)
       retry
     end
 
@@ -177,7 +181,6 @@ module ZuoraConnect
             self.locale = v["local"]
           end
         end
-        Thread.current[:appinstance] = self
       end
 
       def updateOption(optionId, value)
@@ -304,10 +307,10 @@ module ZuoraConnect
           cached_instance = Redis.current.get("AppInstance:#{self.id}")
           if cached_instance.blank?
             Rails.logger.debug("[#{self.id}] Cached AppInstance Missing")
-            return  session
+            return session
           else
             Rails.logger.debug("[#{self.id}] Cached AppInstance Found")
-            return decrypt_data(data: cached_instance, rescue_return: {})
+            return decrypt_data(data: cached_instance, rescue_return: session)
           end
         else
           return session
@@ -719,5 +722,6 @@ module ZuoraConnect
     end
 
     method_hook :refresh, :updateOption, :update_logins, :before => :check_oauth_state
+    method_hook :new_session, :refresh, :build_task, :after => :apartment_switch
   end
 end

data/lib/zuora_connect/version.rb

@@ -1,4 +1,4 @@
 module ZuoraConnect
-  VERSION = "1.5.314"
+  VERSION = "1.5.315"
 end
  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.314
+  version: 1.5.315
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -170,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: derailed
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement