zuora_connect 2.0.60e → 2.0.60j

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9efee2fa39c05fb2cf07a2e9a49e14b76a75e68c8be87f008018287a45551ceb
-  data.tar.gz: f59b6c98c859dc205afc28a2eae57d5037b6d9cc1f41a5dd33e36d3e2b55a307
+  metadata.gz: 27a3847105e8376738ca1183becbbbaae8f6f1b8d5a6fad0dca2207bc8526da2
+  data.tar.gz: 99d274d4cd3e5ab15f148fbda907aa51555c52f01c7acd3b88610b6d829d5351
 SHA512:
-  metadata.gz: 73b79ce54de6008219f2f3fd2abce7defccc27454f3328cf57b02ff116ea7faef8d22d5789566bad372e440c38f486a6bc2062ed2c1ff497d0ea1ac3863cbbdd
-  data.tar.gz: 940145c4211fa0be98c0e099f69df168a3224d17695c8fe3efa70ad4ed6fcc4788377d4ed74f17fd089f3c8adab481a1b224c33a46f71701403b00dbc1d386b6
+  metadata.gz: 15e5d1d61dbf20dc6f51419482da3f5804a70e04b40febbee74588b8f7036ca2530aec84fdc58cbaa90add318f48d6c5318188b195e3f98d1fb181092104a732
+  data.tar.gz: 1863947d49d8d854456466e17dc35183ba0bc36af30fa272027932bfdf8b0bc09bb98be525fc344ee9649670e1bae0285756838c80cc7d55e524d6dc81e22418

data/app/models/zuora_connect/app_instance_base.rb

@@ -11,7 +11,7 @@ module ZuoraConnect
     before_destroy :prune_data
 
     self.table_name = "zuora_connect_app_instances"
-    attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version, :drop_message, :new_session_message, :connect_user, :logitems
+    attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version, :drop_message, :new_session_message, :connect_user, :logitems, :user_timezone
     @@telegraf_host = nil
     REFRESH_TIMEOUT = 2.minute                #Used to determine how long to wait on current refresh call before executing another
     INSTANCE_REFRESH_WINDOW = 1.hours         #Used to set how how long till app starts attempting to refresh cached task connect data
@@ -240,7 +240,29 @@ module ZuoraConnect
       rescue I18n::InvalidLocale => ex
         ZuoraConnect.logger.error(ex) if !IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
       end
-      Time.zone = self.timezone
+
+      user = ZuoraConnect::ZuoraUser.order(updated_at: :desc).first
+      self.user_timezone = user ? user.zuora_identity_response.values.first&.dig('timeZone') : nil
+
+      if self.user_timezone.present?
+        # connect instance which has a custom timezone
+        if !self.auto_deployed? && self.task_data.dig('user_settings', 'timezone') != self.user_timezone
+          if self.environment == 'Production'
+            ZuoraConnect.logger.error('Instance and user timezones are different', app_instance_id: self.id)
+          end
+          self.user_timezone = nil
+          Time.zone = self.timezone
+        else
+          begin
+            Time.zone = self.user_timezone
+          rescue ArgumentError
+            Time.zone = self.timezone
+          end
+        end
+      else
+        Time.zone = self.timezone
+      end
+
       if self.task_data.present?
         tenants = self.task_data.fetch('tenant_ids', [])
         organizations = self.task_data.fetch('organizations', [])
@@ -272,6 +294,10 @@ module ZuoraConnect
       end
     end
 
+    def auto_deployed?
+      self.id >= 25000000
+    end
+
     def refresh(session: {}) 
       refresh_count ||= 0
       skip_connect ||= false
@@ -338,6 +364,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 +380,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 +395,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 +410,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,14 +124,21 @@ 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
-            Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
+            if @appinstance.user_timezone.blank?
+              Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
+            end
           rescue
             ZuoraConnect.logger.error(ex)
           end
@@ -435,7 +442,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
@@ -566,8 +574,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.60e"
+  VERSION = "2.0.60j"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.60e
+  version: 2.0.60j
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment