zuora_connect_oauth_alpha 2.1 → 2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ce56d36802cc50b9cdd9fbd468cb83e12c0654c98c069901d98eac53f102b4c
-  data.tar.gz: 03f227640fb6a907c4f464dc628b3b04ecbd353e0db4c48e45604b5538ee1347
+  metadata.gz: 44d299fd0ade55d38b0dab6af9d077e7bf0d06103614a325a4b14b0a48928557
+  data.tar.gz: 280362ee816ea6a4aaa9d955f1c0561cb47258f07c85523de1c59042c51e22b4
 SHA512:
-  metadata.gz: 9b4d637f2ca287daaa68590dbebce8e115b290edafcc3bffe854943aaf75bcc12a14a241cc1a910bf6b6ffd20d3a87588c45f44ad12e5ba0c61e099c05285a99
-  data.tar.gz: 3b0636782ad08ac8185d5fb52ae9c65e08278e7456d4c7af5e325a3db639c95e85a1926df23660e7d59c227a4ca526c79222ca5eae39f22dfcc2142470eed7a5
+  metadata.gz: df7695697be2d5c8e91c993066b58056673201e1f322764ba8176b1a380c7a513a4285abd2cad385950e306a449ac2fcff44b07a99a6185f231b1ef0cb0bc398
+  data.tar.gz: 2c2a3a5cfe9df47e01d482c884b12885656705334b03308fdf3d7ff5a6acf64475ea5f9259c144013751c5da518a2b4e2c5ff4c39b203d166eb8ed21cb968dbb

data/app/models/zuora_connect/app_instance_base.rb

@@ -4,7 +4,7 @@ module ZuoraConnect
     after_initialize :init
     self.table_name = "zuora_connect_app_instances"
     attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version
-    
+
     REFRESH_TIMEOUT = 2.minute                #Used to determine how long to wait on current refresh call before executing another
     INSTANCE_REFRESH_WINDOW = 30.minutes      #Used to set how how long till app starts attempting to refresh cached task connect data
     INSTANCE_REDIS_CACHE_PERIOD = 60.minutes  #Used to determine how long to cached task data will live for
@@ -25,7 +25,7 @@ module ZuoraConnect
     end
 
     def apartment_switch(method = nil, migrate = false)
-      begin 
+      begin
         Apartment::Tenant.switch!(self.id) if self.persisted?
       rescue Apartment::TenantNotFound => ex
         Apartment::Tenant.create(self.id.to_s)
@@ -70,7 +70,7 @@ module ZuoraConnect
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
 
-        elsif (self.id != session["appInstance"].to_i) 
+        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})")
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
@@ -81,11 +81,11 @@ module ZuoraConnect
           self.refresh(session)
 
         elsif session["#{self.id}::last_refresh"].blank?
-          Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie") 
+          Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie")
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
 
-        # If the cache is expired and we can aquire a refresh lock  
+        # If the cache is expired and we can aquire a refresh lock
         elsif (session["#{self.id}::last_refresh"].to_i < INSTANCE_REFRESH_WINDOW.ago.to_i) && self.mark_for_refresh
           Rails.logger.info("[#{self.id}] REFRESHING - Session Old by #{time_expire.abs} second")
           self.refresh(session)
@@ -230,7 +230,7 @@ module ZuoraConnect
       end
 
       def oauth_expired?
-        (self.oauth_expires_at < Time.now)
+        return self.oauth_expires_at.present? ? (self.oauth_expires_at < Time.now) : true
       end
 
       def refresh_oauth
@@ -268,7 +268,7 @@ module ZuoraConnect
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
         sleep(5)
         self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token]) #Reload only the refresh token for retry
-          
+
         #After reload, if nolonger expired return
         return if !self.oauth_expired?
 
@@ -301,7 +301,7 @@ module ZuoraConnect
 
       def mark_for_refresh
         return defined?(Redis.current) ? Redis.current.set("AppInstance:#{self.id}:Refreshing", true, {:nx => true, :ex => REFRESH_TIMEOUT.to_i}) : true
-      end 
+      end
 
       def data_lookup(session: {})
         if defined?(PaperTrail)
@@ -661,7 +661,7 @@ module ZuoraConnect
     ### END S3 Helping Methods #####
 
     ### START Aggregate Grouping Helping Methods ####
-      def self.refresh_aggregate_table(aggregate_name: 'all_tasks_processing', table_name: 'tasks', where_clause: "where status in ('Processing', 'Queued')", index_table: true) 
+      def self.refresh_aggregate_table(aggregate_name: 'all_tasks_processing', table_name: 'tasks', where_clause: "where status in ('Processing', 'Queued')", index_table: true)
         self.update_functions
         #Broke function into two parts to ensure transaction size was small enough
         ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Table\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause)])
@@ -673,13 +673,13 @@ module ZuoraConnect
       end
     ### END Aggregate Grouping Helping Methods #####
 
-    # Overide this method to avoid the new session call for api requests that use the before filter authenticate_app_api_request. 
+    # Overide this method to avoid the new session call for api requests that use the before filter authenticate_app_api_request.
     # This can be usefull for apps that dont need connect metadata call, or credentials, to operate for api requests
     def new_session_for_api_requests(params: {})
       return true
     end
 
-    # Overide this method to avoid the new session call for ui requests that use the before filter authenticate_connect_app_request. 
+    # Overide this method to avoid the new session call for ui requests that use the before filter authenticate_connect_app_request.
     # This can be usefull for apps that dont need connect metadata call, or credentials, to operate for ui requests
     def new_session_for_ui_requests(params: {})
       return true

data/config/initializers/redis.rb

@@ -1,6 +1,6 @@
 redis_url = ENV["REDIS_URL"].present? ?  ENV["REDIS_URL"] : defined?(Rails.application.secrets.redis) ? Rails.application.secrets.redis : 'redis://localhost:6379/1'
 if defined?(Redis.current)
-  Redis.current = Redis.new(:url => redis_url, :timeout => 10)
+  Redis.current = Redis.new(:url => redis_url, :timeout => 10, :reconnect_attempts => 2)
   if defined?(Resque.redis)
     Resque.redis = Redis.current
   end

data/lib/resque/dynamic_queues.rb

@@ -90,7 +90,7 @@ module Resque
 
       #Remove Queues under Api Limits
       api_limit_instances = Redis.current.keys('APILimits:*').map {|key| key.split('APILimits:').last.to_i}
-      real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)}
+      real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)} ## 2
       
       #Queue Pausing 
       paused_instances = Redis.current.keys('resque:PauseQueue:*').map {|key| key.split('resque:PauseQueue:').last.to_i}

data/lib/zuora_connect_oauth_alpha/version.rb

@@ -1,4 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.1"
+  VERSION = "2.11"
 end
- 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect_oauth_alpha
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: '2.11'
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,20 +27,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: zuora_api_oauth_alpha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement