zuora_connect 1.4.49 → 1.4.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d05adce2e1095e4924f0d6eae243e7edf3e91260
-  data.tar.gz: c2963b5056ea5962efa5459ff19fe873d0b4b495
+  metadata.gz: bb0ebbbcb7ba2dbc79a33200d9aadbbee60d5ef1
+  data.tar.gz: 9fc27d36749c38f4eda24712354cdd1ce7cc11f4
 SHA512:
-  metadata.gz: e25cad9662fbbdd167fee41ab9efc32c48b246068270fc7d1bd94819185171d32efe4b121c1d12b42cec73c36e5d07e46a765b85dfb88df10ee55693706a321e
-  data.tar.gz: 1264b1386fdea41a36b7942909ef167c81acce0e6787d8553c367902a17fd3bc2252825f109f46098d65b0c4829d3bdc22cedf4d30d08409f318bac8c34f4bc1
+  metadata.gz: 780067138f1eb2c0df6f70c031e66b51cb6048a28bf7c57961d13c3f771ded552f30747457b19c2fdd59cfb8d8d198bdffb78edb08d7e1131e16c47148cc37fc
+  data.tar.gz: 7c29c04bc5265fd3853b6b8b0fc15ea8e25b3cfd3d2867a553b749bd832d251fec9e02dc8119661053231ff102ec3d709f40642a47b79292899f4d80e5ebb2a0

data/app/models/zuora_connect/app_instance_base.rb

@@ -24,7 +24,7 @@ module ZuoraConnect
         PaperTrail.whodunnit = session["#{self.id}::user::email"].present? ? session["#{self.id}::user::email"] : nil if session.present? 
       end
       if defined?(Redis.current)
-        return Redis.current.get("AppInstance:#{self.id}").blank? ? {} :  decrypt_data(Redis.current.get("AppInstance:#{self.id}"))
+        return Redis.current.get("AppInstance:#{self.id}").blank? ? {} :  decrypt_data(data: Redis.current.get("AppInstance:#{self.id}"), rescue_return: {})
       else
         return session
       end
@@ -32,20 +32,39 @@ module ZuoraConnect
 
     def cache_app_instance
       if defined?(Redis.current)
-        Redis.current.set("AppInstance:#{self.id}", encrypt_data(self.save_data))
+        Redis.current.set("AppInstance:#{self.id}", encrypt_data(data: self.save_data))
         Redis.current.expire("AppInstance:#{self.id}", 60.minutes.to_i)
         Redis.current.del("Deleted:#{self.id}")
       end
     end
 
-    def decrypt_data(data)
+    def decrypt_data(data: nil, rescue_return: nil)
       return data if data.blank?
-      return Rails.env == 'development' ? JSON.parse(data) : JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
+      begin 
+        if Rails.env == 'development'
+          return JSON.parse(data)
+        else  
+          begin
+            return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
+          rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
+            Rails.logger.fatal('Error Decrypting')
+            return rescue_return
+          end
+        end
+      rescue JSON::ParserError => ex
+        Rails.logger.fatal('Error Parsing')
+        return rescue_return
+      end
     end
 
-    def encrypt_data(data)
+    def encrypt_data(data: nil)
       return data if data.blank?
-      return Rails.env == 'development' ? data.to_json : encryptor.encrypt_and_sign(data.to_json)
+
+      if Rails.env == 'development' 
+        return data.to_json 
+      else
+        return encryptor.encrypt_and_sign(data.to_json)
+      end
     end
 
     def encryptor
@@ -74,8 +93,8 @@ module ZuoraConnect
       end
 
       if defined?(Redis.current) && object_id.present? && object_id.class == String
-        stub_catalog = decrypt_data(Redis.current.get("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}"))
-        object_hierarchy = decrypt_data(Redis.current.get("Catalog:#{self.id}:#{object_id}:Hierarchy"))
+        stub_catalog = decrypt_data(data: Redis.current.get("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}"))
+        object_hierarchy = decrypt_data(data: Redis.current.get("Catalog:#{self.id}:#{object_id}:Hierarchy"))
       end
 
       if defined?(object_hierarchy)
@@ -192,8 +211,8 @@ module ZuoraConnect
       stub_catalog ||= JSON.parse(ActiveRecord::Base.connection.execute(string).first["item"] || "{}")
 
       if defined?(Redis.current) && object_id.present? && object_id.class == String
-        Redis.current.set("Catalog:#{self.id}:#{object_id}:Hierarchy", encrypt_data(object_hierarchy))
-        Redis.current.set("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}", encrypt_data(stub_catalog))  if cache
+        Redis.current.set("Catalog:#{self.id}:#{object_id}:Hierarchy", encrypt_data(data: object_hierarchy))
+        Redis.current.set("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}", encrypt_data(data: stub_catalog))  if cache
       end
 
       return stub_catalog

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.4.49"
+  VERSION = "1.4.50"
 end

metadata

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