zuora_connect 3.0.0.pre.x → 3.0.1.pre.c

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f102da5d3b8eacf86f53c79a69e2b0ab306cadfdd67a510b92de93788d02868
-  data.tar.gz: 7d3f89da30883780fc07725ce24159e02eed059f68c9579582f1287fd84d0857
+  metadata.gz: ad647d03e32b321e138c9adac68f251170483f170801baa94017ba70e920b8e8
+  data.tar.gz: 80fcbbb2144cbb89e2f79a28dc425350337199528e9a47adaa2f677bfd4be7ec
 SHA512:
-  metadata.gz: 2ebaffa1df592eb2982b690c40bd9e2db671f52ad8f302005a7b72152ff0327bfe61f8554f22e2d4c49b2fbfc57ca280e407cb048b3457d2ee5426e51b38bcec
-  data.tar.gz: 5fb9cb8bffc0b6f0327f2191d663b2574068f50d568c38728570bdb55130b3bbc7e626f6f1060db861467455195c49c6fcf78a4981bffa85a66716e059fc9b79
+  metadata.gz: 1d1f9ce5e3958d4c88f0480158c857cf1dcdce12f72af62c8f11c1a7caf03551b5a1be34fd30b404072058b57ef1a6b3c9834fafa7cea40615e5d5ddc992af6e
+  data.tar.gz: e3a4ac9e3994c489fe4c21e3f2ae313d58dad157a8629965c68032f8a77d4578d7076a90f22ba8bc71c195df9e97cb07cb0160452546c5a16eacdce1e96c9a53

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/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/config/initializers/postgresql_adapter.rb

@@ -10,7 +10,7 @@ module ActiveRecord
 
           return if loaded_from_cache?(initializer)
 
-          if supports_ranges?
+          if Rails::VERSION::MAJOR >= 6 || supports_ranges?
             query = <<-SQL
               SELECT DISTINCT on (t.typname) t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype
               FROM pg_type as t

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
@@ -31,6 +29,14 @@ module ZuoraConnect
         @logger ||= ZuoraObservability::Logger.custom_logger(name: "Connect", level: Rails.logger.level)
       end
     end
+
+    def app_name
+      if Rails::VERSION::MAJOR >= 6
+        Rails.application.class.module_parent_name
+      else
+        Rails.application.class.parent_name
+      end
+    end
   end
 
   module Controllers
@@ -74,7 +80,7 @@ module ZuoraConnect
       }
     when 'test'
       defaults = {
-        active: false,
+        enabled: false,
         disable_send: true
       }
     end
@@ -83,10 +89,10 @@ 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'] : Rails.application.class.parent_name,
+      service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : ZuoraConnect.app_name,
       logger: ZuoraObservability::Logger.custom_logger(name: "ElasticAPM", level: Logger::WARN)
     })
     defaults.merge!({disable_send: true}) if defined?(Rails::Console)

data/lib/zuora_connect/configuration.rb

@@ -43,7 +43,7 @@ module ZuoraConnect
       @dev_mode_access_key_id = nil
       @aws_region = "us-west-2"
       @s3_bucket_name = "rbm-apps"
-      @s3_folder_name = Rails.application.class.parent_name
+      @s3_folder_name = ZuoraConnect.app_name
     end
 
     def private_key

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|
@@ -550,11 +550,11 @@ module ZuoraConnect
             final_error = output_xml.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
             session.clear
             if final_error.blank?
-              ZuoraConnect.logger.warn("UI Authorization Error", ex, response_body: response.body)
+              ZuoraConnect.logger.warn("UI Authorization Error", ex, response: { params: response.body })
             elsif final_error != "INVALID_SESSION"
-              ZuoraConnect.logger.warn("UI Authorization Error", ex, response_body: final_error)
+              ZuoraConnect.logger.warn("UI Authorization Error", ex, response: { params: final_error })
             else
-              ZuoraConnect.logger.info("UI Authorization Error", ex, response_body: final_error)
+              ZuoraConnect.logger.info("UI Authorization Error", ex, response: { params: final_error })
             end
             redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
             return

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.0-x"
-end
+  VERSION = "3.0.1-c"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.x
+  version: 3.0.1.pre.c
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -109,7 +109,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: raindrops
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +352,7 @@ files:
 - 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
@@ -411,7 +412,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/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