zuora_connect 2.0.60r → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b7949598476b39650e1fb8b5f4c0940715a4fd7ceea1945b5049f93a468d41
-  data.tar.gz: 8505c3ee1339e3ce136424898b8202466c3264391e5920c0107f706927edae15
+  metadata.gz: 0342c5ac7396b4e8ba75aff8dbab5d579fa6d0ad04a421b7d1d809ab3abbd90a
+  data.tar.gz: 70f7277a93fec8e481f63e56f85e466b5e0b4d1307e2413e4f8da9497e980be2
 SHA512:
-  metadata.gz: c89370d8c846ace233b99f76ef6ee53aa0ec54deb4a7005457b154ae2597c2f6f8e9120816eb47a99083acf1429d770d6b01406af3f58b0f1e29904bfca54988
-  data.tar.gz: 20214d6197712b2aaf380535fbb2e635b0296cd8271c85f1bac28e3bacbb1587eea40542b4ac9a93c1f55ab71788c9b9c0a3eb424eee1d9d53f79042f3811c65
+  metadata.gz: eb6497a343dde2b4a3edfe470c8e5a44eb37ff99b75ed434138c280e8ac25bf36806d58fbb477772182596917f1c37c0e237bd55e88f646e149743477fba2f15
+  data.tar.gz: f0b1f8b6f647f204ce8c4bfed7a8e77b49f3aada0faf6a0c31fc47675f5bfca67feb464692006bcb490977a577d1d5a3feab53886815f4c6472023e9ade6823b

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,11 +1,10 @@
 module ZuoraConnect
   class StaticController < ApplicationController
-    before_action :authenticate_connect_app_request, :except => [:metrics, :health, :initialize_app, :provision, :instance_user]
-    before_action :clear_connect_app_session,        :only =>   [:metrics, :health, :initialize_app, :provision, :instance_user]
-    after_action :persist_connect_app_session,       :except => [:metrics, :health, :initialize_app, :provision, :instance_user]
-
-    skip_before_action :verify_authenticity_token, :only => [:initialize_app, :provision]
-    http_basic_authenticate_with name: ENV['PROVISION_USER'], password: ENV['PROVISION_SECRET'], :only => [:provision, :instance_user]
+    before_action :authenticate_connect_app_request, :except => [:metrics, :health, :initialize_app]
+    before_action :clear_connect_app_session,        :only =>   [:metrics, :health, :initialize_app]
+    after_action :persist_connect_app_session,       :except => [:metrics, :health, :initialize_app]
+    
+    skip_before_action :verify_authenticity_token, :only => [:initialize_app]
 
     def metrics
       type = params[:type].present? ? params[:type] : "versions"
@@ -14,11 +13,11 @@ module ZuoraConnect
 
     def health
       if params[:error].present?
-        begin
+        begin 
           raise ZuoraConnect::Exceptions::Error.new('This is an error')
         rescue => ex
           case params[:error]
-          when 'Log'
+          when 'Log'  
             Rails.logger.error("Error in Health", ex)
           when 'Exception'
             raise
@@ -35,13 +34,11 @@ module ZuoraConnect
     def initialize_app
       begin
         authenticate_connect_app_request
-        unless performed?
-          @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
-          render json: {
-            message: 'Success',
-            status: 200
-          }, status: 200
-        end
+        @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
+        render json: {
+          message: "Success",
+          status: 200
+        }, status: 200
       rescue => ex
         Rails.logger.error("Failed to Initialize application", ex)
         if performed?
@@ -55,74 +52,6 @@ module ZuoraConnect
       end
     end
 
