zuora_connect 2.0.26 → 2.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 239f7a1bb6772f339b0c133922484240ab3d1386977da45fd19c056efe8ab287
-  data.tar.gz: 953110b10aa289412dba1f78e7d20fef51c25fb7e7d5a727b7cc2e87e46a6bdf
+  metadata.gz: c0618f1c601bbe6126bb0c784b0cc182b079be6411cc456c6f47ad59d9b24273
+  data.tar.gz: 4ed51983f75b4550f79c3c8abfe3e351b455a9bf4cb1ea4b39e0ae49fe6a21df
 SHA512:
-  metadata.gz: d36513091307381a8f13907ccd9e9c1302e2745fb071f7b895edca58d5e769e002ea749a65a55c71d7a1d86a085c54e07df628e208c0b134617021d75696dd4d
-  data.tar.gz: e422088de704297c8ab7cbf9a876f120059d9ed641ad31d6ed54fa43520e88ee5beb1b81c172e3adb10f9a82e3466a6946c9c057d88a26062e3a38052ec6925b
+  metadata.gz: aee44be1d63cf6f8d4fb732583cc8ef4082d6e4e11cb5d6e004f080527e0b83e50d909c52f1359e112c0fe69bd7ab9ae7d4fd972b1c458a9d66eed6b69de891f
+  data.tar.gz: 93ad97bd1aecb2f0056e682fbf9b488a178bc93dc8b09437721d2c614d3b8236a01e4e56e471ac53f88d1feddcc55af9a3935d447a8d424b7e79aa04025c8fb5

data/app/models/zuora_connect/app_instance_base.rb

@@ -206,6 +206,8 @@ module ZuoraConnect
       session = {}
       ZuoraConnect.logger.error(ex, self.default_ougai_items.merge({app_instance_id_new: self.task_data['id']}))
       retry
+    rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
+      raise
     rescue => ex
       if recoverable_session
         ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache", ex, self.default_ougai_items)
@@ -333,10 +335,11 @@ module ZuoraConnect
         resp = kms_client.decrypt({ciphertext_blob: [value].pack("H*") })
         return resp.plaintext
       rescue *AWS_AUTH_ERRORS => ex
-        Rails.logger.error(AWS_AUTH_ERRORS_MSG, ex)
         if (kms_tries += 1) < 3
+          Rails.logger.warn(AWS_AUTH_ERRORS_MSG, ex)
           retry
         else
+          Rails.logger.error(AWS_AUTH_ERRORS_MSG, ex)
           raise
         end
       end
@@ -348,10 +351,11 @@ module ZuoraConnect
         resp = kms_client.encrypt({key_id: kms_key, plaintext: value})
         return resp.ciphertext_blob.unpack('H*').first
       rescue *AWS_AUTH_ERRORS => ex
-        Rails.logger.error(AWS_AUTH_ERRORS_MSG, ex)
         if (kms_tries += 1) < 3
+          Rails.logger.warn(AWS_AUTH_ERRORS_MSG, ex)
           retry
         else
+          Rails.logger.error(AWS_AUTH_ERRORS_MSG, ex)
           raise
         end
       end
@@ -495,6 +499,8 @@ module ZuoraConnect
         end
       rescue ZuoraConnect::Exceptions::MissMatch => ex
         raise
+      rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex 
+        raise
       rescue => ex
         ZuoraConnect.logger.error(ex)
         ZuoraConnect.logger.error("Task Data: #{task_data}") if task_data.present?

data/app/models/zuora_connect/login.rb

@@ -7,6 +7,7 @@ module ZuoraConnect
         login_fields = fields.map{|k,v| [k.to_sym, v]}.to_h
         login_type = fields.dig("authentication_type").blank? ? 'Basic' : fields.dig("authentication_type").capitalize
         
+        raise ZuoraConnect::Exceptions::InvalidCredentialSet.new("Cannot setup application with ZSession Login.") if login_type == "Session"
         @clients["Default"] = "::ZuoraAPI::#{login_type}".constantize.new(login_fields)
         @default_entity = fields["entities"][0]["id"] if (fields.dig("entities") || []).size == 1
         if fields["entities"] && fields["entities"].size > 0

data/app/views/zuora_connect/static/error_unhandled.erb

@@ -59,14 +59,18 @@
       <div class="dialog" style='max-width: 74em;'>
         <div><h1><%= exception.class %> - '<%= exception.message %>'</h1></div>
         <p style='text-align: left;'>
-          <% last_line = false %>
-          <% exception.backtrace.each do |line| %>
-            <% ending = last_line && !line.include?(Rails.root.to_s) ? false : true %> 
-            <% break if !ending%>
-            <% if ending %>
-              <%= line %><br>
+          <% if !defined?(skip_exception) %>
+            <% last_line = false %>
+            <% exception.backtrace.each do |line| %>
+              <% ending = last_line && !line.include?(Rails.root.to_s) ? false : true %> 
+              <% break if !ending%>
+              <% if ending %>
+                <%= line %><br>
+              <% end %>
+              <% last_line = line.include?(Rails.root.to_s) %>
             <% end %>
-            <% last_line = line.include?(Rails.root.to_s) %>
+          <% else %>
+            Please contact Zuora Support. RequestId: <%= request.uuid %>
           <% end %>
         </p>
       </div>

data/lib/zuora_connect/controllers/helpers.rb

@@ -365,6 +365,24 @@ module ZuoraConnect
         end
 
         ZuoraConnect.logger.debug("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
+
+      rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
+        id = @appinstance.id
+        ZuoraConnect::AppInstance.destroy(id)
+        Apartment::Tenant.drop(id)
+        render "zuora_connect/static/error_handled", :locals => {
+          :title => "Application Setup Error", 
+          :message => "Application cannot be run using Zuora Session. Delete old application \
+          deployment and create new with Zuora Basic or OAuth credentials."
+        }, :layout => false
+        return 
+      rescue => ex
+        ZuoraConnect.logger.error("UI Authorization Error", ex)
+        respond_to do |format|
+          format.html { render 'zuora_connect/static/error_unhandled', :locals => {:exception => ex, :skip_exception => true}, status: 500, layout: false }
+          format.js { render 'zuora_connect/static/error_unhandled', :locals => {:exception => ex, :skip_exception => true}, status: 500, layout: false}
+        end
+        return
       end
 
       def persist_connect_app_session

data/lib/zuora_connect/exceptions.rb

@@ -3,6 +3,7 @@ module ZuoraConnect
 
     class HoldingPattern < StandardError; end
     class MissMatch < StandardError; end
+    class InvalidCredentialSet < StandardError; end
     class Error < StandardError; end
     class AuthorizationNotPerformed < Error; end
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.26"
+  VERSION = "2.0.27"
 end

metadata

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