zuora_connect 1.5.20 → 1.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea5e29ba1f305d0692d07356a742d339ba4cb5a2
-  data.tar.gz: 5cd1099d3cdfe32e077012515ef2aa190719dc9f
+  metadata.gz: 1efbacf2ae54f697174a0bd663dd95a4a26322bf
+  data.tar.gz: 91e542803cf1d55ccf74f1e06c3afe09c8150cc8
 SHA512:
-  metadata.gz: 8ffb1d64a21abbb6f3243838a88a0a0346fe32d4aef381d305cfbfa6b784f5f96ff1b72c4a78ed5645ddcef6ca655796266a7760a91b7e8560104b6cd514dd20
-  data.tar.gz: 20e0d4faa361eefa02db96636fe73f77eda1c00862f3c4886fed4346dfb106371a532cfcd5cb5a6e00d1f5d18fa8ea9f388281effbcb28974d29a8f74c979bfa
+  metadata.gz: 61f13ab9fa62ba8ce4215da13e67bbe3172216b12a6128a2e94e5036bf8682c5555c14d92238c2dce5d38768a394b701843e0ef763c4c10f40381d4a8d8913ae
+  data.tar.gz: 64fdee29a57403098e052397a6804bf7aaf8f6aefeb5126389f2adc7ed054feb4083bdb3303ff1e94804704fa487f4308a28039bafe9548b1ba3d4ca66322744

data/app/models/zuora_connect/app_instance_base.rb

@@ -27,7 +27,7 @@ module ZuoraConnect
         cached_instance = Redis.current.get("AppInstance:#{self.id}")
         if cached_instance.blank?
           Rails.logger.info('Cached AppInstance Missing')
-          return  {}
+          return  session
         else
           Rails.logger.info('Cached AppInstance Found')
           return decrypt_data(data: cached_instance, rescue_return: {})
@@ -355,13 +355,26 @@ module ZuoraConnect
 
         build_task(mock_task_data, session)
       else
-        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.info("[#{self.id}] REFRESHING - Session Nil") if session.nil?
-          Rails.logger.info("[#{self.id}] REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})") if  (!session.nil? && self.id != session["appInstance"].to_i)
-          Rails.logger.info("[#{self.id}] REFRESHING - Task Data Blank") if session["#{self.id}::task_data"].blank?
-          Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie") if session["#{self.id}::last_refresh"].blank?
-          Rails.logger.info("[#{self.id}] REFRESHING - Session Old") if (session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
+        if session.empty?
+          Rails.logger.info("[#{self.id}] REFRESHING - Session Empty")
           self.refresh(session)
+
+        elsif (self.id != session["appInstance"].to_i) 
+          Rails.logger.info("[#{self.id}] REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})")
+          self.refresh(session)
+
+        elsif session["#{self.id}::task_data"].blank?
+          Rails.logger.info("[#{self.id}] REFRESHING - Task Data Blank")
+          self.refresh(session)
+
+        elsif session["#{self.id}::last_refresh"].blank?
+          Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie") 
+          self.refresh(session)
+
+        elsif session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i 
+          Rails.logger.info("[#{self.id}] REFRESHING - Session Old")
+          self.refresh(session)
+
         else
           Rails.logger.info("[#{self.id}] REBUILDING")
           build_task(session["#{self.id}::task_data"], session)
@@ -534,7 +547,7 @@ module ZuoraConnect
     def refresh_oauth
       count ||= 0
       start = Time.now
-      Rails.logger.info("[#{self.id}] REFRESHING - OAuth")
+      Rails.logger.debug("[#{self.id}] REFRESHING - OAuth")
       params = {
                 :grant_type => "refresh_token",
                 :redirect_uri => ZuoraConnect.configuration.oauth_client_redirect_uri,

data/lib/zuora_connect/version.rb

@@ -1,4 +1,4 @@
 module ZuoraConnect
-  VERSION = "1.5.20"
+  VERSION = "1.5.21"
 end
  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.20
+  version: 1.5.21
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -301,44 +301,44 @@ signing_key:
 specification_version: 4
 summary: Summary of Connect.
 test_files:
+- test/models/zuora_connect/app_instance_test.rb
+- test/test_helper.rb
 - test/zuora_connect_test.rb
+- test/lib/generators/zuora_connect/datatable_generator_test.rb
+- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
 - test/dummy/public/500.html
-- test/dummy/public/404.html
 - test/dummy/public/favicon.ico
+- test/dummy/public/404.html
 - test/dummy/public/422.html
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/bin/rake
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/setup
-- test/dummy/config.ru
-- test/dummy/config/environment.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config/application.rb
-- test/dummy/config/locales/en.yml
+- test/dummy/config/environments/test.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/database.yml
+- test/dummy/config/boot.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/assets.rb
-- test/dummy/config/boot.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/environment.rb
 - test/dummy/config/routes.rb
-- test/lib/generators/zuora_connect/datatable_generator_test.rb
-- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
-- test/models/zuora_connect/app_instance_test.rb
-- test/integration/navigation_test.rb
+- test/dummy/config/database.yml
+- test/dummy/README.rdoc
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/Rakefile
+- test/dummy/config.ru
+- test/dummy/bin/bundle
+- test/dummy/bin/setup
+- test/dummy/bin/rails
+- test/dummy/bin/rake
 - test/fixtures/zuora_connect/app_instances.yml
-- test/test_helper.rb
+- test/integration/navigation_test.rb