zuora_connect 2.0.5ze → 2.0.5zg

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b1540c24b739efcb771d3b5b7306012e1a335ec0266dba93be95bce836e9f06
-  data.tar.gz: fb1b24336de23f6dd21056114ced51a513a48004cbd200e2617453465f39fc7e
+  metadata.gz: 9b2c5af96c2a7a00a74b397b942817ab2ce03622761e92c2b25ff81c4734eba4
+  data.tar.gz: 293379013a5d86e12b8eab8f735ca92879ef0b1874d973059d24aa7358e2e4d0
 SHA512:
-  metadata.gz: b0bee3bb92cffa26681e6a6f4787073e5bbe1fc4bbea92e3952d01145cd245c72b9d9d34a40c7188078e44db2d90cf3eb2b6af174283360be929c5b87afc82a9
-  data.tar.gz: ec6a9d717083b8033eab8869159ba86418fd1a50ebe47d9fda89182edf37f71af224697448d139dee81a0dd89d315ba72856e80877c2dea9d1ae7e9cd6baf81d
+  metadata.gz: df998490776be8d9147eb2a4aea83d48b8bce197d96218e94f72fe539601f0ee295720e9aa32d9519ca9fd6a5e3684f77a4aa5a556c2680d78889b325e4d6824
+  data.tar.gz: 37305db8b3f4eb55034f36b170ba88ee50df7ffae2c9fe8194f9742b4b6c2f6df5a0c6ab9b8c112984a9fa6545f1d886f3413b8bbd774262ac7df2211ddb9c05

data/app/models/zuora_connect/app_instance_base.rb

@@ -191,21 +191,24 @@ module ZuoraConnect
         ZuoraConnect.logger.error(ex) if !IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
       end
       Time.zone = self.timezone
-      tenants = self.task_data.dig('tenant_ids') || []
-      organizations = self.task_data.dig('organizations') || []
-      if defined?(ElasticAPM) && ElasticAPM.running?
-        ElasticAPM.set_tag(:tenant_id, tenants.first) 
-        ElasticAPM.set_tag(:organization, organizations.first) 
+      if self.task_data.present?
+        tenants = self.task_data.fetch('tenant_ids', [])
+        organizations = self.task_data.fetch('organizations', [])
+        if defined?(ElasticAPM) && ElasticAPM.running?
+          ElasticAPM.set_tag(:tenant_id, tenants.first) 
+          ElasticAPM.set_tag(:organization, organizations.first) 
+        end
+        self.logitem(item: {tenant_ids: tenants, organization: organizations})
+
+        params = {
+          :name => self.task_data.dig('name'), 
+          :zuora_entity_ids => (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).map{|e| e['id']},
+          :zuora_tenant_ids => tenants.map(&:to_s),
+        } 
+        params.merge!({:zuora_domain => self.send(LOGIN_TENANT_DESTINATION).client.rest_domain }) if self.methods.include?(LOGIN_TENANT_DESTINATION.to_sym)
+        params = params.reject{|k,v| !self.attributes.keys.member?(k.to_s) || self[k] == v}
+        self.update_columns(params) if params.present?
       end
-      self.logitem(item: {tenant_ids: tenants, organization: organizations})
-      params = {
-        :name => self.task_data.dig('name'), 
-        :zuora_entity_ids => (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).map{|e| e['id']},
-        :zuora_tenant_ids => self.task_data.fetch('tenant_ids', []).map(&:to_s),
-      } 
-      params.merge!({:zuora_domain => self.send(LOGIN_TENANT_DESTINATION).client.rest_domain })
-      params = params.reject{|k,v| !self.attributes.keys.member?(k.to_s) || self[k] == v}
-      self.update_columns(params) if params.present?
     end
 
     def refresh(session: {}, session_fallback: false)
@@ -231,7 +234,7 @@ module ZuoraConnect
         self.cache_app_instance
         self.reset_mark_for_refresh
       end
-    rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+    rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
       if (refresh_count += 1) < 3
         sleep(30)
         ZuoraConnect.logger.info("REFRESH TASK - #{ex.class} Retrying(#{refresh_count})", self.default_ougai_items)
@@ -438,7 +441,7 @@ module ZuoraConnect
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
-      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (update_login_count += 1) < 3
           retry
         else
@@ -466,7 +469,7 @@ module ZuoraConnect
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
-      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (update_task_count += 1) < 3
           retry
         else
@@ -519,7 +522,7 @@ module ZuoraConnect
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Refreshing Access Token for #{self.id}", response.body, response.code)
         end
-      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (refresh_oauth_count += 1) < 3
           ZuoraConnect.logger.info("REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})", self.default_ougai_items)
           retry
@@ -580,7 +583,7 @@ module ZuoraConnect
           begin
             redis_get_command ||= 0
             cached_instance = Redis.current.get("AppInstance:#{self.id}")
-          rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+          rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
             if (redis_get_command += 1) < 3
               retry
             else

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

@@ -59,8 +59,14 @@
       <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| %>
-            <%= line %><br>
+            <% 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 %>
         </p>
       </div>

data/lib/zuora_connect/controllers/helpers.rb

@@ -103,7 +103,7 @@ module ZuoraConnect
                 }
                 return
               end
-              zuora_instance_id = params[:sidebar_launch].to_bool ? nil : (params[:app_instance_id] || session["appInstance"])
+              zuora_instance_id = params[:sidebar_launch].to_s.to_bool ? nil : (params[:app_instance_id] || session["appInstance"])
 
               #Identity blank or current entity different
               if (session["ZuoraCurrentIdentity"].blank? || (session["ZuoraCurrentEntity"] != zuora_entity_id) || (session["ZSession"] != cookies['ZSession']))
@@ -385,7 +385,7 @@ module ZuoraConnect
           if @appinstance.access_token_changed? && @appinstance.refresh_token_changed?
             @appinstance.save(:validate => false)
           else
-            raise ZuoraConnect::Exceptions::AccessDenied.new("Authorization mistmatch. Possible tampering")
+            raise ZuoraConnect::Exceptions::AccessDenied.new("Authorization mismatch. Possible tampering")
           end
         end     
       end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5ze"
+  VERSION = "2.0.5zg"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5ze
+  version: 2.0.5zg
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -418,44 +418,44 @@ signing_key:
 specification_version: 4
 summary: Summary of Connect.
 test_files:
-- test/lib/generators/zuora_connect/datatable_generator_test.rb
 - test/integration/navigation_test.rb
-- test/test_helper.rb
-- test/models/zuora_connect/app_instance_test.rb
-- test/fixtures/zuora_connect/app_instances.yml
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
-- test/zuora_connect_test.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
+- test/fixtures/zuora_connect/app_instances.yml
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/environments/test.rb
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
+- test/dummy/bin/rake
+- test/dummy/bin/rails
+- test/dummy/config/routes.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb
-- test/dummy/config/database.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/secrets.yml
+- test/dummy/config/locales/en.yml
+- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/secrets.yml
-- test/dummy/bin/setup
-- test/dummy/bin/rails
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
-- test/dummy/config.ru
-- test/dummy/public/422.html
-- test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy/public/500.html
 - test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/Rakefile
+- test/dummy/README.rdoc
+- test/dummy/config.ru
+- test/lib/generators/zuora_connect/datatable_generator_test.rb
+- test/test_helper.rb
+- test/zuora_connect_test.rb
+- test/models/zuora_connect/app_instance_test.rb