zuora_connect 2.0.60f → 2.0.60k

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c0b307a59b8fdea6b65f97152dfeb29ce391030160c744aa04b3cb38f87691c
-  data.tar.gz: 7eeed93e89cee77af7521b36daf9465e53b7e0ce4b3e97edaf10e2882426029a
+  metadata.gz: fe61d354796bd1cf1935f2787db0611bb2858393767db78230efb191cf64eabc
+  data.tar.gz: c5b22daf266f3cc696c1a85ac46e7b4242d75a59f094f2103edb1fa0da729df2
 SHA512:
-  metadata.gz: b93072f75b28ade9243d6ebf16dfd7f884744420a6d620f25747067f05c0c0ef6c261eb4d567b41395ff19106dfe4045f769278c760b317ae4799269e849fec1
-  data.tar.gz: b68884827084f3c53ce8bf0cd827bbe311fa6be686e3aad61293375d173876ded63eee6f94391fda51f060f17aff3dc98d728119951bd2f0dc4921ceed2ca759
+  metadata.gz: 04b0bf5d380361c58279910595d0967fde34c00b05db703d2c4dda02a8205487eb8b0fd3c8bfc44d0c0997854cfacca9585c778e96000e938a19b8ee6604271c
+  data.tar.gz: 510d4eb2cd734f1082f887ff3924ce580658d4419929ee12db35acec17338785b8e9ecb64588307f3a6fe26adb29a8ed45c04df51a2964f1be9480880c2f2813

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,43 @@ 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? && 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 +308,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,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.60f"
+  VERSION = "2.0.60k"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.60f
+  version: 2.0.60k
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment