zuora_connect 2.0.60d → 2.0.60i

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f68ca8630651e624313553f6799344c23c5e63b05ed6345a4fc1cc082ea62491
-  data.tar.gz: d3da0f0dfaadda7cd0ee62abfd413ceaa64c5e3869f9b131e543d86d538a1efc
+  metadata.gz: 1fc4afe6a78f90d6c87cfa73da32a7b129a5e584672886cad408368694aad1aa
+  data.tar.gz: bdfcffca2d8ec4eb224408b25c6b14248bde1623265cca5be7a6e46ea2c63931
 SHA512:
-  metadata.gz: '00539cc692ffa61e7b13c5dbbd7cc7b9a204f3fc8ebcec71247f56b46d8915a116f47c987d2cfa36102911bf2aeb6b9dff0034565c459b414a332521f6fd6bd9'
-  data.tar.gz: 1ed5cab4fdcf39c80981cfab2c75d071e9c4371ae74a82ef25e90721020667e8e5129f51760c5a92a530f630bb8e57b255d0caa18b39123a1a0bd5fe93acacd3
+  metadata.gz: 45fbd12da62db03d87bfb2879efe01a531bb23560785145d296b68e5d06d97dbd31d6e382f2c7f53d48267a91bbaf64ca907c10d0d009c1e21bd1b13ca442acc
+  data.tar.gz: 433893af604861265c826253fb5d40236f1662ef78506bac6c87d82c315552a42297668f393c73b32e7bcdb8ce501a33ae0fc0b48dd9dff95fb43ad61c16fde2

data/app/models/zuora_connect/app_instance_base.rb

@@ -338,6 +338,10 @@ module ZuoraConnect
       raise
     end
 
+    def aws_secrets
+      (Rails.application.secrets.aws || {}).transform_keys { |key| key.to_s }
+    end
+
     #### START KMS ENCRYPTION Methods ####
       def zuora_logins=(val)
         write_attribute(:zuora_logins, kms_encrypt(val.to_json))
@@ -350,7 +354,7 @@ module ZuoraConnect
 
       def kms_decrypt(value)
         kms_tries ||= 0
-        kms_client = Aws::KMS::Client.new({region: Rails.application.secrets.aws['AWS_REGION'], credentials: self.aws_auth_client}.delete_if { |k, v| v.blank? })
+        kms_client = Aws::KMS::Client.new({region: aws_secrets['AWS_REGION'], credentials: self.aws_auth_client}.delete_if { |k, v| v.blank? })
         resp = kms_client.decrypt({ciphertext_blob: [value].pack("H*") })
         return resp.plaintext
       rescue *AWS_AUTH_ERRORS => ex
@@ -365,7 +369,7 @@ module ZuoraConnect
 
       def kms_encrypt(value)
         kms_tries ||= 0
-        kms_client = Aws::KMS::Client.new({region: Rails.application.secrets.aws['AWS_REGION'], credentials: self.aws_auth_client}.delete_if {|k,v| v.blank? })
+        kms_client = Aws::KMS::Client.new({region: aws_secrets['AWS_REGION'], credentials: self.aws_auth_client}.delete_if {|k,v| v.blank? })
 
         resp = kms_client.encrypt({key_id: kms_key, plaintext: value})
         return resp.ciphertext_blob.unpack('H*').first
@@ -380,12 +384,12 @@ module ZuoraConnect
       end
 
       def kms_key
-        return ENV['AWS_KMS_ARN'] || Rails.application.secrets.dig(:aws,'AWS_KMS_ARN')
+        return ENV['AWS_KMS_ARN'] || aws_secrets['AWS_KMS_ARN']
       end
 
       def aws_auth_client
         if Rails.env.to_s == 'development'
-          return Aws::Credentials.new(Rails.application.secrets.aws['AWS_ACCESS_KEY_ID'], Rails.application.secrets.aws['AWS_SECRET_ACCESS_KEY'])
+          return Aws::Credentials.new(aws_secrets['AWS_ACCESS_KEY_ID'], aws_secrets['AWS_SECRET_ACCESS_KEY'])
         else
           return nil
         end

data/config/initializers/postgresql_adapter.rb

@@ -1,9 +1,15 @@
 module ActiveRecord
   module ConnectionAdapters
     class PostgreSQLAdapter < AbstractAdapter
+
+      SCHEMA_ADDITIONAL_TYPES = 'SchemaAdditionalTypes'.freeze
+
       private
-        def load_additional_types(type_map, oids = nil)
+        def load_additional_types_latest(oids = nil)
           initializer = OID::TypeMapInitializer.new(type_map)
+
+          return if loaded_from_cache?(initializer)
+
           if 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
@@ -24,9 +30,73 @@ module ActiveRecord
           end
 
           execute_and_clear(query, "SCHEMA", []) do |records|
+            cache_additional_types(records)
             initializer.run(records)
           end
         end
+
+        def load_additional_types_deprecated(type_map, oids = nil)
+          initializer = OID::TypeMapInitializer.new(type_map)
+
+          return if loaded_from_cache?(initializer)
+
+          if 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
+              LEFT JOIN pg_range as r ON oid = rngtypid
+            SQL
+          else
+            query = <<-SQL
+              SELECT DISTINCT on (t.typname) t.oid, t.typname, t.typelem, t.typdelim, t.typinput, t.typtype, t.typbasetype
+              FROM pg_type as t
+            SQL
+          end
+
+          if oids
+            query += "WHERE t.oid::integer IN (%s)" % oids.join(", ")
+          else
+            query += initializer.query_conditions_for_initial_load(type_map)
+          end
+
+          execute_and_clear(query, "SCHEMA", []) do |records|
+            cache_additional_types(records)
+            initializer.run(records)
+          end
+        end
+
+        def loaded_from_cache?(initializer)
+          if defined?(Redis.current)
+            begin
+              if Redis.current.exists(SCHEMA_ADDITIONAL_TYPES)
+                initializer.run(JSON.parse(Redis.current.get(SCHEMA_ADDITIONAL_TYPES)))
+                return true
+              end
+            rescue => ex
+              Rails.logger.warn('Exception occurred while loading additional types', ex)
+            end
+          end
+
+          false
+        end
+
+        def cache_additional_types(records)
+          if defined?(Redis.current)
+            begin
+              Redis.current.setex(SCHEMA_ADDITIONAL_TYPES, 1.hour.to_i, records.to_json)
+            rescue => ex
+              Rails.logger.warn('Exception occurred while caching additional types', ex)
+            end
+          end
+        end
+
+
+        rails_version = Rails.version.split('.').map { |x| x.to_i }
+        if (rails_version <=> [5, 2, 0]) >= 1
+          alias :load_additional_types :load_additional_types_latest
+        else
+          alias :load_additional_types :load_additional_types_deprecated
+        end
     end
   end
 end

data/lib/resque/dynamic_queues.rb

@@ -92,7 +92,7 @@ module Resque
         log_with_severity :error, "Error reserving job: #{ex.inspect}"
         log_with_severity :error, ex.backtrace.join("\n")
       end
-      raise e
+      raise ex
     end
 
     def create_job(queue, payload)

data/lib/zuora_connect/controllers/helpers.rb

@@ -124,10 +124,15 @@ module ZuoraConnect
             ElasticAPM.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) && ElasticAPM.running?
             PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail)
           end
+
+          locale = (session["#{@appinstance.id}::user::locale"] || "").gsub("_", "-") 
           begin
-            locale = session["#{@appinstance.id}::user::locale"]
             I18n.locale = locale.present? ? locale : @appinstance.locale
           rescue I18n::InvalidLocale => ex
+            if locale.include?("-")
+              locale = locale.split("-").first
+              retry
+            end
             ZuoraConnect.logger.error(ex) if !ZuoraConnect::AppInstance::IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
           end
           begin
@@ -411,6 +416,7 @@ module ZuoraConnect
             if defined?(@appinstance) && !@appinstance['zuora_logins'].nil?
               #Add user/update
               begin
