zuora_connect 3.0.1.pre.a → 3.0.2.pre.a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93697b2f6ee9ddb200d9aafcf700e2305740617bbc0a8b216dc32b9fd33a3f2e
-  data.tar.gz: b88d5be07b1122372eb79b9aa74662f06ba3f522a64ba0177f62842db1fe29cc
+  metadata.gz: 6af8cf178f6060ca9e70f81f24505e99f875197d51cb34ddc78de16da46dd81e
+  data.tar.gz: 4cad94cbd73e4576a6ef4a7567a169b2eb6e4768432a46b8231ff1260df4ebdc
 SHA512:
-  metadata.gz: c5bb290ae60c2375e0748a41dc6e8dfdc9b422f2718b24b81759f7985c947050afd0389fefa2d3950d240f1cf3c1f0432bd58aee33c1aa8deed46e46beab6107
-  data.tar.gz: 63703e115fea73c8aa32859719020a68c8e91cee2454260923fae72ebc3bd0e76e30607a526f98238ba8a1c85a828b892d46e99dddf4adea96228d6f2fe60396
+  metadata.gz: 06a45682d61c210d192023ede3408aac2a41654d5046ef44a3ee8083e4259a3a9fc10c19666136eba1917c457cb56accd7418a985dd4aa7883b16766cb339561
+  data.tar.gz: 76e424517a93b5b5ba0a858c41005c01de1f1f7520e482a7ed727a1d60a59a0c9562ac40795e7a46093014753eb664b89fa89659493956b9de19463770c4320b

data/app/controllers/concerns/zuora_connect/authenticate.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ZuoraConnect
+  # Methods for authenticating and setting the app instance for the current user
+  module Authenticate
+    extend ActiveSupport::Concern
+
+    def setup_instance_via_dev_mode
+      app_instance_id = ZuoraConnect.configuration.dev_mode_appinstance
+      session['appInstance'] = app_instance_id
+      session["#{app_instance_id}::admin"] = ZuoraConnect.configuration.dev_mode_admin
+
+      values = {
+        id: app_instance_id,
+        access_token: ZuoraConnect.configuration.dev_mode_user,
+        refresh_token: ZuoraConnect.configuration.dev_mode_pass,
+        token: ZuoraConnect.configuration.dev_mode_pass + ZuoraConnect.configuration.dev_mode_pass,
+        api_token: ZuoraConnect.configuration.dev_mode_pass + ZuoraConnect.configuration.dev_mode_pass
+      }
+
+      @appinstance = ZuoraConnect::AppInstance.find_by(id: app_instance_id)
+      ZuoraConnect::ZuoraUser.current_user_id = 0
+      if @appinstance.blank?
+        Apartment::Tenant.switch!('public')
+        begin
+          Apartment::Tenant.create(app_instance_id)
+        rescue Apartment::TenantExists
+          Apartment::Tenant.drop(app_instance_id)
+          retry
+        end
+        @appinstance = ZuoraConnect::AppInstance.new
+      end
+      @appinstance.assign_attributes(values)
+      @appinstance.save(validate: false)
+    end
+  end
+end

data/app/helpers/zuora_connect/application_helper.rb

@@ -1,7 +1,7 @@
 module ZuoraConnect
   module ApplicationHelper
     def is_app_admin?
-      return @appinstance.blank? ? false : session["#{@appinstance.id}::admin"]
+      return @appinstance.blank? ? false : session["#{@appinstance.id}::admin"] || @appinstance.zuora_tenant_ids.include?("9")
     end
 
     def zuora_user

data/app/models/zuora_connect/app_instance_base.rb

@@ -1293,8 +1293,8 @@ module ZuoraConnect
     end
 
     def self.read_master_db
-      if self.connection.respond_to?(:stick_to_master!)
-        self.connection.stick_to_master!(false)
+      if self.connection.respond_to?(:stick_to_primary!)
+        self.connection.stick_to_primary!(false)
         yield
         Makara::Context.release_all
       else

data/app/models/zuora_connect/login.rb

@@ -8,12 +8,12 @@ module ZuoraConnect
         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)
+        @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
           fields["entities"].each do |entity|
             params = {:entity_id => entity["id"]}.merge(login_fields)
-            @clients[entity["id"]] =  "::ZuoraAPI::#{login_type}".constantize.new(params)
+            @clients[entity["id"]] =  "::ZuoraAPI::#{login_type}".constantize.new(**params)
           end
         end
         self.attr_builder("available_entities", @clients.keys) 

data/config/initializers/object_method_hooks.rb

@@ -5,7 +5,7 @@ class Object
     args.each do |method_name|      
       old_method = instance_method(method_name) rescue next
 
-      define_method(method_name) do |*args|
+      define_method(method_name) do |*args, **kwords, &block|
         # invoke before callback
         if options[:before].present?
           options[:before].is_a?(Proc) ? options[:before].call(method_name, self):
@@ -14,7 +14,7 @@ class Object
 
         # you can modify the code to call after callback 
         # only when the old method returns true etc..
-        old_method.bind(self).call(*args)
+        old_method.bind(self).call(*args, **kwords, &block)
 
         # invoke after callback
         if options[:after].present?

data/lib/metrics/net.rb

@@ -85,7 +85,7 @@ class HttpLogger
   end
 
   def request_url(http, request)
-    URI.decode("http#{"s" if http.use_ssl?}://#{http.address}:#{http.port}#{request.path}")
+    CGI.unescape("http#{"s" if http.use_ssl?}://#{http.address}:#{http.port}#{request.path}")
   end
 
   def log_request_headers(request)

data/lib/zuora_connect.rb

@@ -80,7 +80,7 @@ module ZuoraConnect
       }
     when 'test'
       defaults = {
-        active: false,
+        enabled: false,
         disable_send: true
       }
     end
@@ -89,7 +89,7 @@ module ZuoraConnect
       disable_start_message: true,
       pool_size: 1,
       transaction_max_spans: 500,
-      ignore_url_patterns: ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*'],
+      transaction_ignore_urls: ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*'],
       verify_server_cert: false,
       log_level: Logger::INFO,
       service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : ZuoraConnect.app_name,

data/lib/zuora_connect/controllers/helpers.rb

@@ -26,14 +26,9 @@ module ZuoraConnect
             @appinstance = ZuoraConnect::AppInstance.find_by(:api_token => request.headers["API-Token"])
             ZuoraConnect.logger.debug("API REQUEST - API token") if @appinstance.present?
             check_instance
-          elsif ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(request.headers.fetch("HOST", nil))
+          elsif ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(request.headers.fetch("HOST", nil)) && request.headers['zuora-host'].present?
             zuora_host, zuora_entity_id, zuora_instance_id = [request.headers['zuora-host'], (request.headers['zuora-entity-ids'] || "").gsub('-',''), request.headers['zuora-instance-id']]
 
-            #Validate host present
-            if zuora_host.blank?
-              render json: {"status": 401, "message": "zuora-host header was not supplied."}, status: :unauthorized
-              return
-            end
             #Validate entity-ids present
             if zuora_entity_id.blank?
               render json: {"status": 401, "message": "zuora-entity-ids header was not supplied."}, status: :unauthorized
@@ -193,7 +188,7 @@ module ZuoraConnect
       end
 
       def check_connect_admin!(raise_error: false)
-        if !session["#{@appinstance.id}::admin"]
+        if !(session["#{@appinstance.id}::admin"] || @appinstance.zuora_tenant_ids.include?("9"))
           raise ZuoraConnect::Exceptions::AccessDenied.new("User is not an authorized admin for this application") if raise_error
 
           respond_to do |format|
@@ -663,34 +658,6 @@ module ZuoraConnect
       def generate_token
         rand(36**64).to_s(36)
       end
