zuora_connect 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1edf54ef7faa617e8137eb6d1b4cf650175d8afff5c3a151cac0bc44bd93a3
-  data.tar.gz: fbe951e3cba35a3d62826600b6010d4eadf4bb6c63182f3b99309a16462e2e28
+  metadata.gz: c88398123286c81b7c786b2b8facb498e7698dfbee976def5c3c21408cb8ae51
+  data.tar.gz: 8ca357c3d7c53aceac16c811bf8f730f7adc7942af67efd988cf0d2990590f8f
 SHA512:
-  metadata.gz: 4afe91d76cf445e9c32e905a7d18a084df21ca84532b18f87306b4472975be4308351f436dfdf94ea42b7f73e1d8e5072817e3d69304a9a6ab494f77a995cc21
-  data.tar.gz: 1b77362a64488f0f40d8bec796ddd1d730686ceac2aa1f84da96c01db052df912ec4426a574017d052bb26aeb601f95cdc7a570cbcdef8e0929ba3cb8231e886
+  metadata.gz: fd7a20a0893ececfc1e203ed1b186d1c735eb3df831a80c4ddfafef9809e51932351adbf8ca4c1262a1c76d4d001d2b3f32073285b4970ff0d41fca446c76eef
+  data.tar.gz: '081d1526e988249407a03c837282e92906cf622466302e0776a6921d2f7665151436a0b20a51a2fc1289f3846449d078c1e01c39694991e0fb49db1c12612b46'

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/concerns/zuora_connect/auditable.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module ZuoraConnect
+  # Added by @Vina
+  # Description: This automatically stamp user created/updated the record for DataQuery Audit
+  # Usage: add 'include ZuoraConnect::Auditable' to your model.rb that you would like to track
+  module Auditable
+    extend ActiveSupport::Concern
+
+    included do
+      before_create :set_created_by_id
+      before_update :set_updated_by_id
+
+      private
+
+      def set_created_by_id
+        self.created_by_id = ZuoraUser.current_user_id if defined?(created_by_id)
+      end
+
+      def set_updated_by_id
+        self.updated_by_id = ZuoraUser.current_user_id if defined?(updated_by_id)
+      end
+    end
+  end
+end

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

@@ -11,10 +11,8 @@ require 'resque/plugins/custom_logger'
 require 'resque/plugins/app_instance_job'
 require 'metrics/influx/point_value'
 require 'metrics/net'
-require 'zuora_connect/zuora_audit'
 require 'active_record'
 require 'zuora_observability'
-::ActiveRecord::Base.send :include, ZuoraConnect::ZuoraAudit
 
 module ZuoraConnect
   class << self
@@ -82,7 +80,7 @@ module ZuoraConnect
       }
     when 'test'
       defaults = {
-        active: false,
+        enabled: false,
         disable_send: true
       }
     end
@@ -91,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

@@ -193,7 +193,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 +663,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.0"
-end
+  VERSION = "3.0.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2021-05-18 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,12 +360,14 @@ 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
 - app/controllers/zuora_connect/static_controller.rb
 - app/helpers/zuora_connect/api/v1/app_instance_helper.rb
 - app/helpers/zuora_connect/application_helper.rb
+- app/models/concerns/zuora_connect/auditable.rb
 - app/models/zuora_connect/app_instance.rb
 - app/models/zuora_connect/app_instance_base.rb
 - app/models/zuora_connect/login.rb
@@ -393,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
@@ -411,7 +426,6 @@ files:
 - lib/zuora_connect/exceptions.rb
 - lib/zuora_connect/railtie.rb
 - lib/zuora_connect/version.rb
-- lib/zuora_connect/zuora_audit.rb
 homepage: 
 licenses: []
 metadata: {}

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

data/lib/zuora_connect/zuora_audit.rb

@@ -1,31 +0,0 @@
-# Added by @Vina
-# Description: This automatically stamp user created/updated the record for DataQuery Audit
-# Usage: add 'zuora_audit' to your model.rb that you would like to track
-
-module ZuoraConnect
-  module ZuoraAudit
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def zuora_audit
-        include ZuoraConnect::ZuoraAudit::ZuoraAuditInstanceMethods
-        before_create :set_created_by_id
-        before_update :set_updated_by_id
-      end
-    end
-
-    module ZuoraAuditInstanceMethods
-      def set_created_by_id
-        self.created_by_id = current_user_id if defined?(self.created_by_id)
-      end
-
-      def set_updated_by_id
-        self.updated_by_id = current_user_id if defined?(self.updated_by_id)
-      end
-
-      def current_user_id
-        return ZuoraConnect::ZuoraUser.current_user_id
-      end
-    end
-  end
-end