-    def provision
-      create_new_instance
-      unless performed?
-        render json: {
-          status: 200,
-          message: 'Success',
-          app_instance_id: @appinstance.id
-        }, status: 200
-      end
-    rescue StandardError => e
-      message = 'Failed to provision new instance'
-      if performed?
-        Rails.logger.error("#{message}: #{performed?}", e)
-      else
-        Rails.logger.error(message, e)
-        render json: {
-          status: 500,
-          message: message
-        }, status: 500
-      end
-    end
-
-    def instance_user
-      ZuoraConnect::AppInstance.read_master_db do
-        ZuoraConnect.logger.with_fields = {} if ZuoraConnect.logger.is_a?(Ougai::Logger)
-        Rails.logger.with_fields = {} if Rails.logger.is_a?(Ougai::Logger)
-
-        if defined?(ElasticAPM) && ElasticAPM.running? && ElasticAPM.respond_to?(:set_label)
-          ElasticAPM.set_label(:trace_id, request.uuid)
-        end
-
-        unless params[:id].present?
-          render json: {
-            status: 400,
-            message: 'No app instance id provided'
-          }, status: :bad_request
-          return
-        end
-
-        @appinstance = ZuoraConnect::AppInstance.find(params[:id]).new_session
-      end
-
-      zuora_client = @appinstance.send(ZuoraConnect::AppInstance::LOGIN_TENANT_DESTINATION).client
-      client_describe, = zuora_client.rest_call(
-        url: zuora_client.rest_endpoint('genesis/user/info').gsub('v1/', ''),
-        session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic
-      )
-
-      render json: {
-        status: 200,
-        message: 'Success',
-        user_id: client_describe['coreUserId'],
-        username: client_describe['username'],
-        email: client_describe['workEmail']
-      }, status: 200
-    rescue ActiveRecord::RecordNotFound
-      render json: {
-        status: 400,
-        message: 'No app instance found'
-      }, status: :bad_request
-    rescue StandardError => e
-      Rails.logger.error('Error occurred getting user details', e)
-      render json: {
-        status: 500,
-        message: 'Failed to get user details'
-      }, status: 500
-    end
-
     private
 
     def clear_connect_app_session

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, :user_timezone
+    attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version, :drop_message, :new_session_message, :connect_user, :logitems
     @@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
@@ -21,10 +21,6 @@ module ZuoraConnect
     HOLDING_PATTERN_SLEEP = 5.seconds
     CONNECT_APPLICATION_ID = 0
     CONNECT_COMMUNICATION_SLEEP = Rails.env.test? ? 0.seconds : 5.seconds
-    CATALOG_LOOKUP_PAGE_SIZE = 10_000
-    CATALOG_LOOKUP_CACHE_TIME_KEY = 'CatalogCachedAt'
-    CATALOG_LOOKUP_TTL = 60.seconds
-    CATALOG_LOOKUP_CACHE_RESULT_KEY = 'CatalogCache'
     IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de']
     INTERNAL_HOSTS = []
     LOGIN_TENANT_DESTINATION = 'target_login'
@@ -244,50 +240,7 @@ module ZuoraConnect
       rescue I18n::InvalidLocale => ex
         ZuoraConnect.logger.error(ex) if !IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
       end
-
-      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
-
+      Time.zone = self.timezone
       if self.task_data.present?
         tenants = self.task_data.fetch('tenant_ids', [])
         organizations = self.task_data.fetch('organizations', [])
@@ -319,10 +272,6 @@ module ZuoraConnect
       end
     end
 
-    def auto_deployed?
-      self.id >= 25000000
-    end
-
     def refresh(session: {}) 
       refresh_count ||= 0
       skip_connect ||= false
@@ -389,10 +338,6 @@ 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))
@@ -405,7 +350,7 @@ module ZuoraConnect
 
       def kms_decrypt(value)
         kms_tries ||= 0