-
-      def setup_instance_via_dev_mode
-        session["appInstance"] = ZuoraConnect.configuration.dev_mode_appinstance
-        session["#{ZuoraConnect.configuration.dev_mode_appinstance}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
-
-        values = {
-          id: ZuoraConnect.configuration.dev_mode_appinstance,
-          access_token: ZuoraConnect.configuration.dev_mode_user,
-          refresh_token: ZuoraConnect.configuration.dev_mode_pass,
-          token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass,
-          api_token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass
-        }
-
-        @appinstance = ZuoraConnect::AppInstance.find_by(:id => ZuoraConnect.configuration.dev_mode_appinstance.to_i)
-        ZuoraConnect::ZuoraUser.current_user_id = 0
-        if @appinstance.blank?
-          Apartment::Tenant.switch!("public")
-          begin
-            Apartment::Tenant.create(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
-          rescue Apartment::TenantExists => ex
-            Apartment::Tenant.drop(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
-            retry
-          end
-          @appinstance = ZuoraConnect::AppInstance.new()
-        end
-        @appinstance.assign_attributes(values)
-        @appinstance.save(:validate => false)
-      end
     end
   end
 end

data/lib/zuora_connect/engine.rb

@@ -31,6 +31,7 @@ module ZuoraConnect
     initializer "connect.helpers" do
       ActiveSupport.on_load(:action_controller) do
         include ZuoraConnect::Controllers::Helpers
+        include ZuoraConnect::Authenticate
         helper ZuoraConnect::ApplicationHelper
       end
     end

data/lib/zuora_connect/railtie.rb

@@ -1,7 +1,6 @@
 require 'middleware/metrics_middleware'
 require 'middleware/request_id_middleware'
 require 'middleware/json_parse_errors'
-require 'middleware/bad_multipart_form_data_sanitizer'
 
 module ZuoraConnect
   class Railtie < Rails::Railtie
@@ -20,7 +19,6 @@ 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.middleware.insert_before Rack::Runtime, ZuoraConnect::BadMultipartFormDataSanitizer
       app.config.middleware.use ZuoraConnect::JsonParseErrors
     end
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.1-a"
+  VERSION = "3.0.2-a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.1.pre.a
+  version: 3.0.2.pre.a
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -100,13 +100,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -116,7 +130,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -346,6 +360,7 @@ files:
 - app/assets/javascripts/zuora_connect/application.js
 - app/assets/stylesheets/zuora_connect/api/v1/app_instance.css
 - app/assets/stylesheets/zuora_connect/application.css
+- app/controllers/concerns/zuora_connect/authenticate.rb
 - app/controllers/zuora_connect/admin/tenant_controller.rb
 - app/controllers/zuora_connect/api/v1/app_instance_controller.rb
 - app/controllers/zuora_connect/application_controller.rb
@@ -394,7 +409,6 @@ files:
 - db/migrate/20190520232224_add_environment_fields.rb
 - lib/metrics/influx/point_value.rb
 - lib/metrics/net.rb
-- lib/middleware/bad_multipart_form_data_sanitizer.rb
 - lib/middleware/json_parse_errors.rb
 - lib/middleware/metrics_middleware.rb
 - lib/middleware/request_id_middleware.rb

data/lib/middleware/bad_multipart_form_data_sanitizer.rb

@@ -1,21 +0,0 @@
-module ZuoraConnect
-  class BadMultipartFormDataSanitizer
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      if env['CONTENT_TYPE'] =~ /multipart\/form-data/
-        begin
-          Rack::Multipart.parse_multipart(env)
-        rescue EOFError => ex
-          # set content-type to multipart/form-data without the boundary part
-          # to handle the case where empty content is submitted
-          env['CONTENT_TYPE'] = 'multipart/form-data'
-        end
-      end
-
-      @app.call(env)
-    end
-  end
-end