+                ZuoraConnect::ZuoraUser.reset_table_name
                 @zuora_user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
               rescue ActiveRecord::StatementInvalid => ex
                 if ex.message.include?("PG::UndefinedTable") && ex.message.include?("zuora_users")
@@ -434,7 +440,8 @@ module ZuoraConnect
               session["#{@appinstance.id}::user::localUserId"] = @zuora_user.id
               session["#{@appinstance.id}::user::email"] = session['ZuoraCurrentIdentity']["username"]
               session["#{@appinstance.id}::user::timezone"] = session['ZuoraCurrentIdentity']["timeZone"]
-              session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["language"]
+              session["#{@appinstance.id}::user::language"] = session['ZuoraCurrentIdentity']["language"]
+              session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["locale"]
               session["appInstance"] = @appinstance.id
 
             #We have multiple, user must pick
@@ -565,8 +572,8 @@ module ZuoraConnect
 
           rescue ZuoraAPI::Exceptions::ZuoraAPIError, Exception => ex
             if ex.message.include?("Referenced User resource(s) not found") && ex.class == ZuoraAPI::Exceptions::ZuoraAPIError
-              locals = {title: "Provisioning Error", message: "New tenats need to be provisioned by API Gateway('#{ex.message}'). Please contact support."}
-              render "zuora_connect/static/error_handled", locals: locals, status: 400, layout: false
+              locals = {title: "Provisioning Error", message: "New tenants need to be provisioned by API Gateway('#{ex.message}'). Please contact support."}
+              render "zuora_connect/static/error_handled", locals: locals, status: 200, layout: false
             else
               session.clear
               if defined?(ex.response) && ex.response.present? && defined?(ex.response.body)

data/lib/zuora_connect/railtie.rb

@@ -81,6 +81,21 @@ module ZuoraConnect
             request_headers =
               event.payload[:headers].env.
                 reject { |key| key.to_s.include?('.') || REQUEST_HEADERS_TO_IGNORE.include?(key.to_s) }
+            begin
+              if request_headers["HTTP_AUTHORIZATION"].present?
+                if request_headers["HTTP_AUTHORIZATION"].include?("Basic")
+                  user_password = request_headers["HTTP_AUTHORIZATION"].split("Basic").last.strip
+                  user, password = Base64.decode64(user_password).split(":")
+                  request_headers["HTTP_AUTHORIZATION"] = "Basic #{user}:ValueFiltered"
+                elsif 
+                  request_headers["HTTP_AUTHORIZATION"] = "ValueFiltered"
+                end
+              end
+              request_headers["HTTP_API_TOKEN"] = "ValueFiltered" if request_headers["HTTP_API_TOKEN"].present?
+            rescue
+              request_headers.delete("HTTP_API_TOKEN")
+              request_headers.delete("HTTP_AUTHORIZATION")
+            end
             items.merge!({ headers: request_headers.to_s })
           end
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.60d"
+  VERSION = "2.0.60i"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.60d
+  version: 2.0.60i
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -438,44 +438,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/lib/generators/zuora_connect/datatable_generator_test.rb
 - test/models/zuora_connect/app_instance_test.rb
+- test/integration/navigation_test.rb
+- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
 - test/zuora_connect_test.rb
-- test/dummy/Rakefile
-- test/dummy/config.ru
-- test/dummy/public/422.html
-- test/dummy/public/404.html
+- test/lib/generators/zuora_connect/datatable_generator_test.rb
 - test/dummy/public/500.html
+- test/dummy/public/404.html
 - test/dummy/public/favicon.ico
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.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/README.rdoc
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/bundle
-- test/dummy/bin/setup
+- test/dummy/public/422.html
+- test/dummy/Rakefile
+- test/dummy/config.ru
 - test/dummy/config/secrets.yml
 - test/dummy/config/boot.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/application.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/application.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/routes.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environments/test.rb
 - 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/locales/en.yml
+- test/dummy/README.rdoc
+- test/dummy/bin/rake
+- test/dummy/bin/setup
+- test/dummy/bin/rails
+- test/dummy/bin/bundle
+- 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/helpers/application_helper.rb
+- test/dummy/app/controllers/application_controller.rb
 - test/test_helper.rb