-        kms_client = Aws::KMS::Client.new({region: aws_secrets['AWS_REGION'], credentials: self.aws_auth_client}.delete_if { |k, v| v.blank? })
+        kms_client = Aws::KMS::Client.new({region: Rails.application.secrets.aws['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
@@ -420,7 +365,7 @@ module ZuoraConnect
 
       def kms_encrypt(value)
         kms_tries ||= 0
-        kms_client = Aws::KMS::Client.new({region: aws_secrets['AWS_REGION'], credentials: self.aws_auth_client}.delete_if {|k,v| v.blank? })
+        kms_client = Aws::KMS::Client.new({region: Rails.application.secrets.aws['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
@@ -435,12 +380,12 @@ module ZuoraConnect
       end
 
       def kms_key
-        return ENV['AWS_KMS_ARN'] || aws_secrets['AWS_KMS_ARN']
+        return ENV['AWS_KMS_ARN'] || Rails.application.secrets.dig(:aws,'AWS_KMS_ARN')
       end
 
       def aws_auth_client
         if Rails.env.to_s == 'development'
-          return Aws::Credentials.new(aws_secrets['AWS_ACCESS_KEY_ID'], aws_secrets['AWS_SECRET_ACCESS_KEY'])
+          return Aws::Credentials.new(Rails.application.secrets.aws['AWS_ACCESS_KEY_ID'], Rails.application.secrets.aws['AWS_SECRET_ACCESS_KEY'])
         else
           return nil
         end
@@ -457,7 +402,7 @@ module ZuoraConnect
       end
 
       def self.write_to_telegraf(*args)
-        if ZuoraConnect.configuration.enable_metrics && !defined?(Prometheus)
+        if ZuoraConnect.configuration.enable_metrics
           @@telegraf_host = ZuoraConnect::Telegraf.new() if @@telegraf_host == nil
           unicorn_stats = self.unicorn_listener_stats() if defined?(Unicorn) && Unicorn.respond_to?(:listener_names)
           @@telegraf_host.write(direction: 'Raindrops', tags: {}, values: unicorn_stats)  unless unicorn_stats.blank?
@@ -1010,81 +955,13 @@ module ZuoraConnect
       # object_id: The id or id's of the object/objects to be returned.
       # child_objects: Whether to include child objects of the object in question.
       # cache: Store individual "1" object lookup in redis for caching.
-      def catalog_lookup(entity_id: nil, object: :product, object_id: nil, child_objects: false, cache: false, source: 'DB')
+      def catalog_lookup(entity_id: nil, object: :product, object_id: nil, child_objects: false, cache: false)
         entity_reference = entity_id.blank? ? 'Default' : entity_id
 
         if object_id.present? && ![Array, String].include?(object_id.class)
           raise "Object Id can only be a string or an array of strings"
         end
 
-        if source == 'API'
-          catalog_container = {}
-
-          if (Redis.current.hget(CATALOG_LOOKUP_CACHE_TIME_KEY, self.id).to_i + CATALOG_LOOKUP_TTL.to_i) > Time.now.to_i
-            begin
-              catalog_container = JSON.parse(Redis.current.hget(CATALOG_LOOKUP_CACHE_RESULT_KEY, self.id))
-            rescue JSON::ParserError => ex
-              Rails.logger.warn('Failed to parse catalog cache', ex)
-            end
-          else
-            zuora_login = self.login_lookup(type: 'Zuora').first
-            login = zuora_login.client(entity_reference)
-
-            response = {
-              'nextPage' => login.rest_endpoint("catalog/products?pageSize=#{CATALOG_LOOKUP_PAGE_SIZE}")
-            }
-
-            while response['nextPage'].present?
-              url = login.rest_endpoint(response['nextPage'].split('/v1/').last)
-              output_json, response = login.rest_call(debug: false, url: url, timeout_retry: true)
-
-              case object
-              when :product
-                output_json.fetch('products', []).each do |product|
-                  rate_plans = {}
-                  product['productRatePlans'].each do |rate_plan|
-                    charges = {}
-                    rate_plan['productRatePlanCharges'].each do |charge|
-                      charges[charge['id']] = charge.merge(
-                        {
-                          'productId' => product['id'],
-                          'productName' => product['name'],
-                          'productRatePlanId' => rate_plan['id'],
-                          'productRatePlanName' => rate_plan['name'],
-                        }
-                      )
-                    end
-
-                    rate_plan['productRatePlanCharges'] = charges
-                    rate_plans[rate_plan['id']] = rate_plan.merge(
-                      {
-                        'productId' => product['id'],
-                        'productName' => product['name']
-                      }
-                    )
-                  end
-
-                  product['productRatePlans'] = rate_plans
-                  catalog_container[product['id']] = product
-                end
-              else
-                raise "Available objects include [:product]"
-              end
-            end
-
-            Redis.current.hset(CATALOG_LOOKUP_CACHE_RESULT_KEY, self.id, catalog_container.to_json)
-            Redis.current.hset(CATALOG_LOOKUP_CACHE_TIME_KEY, self.id, Time.now.to_i)
-          end
-
-          if object_id.nil?
-            catalog_container.transform_values! { |v| v.except('productRatePlans') }
-          elsif object_id.is_a?(String)
-            catalog_container = catalog_container[object_id]
-          end
-
-          return catalog_container
-        end
-
         if defined?(Redis.current) && object_id.present? && object_id.class == String && object_id.present?
           stub_catalog = cache ? decrypt_data(data: Redis.current.get("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}")) : nil
           object_hierarchy = decrypt_data(data: Redis.current.get("Catalog:#{self.id}:#{object_id}:Hierarchy"))

data/app/models/zuora_connect/zuora_user.rb

@@ -2,6 +2,6 @@ module ZuoraConnect
   class ZuoraUser < ActiveRecord::Base
     self.table_name = "zuora_users"
     attr_accessor :session
-    cattr_accessor :current_user_id
+
   end
 end

data/config/initializers/postgresql_adapter.rb

@@ -1,15 +1,9 @@
 module ActiveRecord
   module ConnectionAdapters
     class PostgreSQLAdapter < AbstractAdapter
-
-      SCHEMA_ADDITIONAL_TYPES = 'SchemaAdditionalTypes'.freeze
-
       private
-        def load_additional_types_latest(oids = nil)
+        def load_additional_types(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
@@ -30,73 +24,9 @@ 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