zuora_connect 2.0.60g → 2.0.60l

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2974bd187628d80f24c29c0ef6b65de76aa51ee967c86b4ee0e4332cab393290
-  data.tar.gz: e744cfbb1913eace9633537ac6fa3b386a058e0162090edb263a38629ea3f273
+  metadata.gz: 00f68595c6354e9924c2e73bdb81246bdc858874f49830f94111e0d46b6e8298
+  data.tar.gz: 1b01b3c05190970c9ad92c461f64b89787b790f3e2ffb6394831ccce425e0d1a
 SHA512:
-  metadata.gz: '019ba63942b1ea64b4ede161fac54b75d3198571b5854030dc6b2178c94dcbb29525fe1b4bc93fdb6c33968d4d9f7892f7127461179f4b57952b433d0ce36c89'
-  data.tar.gz: cac6c03ebc9890701bbe410d35d4af8cf663cc912b7e25573c22fdbde61a0ae17ea7b45d5de651f4d01d27895d13c640d17d7e8da4b416385a242724d7ec5066
+  metadata.gz: e58fc8cd5b36a2be218afab342507a78acb5221001cdc712e61a7e80ad0615797ed42c7ae413d4d5dc179d14784e91eb621ea5be9466a45e904ed97bd5996076
+  data.tar.gz: df3730519a5b2b1e8b3778866bd6ac59255633666522fe7ec8522e6815a1c87d5aba89fd733ec1eaecf6caeccf74fde010ea40a9d882b20d6fe2cfc4f1ee46a2

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,50 @@ module ZuoraConnect
       rescue I18n::InvalidLocale => ex
         ZuoraConnect.logger.error(ex) if !IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
       end
-      Time.zone = self.timezone
+
+      begin
+        sql = <<-eos
+          SELECT zuora_users.zuora_identity_response 
+          FROM "#{self.id}".zuora_users 
+          ORDER BY zuora_users.updated_at DESC 
+          LIMIT 1;
+        eos
+        user = ActiveRecord::Base.connection.execute(sql).to_a.first
+
+        if user.present?
+          zuora_identity_response = JSON.parse(user.fetch('zuora_identity_response', '{}'))
+          self.user_timezone = zuora_identity_response.values.first&.dig('timeZone')
+        end
+      rescue => ex
+        Rails.logger.error('Failed to get users while setting app instance timezone', ex)
+      end
+
+      if self.user_timezone.present?
+        # connect instance which has a custom timezone
+        if !self.auto_deployed? && (
+          ActiveSupport::TimeZone[self.task_data.dig('user_settings', 'timezone') || '']&.utc_offset !=
+            ActiveSupport::TimeZone[self.user_timezone]&.utc_offset
+        )
+          if self.environment == 'Production'
+            ZuoraConnect.logger.error(
+              "Instance and user timezones are different. User has '#{self.user_timezone}' and " \
+              "instance has '#{self.task_data.dig('user_settings', 'timezone')}'",
+              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 +315,10 @@ module ZuoraConnect
       end
     end
 
+    def auto_deployed?
+      self.id >= 25000000
+    end
+
     def refresh(session: {}) 
       refresh_count ||= 0
       skip_connect ||= false

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_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
@@ -20,16 +26,20 @@ module ActiveRecord
           if oids
             query += "WHERE t.oid::integer IN (%s)" % oids.join(", ")
           else
-            query += initializer.query_conditions_for_initial_load
+            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 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
@@ -50,10 +60,37 @@ module ActiveRecord
           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

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,24 @@ 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
+            elsif locale != session["#{@appinstance.id}::user::language"]
+              locale = session["#{@appinstance.id}::user::language"]
+              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 +445,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

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.60g"
+  VERSION = "2.0.60l"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.60g
+  version: 2.0.60l
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment