zuora_connect 1.7.12 → 1.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85d3ef8b3c7bc267688e48fcccc5cfbc65228339
-  data.tar.gz: 6f5d6a7a2695287d180fc9a8cea31a9d3a45a8e6
+  metadata.gz: 57c64ea79f4b3a6ba77116c1676bb251646a437b
+  data.tar.gz: 0cd25ac6227fe07ddb2c65c20a0be9a9a624e58a
 SHA512:
-  metadata.gz: a7830c5b0ee6f0ecc34a2ae07668548bc7b1ad1538d746a577d59fdc876fd172f628364601e72bed5380df4e69a56ef826f010701fb5c558b1515b8739b519d1
-  data.tar.gz: 0413f067b5d0fcab6ba024b155925dccdb267329af365a47379abbfa72db1b8811760336b418475bc1c1cbf9e9e38740de8fa39cb9f8531b60b0ffaed5dadc9a
+  metadata.gz: d2cf687aa779cd9b95a6c941b9e6801b9d078ee1f1e72bfe4dcb5a598c940551df2da7ea384764c89eb3f59e36adedc2df6f025c2d0266abca276750f437d1dd
+  data.tar.gz: 7df46ffe2704050c65f1373e24c2bd61eee127dd4aa90144b2b81ac2f11b7325f60c8e1a78f3dbad3b81a1e4f2f888d90120bd323db10555dc0b8668e0eaa45b

data/app/models/zuora_connect/app_instance_base.rb

@@ -122,7 +122,7 @@ module ZuoraConnect
       Rails.logger.add(log_level, self.new_session_message)
     end
 
-    def refresh(session = nil)
+    def refresh(session = {})
       refresh_count ||= 0
       start = Time.now
       response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
@@ -205,6 +205,7 @@ module ZuoraConnect
 
     #### START Task Mathods ####
       def build_task(task_data: {}, session: {})
+        session = {} if session.blank?
         self.task_data = task_data
         self.mode = self.task_data["mode"]
         self.task_data.each do |k,v|
@@ -236,8 +237,8 @@ module ZuoraConnect
           end
         end
       rescue => ex
-        Rails.logger.error("Task Data: #{task_data}")
-        Rails.logger.error("Task Session: #{session.to_hash}")
+        Rails.logger.error("Task Data: #{task_data}") if task_data.present?
+        Rails.logger.error("Task Session: #{session.to_h}") if session.present?
         raise
       end
 
@@ -291,7 +292,7 @@ module ZuoraConnect
       end
 
       def oauth_expired?
-        return self.oauth_expires_at.present? ? (self.oauth_expires_at < Time.now) : true
+        return self.oauth_expires_at.present? ? (self.oauth_expires_at < Time.now.utc) : true
       end
 
       def refresh_oauth
@@ -383,7 +384,7 @@ module ZuoraConnect
           #Task data must be present and the last refresh cannot be old. We dont want to overwite new cache data with old
           if self.task_data.present? &&  (self.last_refresh.to_i > INSTANCE_REFRESH_WINDOW.ago.to_i)
             Rails.logger.debug("[#{self.id}] Caching AppInstance")
-            Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, encrypt_data(data: self.save_data))
+            Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, self.encrypt_data(data: self.save_data))
           end
           Redis.current.del("Deleted:#{self.id}")
         end
@@ -426,7 +427,7 @@ module ZuoraConnect
         key_iter_num, key_size, salt, signed_salt = [1000, 64, "encrypted cookie", "signed encrypted cookie"]
         raise ZuoraConnect::Exceptions::Error.new("'secret_key_base' is not set for rails environment '#{Rails.env}'. Please set in secrets file.") if Rails.application.secrets.secret_key_base.blank?
         key_generator = ActiveSupport::KeyGenerator.new(Rails.application.secrets.secret_key_base, iterations: key_iter_num)
-        secret, sign_secret = [key_generator.generate_key(salt), key_generator.generate_key(signed_salt)]
+        secret, sign_secret = [key_generator.generate_key(salt, 32), key_generator.generate_key(signed_salt)]
         return ActiveSupport::MessageEncryptor.new(secret, sign_secret)
       end
 
@@ -437,7 +438,7 @@ module ZuoraConnect
             return JSON.parse(data)
           else
             begin
-              return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
+              return JSON.parse(self.encryptor.decrypt_and_verify(CGI::unescape(data)))
             rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
               Rails.logger.fatal('Error Decrypting')
               return rescue_return

data/app/models/zuora_connect/login.rb

@@ -8,7 +8,7 @@ module ZuoraConnect
         login_type = fields.dig("authentication_type").blank? ? 'Basic' : fields.dig("authentication_type").capitalize
         
         @clients["Default"] = "::ZuoraAPI::#{login_type}".constantize.new(login_fields)
-        @default_entity = fields["entities"][0]["id"] if fields["entities"].size == 1 if fields["entities"] && fields["entities"].size > 0
+        @default_entity = fields["entities"][0]["id"] if (fields.dig("entities") || []).size == 1
         if fields["entities"] && fields["entities"].size > 0
           fields["entities"].each do |entity|
             params = {:entity_id => entity["id"]}.merge(login_fields)

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.12"
+  VERSION = "1.7.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.12
+  version: 1.7.13
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment