zuora_connect 2.0.5z → 2.0.5za

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a444e75e8b7dde543c7fd746f2077ea447b0e4bff7c45f459e6032c00d657a3f
-  data.tar.gz: b14e75d257b9cc63e0e70e2b17bb41be30d7e6da79fb82f0db8b242ceb169598
+  metadata.gz: bc2de03ab111d1b49a4ac3124b143d3c070f3854f365284b6fd0275d19b24373
+  data.tar.gz: 64a2e8fb4ff102e98c5d1850016d76d80e75f42bc1e9ae7c87512d465ca60786
 SHA512:
-  metadata.gz: 9796c3c7bf607aafceda3ee497944ef7f76aec87dc8c98057096a61619b4896c6e0a0b09804eeec9cffe89c2cfd2832d604c5317f8e5220d49aa1c791006bc93
-  data.tar.gz: 06bf04ef362d45e7954722de4a26b96b547080e78549a6118a48232dfbcb89592b4c4add15eec367e9ac3d698a77081be68484d922320ffb4d0c1cc95a5f94e3
+  metadata.gz: 5ed88071768d563993ea4566233dfe988ad49332b70b02a4c7f864d060598564b52fbdf90c52987b2ab25d2bd114373286e8270192a5b2084311e0a3f7fef92f
+  data.tar.gz: ed5f16d9d65e78d7293c79478eabbd219b648424f746bf967b58d302978179ce7ff06844d62304223785fcc734cdade3c60e3370ffcac7ee60b83b413e83aeb7

data/app/models/zuora_connect/app_instance_base.rb

@@ -89,7 +89,11 @@ module ZuoraConnect
       Thread.current[:appinstance] = self
     end
 
-    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false, log_level: Logger::DEBUG)
+    def default_ougai_items
+      return {app_instance_id: self.id}
+    end
+
+    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false, **args)
       self.api_version = "v2"
       self.username = username
       self.password = password
@@ -123,26 +127,26 @@ module ZuoraConnect
 
         if session.empty?
           self.new_session_message = "REFRESHING - Session Empty"
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif (self.id != session["appInstance"].to_i)
           self.new_session_message = "REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})"
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif session["#{self.id}::task_data"].blank?
           self.new_session_message = "REFRESHING - Task Data Blank"
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
         elsif session["#{self.id}::last_refresh"].blank?
           self.new_session_message = "REFRESHING - No Time on Cookie"
           recoverable_session = true
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session: session)
 
@@ -150,7 +154,7 @@ module ZuoraConnect
         elsif (session["#{self.id}::last_refresh"].to_i < INSTANCE_REFRESH_WINDOW.ago.to_i) && self.mark_for_refresh
           self.new_session_message = "REFRESHING - Session Old by #{time_expire.abs} second"
           recoverable_session = true
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           self.refresh(session: session)
 
         else
@@ -159,14 +163,14 @@ module ZuoraConnect
           else
             self.new_session_message = "REBUILDING - Expires in #{time_expire} seconds"
           end
-          ZuoraConnect.logger.add(log_level, self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         end
       end
       return self
     rescue ZuoraConnect::Exceptions::HoldingPattern => ex
       while self.marked_for_refresh?
-        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'")
+        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'", self.default_ougai_items)
         sleep(HOLDING_PATTERN_SLEEP)
       end
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
@@ -174,7 +178,7 @@ module ZuoraConnect
       retry
     rescue => ex
       if recoverable_session
-        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache")
+        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache", self.default_ougai_items)
         self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         return self
       else
@@ -212,7 +216,7 @@ module ZuoraConnect
         response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
         response_time = Time.now - start
 
-        ZuoraConnect.logger.debug("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
+        ZuoraConnect.logger.debug("REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}", self.default_ougai_items)
         if response.code == 200
           self.build_task(task_data: JSON.parse(response.body), session: session)
           self.last_refresh = Time.now.to_i
@@ -230,23 +234,23 @@ module ZuoraConnect
     rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
       if (refresh_count += 1) < 3
         sleep(30)
-        ZuoraConnect.logger.info("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
+        ZuoraConnect.logger.info("REFRESH TASK - #{ex.class} Retrying(#{refresh_count})", self.default_ougai_items)
         retry
       else
-        ZuoraConnect.logger.fatal("[#{self.id}] REFRESH TASK - #{ex.class} Failed #{refresh_count}x")
+        ZuoraConnect.logger.fatal("REFRESH TASK - #{ex.class} Failed #{refresh_count}x", self.default_ougai_items)
         raise
       end
     rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
       if (refresh_count += 1) < 3
         if ex.code == 401
-          ZuoraConnect.logger.info("[#{self.id}] REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})")
+          ZuoraConnect.logger.info("REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})", self.default_ougai_items)
           self.refresh_oauth
         else
-          ZuoraConnect.logger.warn("[#{self.id}] REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})")
+          ZuoraConnect.logger.warn("REFRESH TASK - Failed #{ex.code} - Retrying(#{refresh_count})", self.default_ougai_items)
         end
         retry
       else
-        ZuoraConnect.logger.fatal("[#{self.id}] REFRESH TASK - Failed #{ex.code} - #{refresh_count}x")
+        ZuoraConnect.logger.fatal("REFRESH TASK - Failed #{ex.code} - #{refresh_count}x", self.default_ougai_items)
         raise
       end
     end
@@ -484,7 +488,7 @@ module ZuoraConnect
       def check_oauth_state(method)
         #Refresh token if already expired
         if self.oauth_expired?
-          ZuoraConnect.logger.debug("[#{self.id}] Before '#{method}' method, Oauth expired")
+          ZuoraConnect.logger.debug("Before '#{method}' method, Oauth expired", self.default_ougai_items)
           self.refresh_oauth
         end
       end
@@ -503,7 +507,7 @@ module ZuoraConnect
                 }
         response = HTTParty.post("#{ZuoraConnect.configuration.url}/oauth/token",:body => params)
         response_time = Time.now - start
-        ZuoraConnect.logger.debug("[#{self.id}] REFRESH OAUTH - In #{response_time.round(2).to_s}")
+        ZuoraConnect.logger.debug("REFRESH OAUTH - In #{response_time.round(2).to_s}", self.default_ougai_items)
 
         if response.code == 200
           response_body = JSON.parse(response.body)
@@ -517,10 +521,10 @@ module ZuoraConnect
         end
       rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.info("[#{self.id}] REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})")
+          ZuoraConnect.logger.info("REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})", self.default_ougai_items)
           retry
         else
-          ZuoraConnect.logger.fatal("[#{self.id}] REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x")
+          ZuoraConnect.logger.fatal("REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x", self.default_ougai_items)
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
@@ -531,10 +535,10 @@ module ZuoraConnect
         return if !self.oauth_expired?
 
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.info("[#{self.id}] REFRESH OAUTH - Failed #{ex.code} - Retrying(#{refresh_oauth_count})")
+          ZuoraConnect.logger.info("REFRESH OAUTH - Failed #{ex.code} - Retrying(#{refresh_oauth_count})", self.default_ougai_items)
           retry
         else
-          ZuoraConnect.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed #{ex.code} - #{refresh_oauth_count}x")
+          ZuoraConnect.logger.fatal("REFRESH OAUTH - Failed #{ex.code} - #{refresh_oauth_count}x", self.default_ougai_items)
           raise
         end
       end
@@ -584,10 +588,10 @@ module ZuoraConnect
             end
           end
           if cached_instance.blank?
-            ZuoraConnect.logger.debug("[#{self.id}] Cached AppInstance Missing")
+            ZuoraConnect.logger.debug("Cached AppInstance Missing", self.default_ougai_items)
             return session
           else
-            ZuoraConnect.logger.debug("[#{self.id}] Cached AppInstance Found")
+            ZuoraConnect.logger.debug("Cached AppInstance Found", self.default_ougai_items)
             return decrypt_data(data: cached_instance, rescue_return: session).merge(session)
           end
         else
@@ -599,7 +603,7 @@ module ZuoraConnect
         if defined?(Redis.current)
           #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)
-            ZuoraConnect.logger.debug("[#{self.id}] Caching AppInstance")
+            ZuoraConnect.logger.debug("Caching AppInstance", self.default_ougai_items)
             Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, self.encrypt_data(data: self.save_data))
           end
         end
@@ -660,7 +664,7 @@ module ZuoraConnect
           begin
             return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
           rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
-            ZuoraConnect.logger.add(Logger::ERROR, "Error Decrypting for #{self.id}") if log_fatal
+            ZuoraConnect.logger.error("Error Decrypting", self.default_ougai_items) if log_fatal
             return rescue_return
           rescue JSON::ParserError => ex
             return encryptor.decrypt_and_verify(CGI::unescape(data))
@@ -1029,9 +1033,7 @@ module ZuoraConnect
 
     def method_missing(method_sym, *arguments, &block)
       if method_sym.to_s.include?("login")
-        ZuoraConnect.logger.fatal("Method Missing #{method_sym}")
-        ZuoraConnect.logger.fatal("Instance Data: #{self.task_data}")
-        ZuoraConnect.logger.fatal("Instance Logins: #{self.logins}")
+        ZuoraConnect.logger.fatal("Method Missing #{method_sym}. Instance Data: #{self.task_data} Instance Logins: #{self.logins}", self.default_ougai_items)
       end
       super
     end

data/config/initializers/patches.rb

@@ -0,0 +1,9 @@
+#Used to ensure encode of UploadedFile for lograge does not dump entire file. 
+class ActionDispatch::Http::UploadedFile
+  def as_json(options = nil)
+    %w(headers).inject({}) do |hash, attr|
+      hash[attr] = send(attr).force_encoding('utf-8')
+      hash
+    end
+  end
+end

data/lib/middleware/json_parse_errors.rb

@@ -0,0 +1,22 @@
+module ZuoraConnect
+  class JsonParseErrors
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      begin
+        @app.call(env)
+      rescue ActionDispatch::ParamsParser::ParseError => error
+        if env['HTTP_ACCEPT'] =~ /application\/json/ || env['CONTENT_TYPE'] =~ /application\/json/
+          return [
+            400, { "Content-Type" => "application/json" },
+            [{"success": false, "reasons": [{"code": 50000090, "message": "Malformed json was submitted." }]}.to_json ]
+          ]
+        else
+          raise error
+        end
+      end
+    end
+  end
+end

data/lib/zuora_connect/controllers/helpers.rb

@@ -211,7 +211,7 @@ module ZuoraConnect
                     client_describe = session["ZuoraCurrentUserInfo"]
                   end
 
-                  available_entities = client_describe["accessibleEntities"].select {|entity| entity['id'] == client_describe['defaultEntityId']}
+                  available_entities = client_describe["accessibleEntities"].select {|entity| entity['id'] == zuora_entity_id}
                   task_data = {
                     "id": next_id,
                     "name": client_describe["tenantName"],
@@ -227,7 +227,7 @@ module ZuoraConnect
                       "authentication_type": "OAUTH",
                       "entities": available_entities.map {|e| e.merge({'displayName' => client_describe["tenantName"]})}
                     },
-                    "tenant_ids": available_entities.map{|e| e['entityId'] }.push(client_describe["tenantId"]).uniq,
+                    "tenant_ids": available_entities.map{|e| e['entityId']}.uniq,
                   }
                   mapped_values = {:id => next_id, :api_token => rand(36**64).to_s(36), :token => rand(36**64).to_s(36), :zuora_logins => task_data, :oauth_expires_at => Time.now + 1000.years, :zuora_domain => zuora_client.rest_domain, :zuora_entity_ids => [zuora_entity_id]}
                   @appinstance = ZuoraConnect::AppInstance.new(mapped_values)

data/lib/zuora_connect/railtie.rb

@@ -1,5 +1,6 @@
 require 'middleware/metrics_middleware'
 require 'middleware/request_id_middleware'
+require 'middleware/json_parse_errors'
 
 module ZuoraConnect
   class Railtie < Rails::Railtie
@@ -25,6 +26,7 @@ module ZuoraConnect
     initializer "zuora_connect.configure_rails_initialization" do |app|
       app.middleware.insert_after Rack::Sendfile, ZuoraConnect::MetricsMiddleware
       app.middleware.insert_after ActionDispatch::RequestId, ZuoraConnect::RequestIdMiddleware
+      app.config.middleware.use ZuoraConnect::JsonParseErrors
     end
 
     # hook to process_action
@@ -52,7 +54,7 @@ module ZuoraConnect
           exceptions = %w(controller action format id)
           items = {
             #time: event.time.strftime('%FT%T.%6N'),  
-            params: event.payload[:params].except(*exceptions).to_json.to_s
+            params: event.payload[:params].as_json(except: exceptions).to_json.to_s
           }
           items.merge!({exception_object: event.payload[:exception_object]}) if event.payload[:exception_object].present?
           items.merge!({exception: event.payload[:exception]}) if event.payload[:exception].present?

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5z"
-end
+  VERSION = "2.0.5za"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5z
+  version: 2.0.5za
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -58,20 +58,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.48
+        version: 1.7.00
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.48
+        version: 1.7.00
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.48
+        version: 1.7.00
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.48
+        version: 1.7.00
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -314,6 +314,7 @@ files:
 - config/initializers/apartment.rb
 - config/initializers/aws.rb
 - config/initializers/object_method_hooks.rb
+- config/initializers/patches.rb
 - config/initializers/postgresql_adapter.rb
 - config/initializers/prometheus.rb
 - config/initializers/redis.rb
@@ -337,6 +338,7 @@ files:
 - lib/logging/connect_formatter.rb
 - lib/metrics/influx/point_value.rb
 - lib/metrics/net.rb
+- lib/middleware/json_parse_errors.rb
 - lib/middleware/metrics_middleware.rb
 - lib/middleware/request_id_middleware.rb
 - lib/resque/additions.rb
@@ -416,44 +418,44 @@ signing_key:
 specification_version: 4
 summary: Summary of Connect.
 test_files:
+- test/integration/navigation_test.rb
+- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
+- 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/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/bin/rake
 - test/dummy/bin/setup
 - test/dummy/bin/bundle
+- test/dummy/bin/rake
 - test/dummy/bin/rails
-- test/dummy/config/secrets.yml
 - test/dummy/config/routes.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
 - test/dummy/config/environment.rb
 - test/dummy/config/application.rb
-- test/dummy/config/database.yml
 - 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/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/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config.ru
-- test/dummy/Rakefile
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/public/favicon.ico
-- test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/Rakefile
 - test/dummy/README.rdoc
-- test/integration/navigation_test.rb
-- test/zuora_connect_test.rb
-- test/models/zuora_connect/app_instance_test.rb
+- test/dummy/config.ru
 - test/lib/generators/zuora_connect/datatable_generator_test.rb
-- test/fixtures/zuora_connect/app_instances.yml
 - test/test_helper.rb
-- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
+- test/zuora_connect_test.rb
+- test/models/zuora_connect/app_instance_test.rb