zuora_connect 0.0.9.2.5 → 0.0.9.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69981fa7b93aac3a320bf5d1e2525472ee0ee5ca
-  data.tar.gz: 4728c7c17f18826fe7c3b5dee4490f4b7772d20f
+  metadata.gz: 1fdcc5a35efbb3aa4326c02640dd1c15c1425106
+  data.tar.gz: 4d397932c085d066761fd537a8e94a24a4520058
 SHA512:
-  metadata.gz: ed2d595c4cddf99e32a0b7b60ba9a6cc6047397083f743c4fddd25e15dff1cf4e244f59793e43811b17fe65e4edb329e80d5d211ec11dc030c9d8627e15b37b1
-  data.tar.gz: a27c3d73213e575b3a2c4632e9a880adc06fd08af8012615c2d1bedeb496182e2bde1cd170492460364e91448fe99355521cb9c853e512a1f5b17e417b0f2c2b
+  metadata.gz: debc5649d4c6d08d8aa00cda576cc8ca4de5cda690793469cc492210219958f8d786802ed72f6bbdd1460a2309482670324247b7405e27e94381f9c5dea8fac2
+  data.tar.gz: ff0be9a8e2a7d35f0f60702f18886bbaa3bf1a09f3515efc887fd91b0b212a3ab8e553940f324048f360b9cb5144597c940c33af511f4101d7af9e4ef2a18e7d

data/app/models/zuora_connect/app_instance.rb

@@ -11,6 +11,13 @@ module ZuoraConnect
       @valid = false
       Apartment::Migrator.migrate(self.id)
       Apartment::Tenant.switch!(self.id)
+      Thread.current[:appinstance] = self
+    end
+
+    def new_session(session: {}, username: self.access_token, password: self.refresh_token)
+      @username = username
+      @password = password
+      @last_refresh = session["#{self.id}::last_refresh"]
 
       ## DEV MODE TASK DATA MOCKUP
       if ZuoraConnect.configuration.mode != "Production"
@@ -21,25 +28,18 @@ module ZuoraConnect
           self.attr_builder(k, tmp)
         end
         self.mode = ZuoraConnect.configuration.dev_mode_mode
-      end
-      ###
-       Thread.current[:appinstance] = self
-    end
-
-    def new_session(session: {}, username: self.access_token, password: self.refresh_token)
-      @username = username
-      @password = password
-      @last_refresh = session["#{self.id}::last_refresh"]
-      if session.nil? || (!session.nil? && self.id != session["appInstance"].to_i) || session["#{self.id}::task_data"].blank? || ( session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
-        Rails.logger.debug("REFRESHING - Session Nil") if session.nil?
-        Rails.logger.debug("REFRESHING - AppInstance ID does not match session id") if  (!session.nil? && self.id != session["appInstance"].to_i)
-        Rails.logger.debug("REFRESHING - Task Data Blank") if session["#{self.id}::task_data"].blank?
-        Rails.logger.debug("REFRESHING - No Time on Cookie") if session["#{self.id}::last_refresh"].blank?
-        Rails.logger.debug("REFRESHING - Session Old") if (session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
-        self.refresh(session)
       else
-        Rails.logger.debug("REBUILDING")
-        build_task(session["#{self.id}::task_data"], session)
+        if session.nil? || (!session.nil? && self.id != session["appInstance"].to_i) || session["#{self.id}::task_data"].blank? || ( session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
+          Rails.logger.debug("REFRESHING - Session Nil") if session.nil?
+          Rails.logger.debug("REFRESHING - AppInstance ID does not match session id") if  (!session.nil? && self.id != session["appInstance"].to_i)
+          Rails.logger.debug("REFRESHING - Task Data Blank") if session["#{self.id}::task_data"].blank?
+          Rails.logger.debug("REFRESHING - No Time on Cookie") if session["#{self.id}::last_refresh"].blank?
+          Rails.logger.debug("REFRESHING - Session Old") if (session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
+          self.refresh(session)
+        else
+          Rails.logger.debug("REBUILDING")
+          build_task(session["#{self.id}::task_data"], session)
+        end
       end
       @valid = true
     end

data/lib/zuora_connect/controllers/helpers.rb

@@ -28,14 +28,12 @@ module ZuoraConnect
           else
             setup_instance_via_session
           end
-          @appinstance.new_session(:session =>instance_data_lookup(@appinstance.id, @appinstance.access_token))
-          I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : ZuoraConnect.configuration.default_locale
-          Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : ZuoraConnect.configuration.default_time_zone
         else
           setup_instance_via_dev_mode
-          I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : ZuoraConnect.configuration.default_locale
-          Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : ZuoraConnect.configuration.default_time_zone
         end
+        @appinstance.new_session(:session =>instance_data_lookup(@appinstance.id, @appinstance.access_token))
+        I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : ZuoraConnect.configuration.default_locale
+        Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : ZuoraConnect.configuration.default_time_zone
       end
 
       def persist_connect_app_session

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "0.0.9.2.5"
+  VERSION = "0.0.9.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 0.0.9.2.5
+  version: 0.0.9.2.6
 platform: ruby
 authors:
 - Connect Team