zuora_connect 2.0.22 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f3e858b51010902f9c8ec4759682899fe2333fab83274cf981a61f632706dde
-  data.tar.gz: 10ae9b77eea1e77645df91f98ba7bebf8dbaea60282f9bb29b819a139ad3c3eb
+  metadata.gz: 26827913e7bac0f80cbd685cd734d68a135b774e7db4a2f7feb5584a319f5f43
+  data.tar.gz: cc9031915d27d5429ff4108237ee01d76d1d8f6b4b831dfe21d3bdeabaf9d3fe
 SHA512:
-  metadata.gz: 15425eea56c8b902c81073377dd2ee827ba33fed8d3dfafb055d7ed37ec8b8dbdcca09d94536c739701034f801020459efc25d934a3d72aeba2d6240ebfdc7e8
-  data.tar.gz: 412a861edd19a4795186aab89b1c2a9e54fe93061a8d10ef139f01c359c905051ed33d6274ffccea5c22e5ff1fecc83df78e2874b20a07d3ae051de1b76a0a99
+  metadata.gz: c30531aa3bde05acf61c252fb98395d47cbabb93182a4fd54c611fd3ee3affbe90da2089d63875b4c67605f30f9f88b5bee1ccd23f89c84b6a0feabb1e01cb5d
+  data.tar.gz: 49f27a50fc5e76f9c365030ef3513c3b71602e8032048dbfb8de533f8a78125133cb47f68e6cb8045297544ae32d0874d09229da4e5438ada87b320098ec245f

data/app/models/zuora_connect/app_instance_base.rb

@@ -56,15 +56,15 @@ module ZuoraConnect
       end
     end
 
-    def prune_data(id: self.id)
+    def prune_data
       if defined?(Redis.current)
-        Redis.current.zadd("AppInstance:Deleted", Time.now.to_i, id)
-        Redis.current.del("AppInstance:#{id}")
-        Redis.current.zrem("APILimits", id)
-        Redis.current.zrem("InstanceRefreshing", id)
+        Redis.current.zadd("AppInstance:Deleted", Time.now.to_i, self.id)
+        Redis.current.del("AppInstance:#{self.id}")
+        Redis.current.zrem("APILimits", self.id)
+        Redis.current.zrem("InstanceRefreshing", self.id)
       end
       if defined?(Resque.redis)
-        Resque.redis.zrem("PauseQueue", id)
+        Resque.redis.zrem("PauseQueue", self.id)
       end
       return true
     end
@@ -467,7 +467,7 @@ module ZuoraConnect
           end
           return parsed_json
         elsif response.code == 400
-          raise ZuoraConnect::Exceptions::APIError.new(message: parsed_json['errors'].join(' '), response: response.body, code: response.code)
+          raise ZuoraConnect::Exceptions::APIError.new(message: parsed_json['errors'].join(' '), response: response)
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
@@ -495,7 +495,7 @@ module ZuoraConnect
         if response.code == 200
           return parsed_json
         elsif response.code == 400
-          raise ZuoraConnect::Exceptions::APIError.new(message: parsed_json['errors'].join(' '), response: response.body, code: response.code)
+          raise ZuoraConnect::Exceptions::APIError.new(message: parsed_json['errors'].join(' '), response: response)
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end

data/lib/zuora_connect/controllers/helpers.rb

@@ -151,8 +151,11 @@ module ZuoraConnect
                   urls = navbar['menus'].map {|x| x['url']}
                   app_env = ENV["DEIS_APP"] || "xyz123"
                   url = urls.compact.select {|url| File.basename(url).start_with?(app_env + '?')}.first
-                  task_ids = JSON.parse(Base64.urlsafe_decode64(CGI.parse(URI.parse(url).query)["app_instance_ids"][0]))
-                  
+                  begin
+                    task_ids = JSON.parse(Base64.urlsafe_decode64(CGI.parse(URI.parse(url).query)["app_instance_ids"][0]))
+                  rescue URI::InvalidURIError => ex
+                    raise ZuoraConnect::Exceptions::APIError.new(message: "Failure in parsing the navbar urls.", response: response)
+                  end
                   appinstances = ZuoraConnect::AppInstance.where(:id => task_ids).pluck(:id, :name)
                 else
                   appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
@@ -305,7 +308,10 @@ module ZuoraConnect
               redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
               return
             rescue => ex
-              ZuoraConnect.logger.error(ex, zuora: zuora_details)
+              if defined?(ex.response) && ex.response.present? && defined?(ex.response.body)
+                zuora_details.merge!({:error => ex.response.body})
+              end
+              ZuoraConnect.logger.error("UI Authorization Error", ex, zuora: zuora_details)
               render "zuora_connect/static/error_unhandled", :locals => {:exception => ex}, :layout => false
               return              
             end

data/lib/zuora_connect/exceptions.rb

@@ -39,8 +39,8 @@ module ZuoraConnect
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message: nil,response: nil, code: nil)
-        @code = code
+      def initialize(message: nil, response: nil)
+        @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
         @default_message = "Connect update error."

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.22"
+  VERSION = "2.0.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.23
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment