zuora_connect 2.0.53 → 2.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ec4985bc5f156a8a8c302664cd44cd5e3854caf6dc8a84f6d28f152becea312
-  data.tar.gz: 2bff90b4661c0278040296378a9323d3b0c2129f02114a3d09c0d3b7ebcbabc8
+  metadata.gz: 5c87e671fc1c2afd2dc94cff3f210b5a4cf2b0c9b7b16108fb990d5c35b4e3e3
+  data.tar.gz: 522a063ceb5dd7cfcb453e69b823d8f6f3d0b2610269a0de51bf8d7888f83a0d
 SHA512:
-  metadata.gz: 49acfbcaf17f0f0f718298ee7403f75a052dab6e2eb2b8ac5cd87a43e817a801fc04ff46716c1aba33f91449fd4b0aacb29c47d04571b7f4bcfad9acf4c794a0
-  data.tar.gz: d9c275091253fb5ae6e5dea8ad59bdd49219879047d13f1bde0625d5fd2a5371e6c322446935be8b29d169d554134526d0eed7d7772f5d1684b27c151248b9ee
+  metadata.gz: dd9ecbbecfa364c8a4e38fbe3e4c613ab60b7bed6101929e83d6506d1fc2bfa1ad2e023619faf85c30541cfed4005233abe43e52df8fbdacbd32937739430f1b
+  data.tar.gz: 501b573a04de6d580ddc7fb6fad5d3c06e8a32c3899f2054606682c2669b0f981373f0232f50f0d71b37289659e8e09aa3b2b4780380b6495310fbf1e9ddeef5

data/app/models/zuora_connect/app_instance_base.rb

@@ -1204,6 +1204,16 @@ module ZuoraConnect
       super
     end
 
+    def self.read_master_db
+      if self.connection.respond_to?(:stick_to_master!)
+        self.connection.stick_to_master!(false)
+        yield
+        Makara::Context.release_all
+      else
+        yield
+      end
+    end
+
     method_hook :updateOption, :update_logins, :before => :check_oauth_state
     method_hook :new_session, :refresh, :build_task, :after => :apartment_switch
   end

data/lib/zuora_connect/controllers/helpers.rb

@@ -5,68 +5,70 @@ module ZuoraConnect
       extend ActiveSupport::Concern
 
       def authenticate_app_api_request
-        #Skip session for api requests
-        request.session_options[:skip] = true
-
-        Thread.current[:appinstance] = nil
-        if ZuoraConnect.logger.is_a?(Ougai::Logger); ZuoraConnect.logger.with_fields = {}; end
-        if Rails.logger.is_a?(Ougai::Logger); Rails.logger.with_fields = {}; end
-        if defined?(ElasticAPM) && ElasticAPM.running?
-          if ElasticAPM.respond_to?(:set_label)
-            ElasticAPM.set_label(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
-          else
-            ElasticAPM.set_label(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
-          end
-        end
-        start_time = Time.now
-        if request.headers["API-Token"].present?
-          @appinstance = ZuoraConnect::AppInstance.find_by(:api_token => request.headers["API-Token"])
-          ZuoraConnect.logger.debug("API REQUEST - API token") if @appinstance.present?
-          check_instance
-        elsif ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(request.headers.fetch("HOST", nil))
-          zuora_host, zuora_entity_id, zuora_instance_id = [request.headers['zuora-host'], (request.headers['zuora-entity-ids'] || "").gsub('-',''), request.headers['zuora-instance-id']]
-
-          #Validate host present
-          if zuora_host.blank?
-            render json: {"status": 401, "message": "zuora-host header was not supplied."}, status: :unauthorized
-            return
-          end
-          #Validate entity-ids present
-          if zuora_entity_id.blank?
-            render json: {"status": 401, "message": "zuora-entity-ids header was not supplied."}, status: :unauthorized
-            return
-          end
-          #Select with instance id if present. Used where mulitple deployments are done.
-          if zuora_instance_id.present?
-            appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host AND id = :id", entities: [zuora_entity_id], host: zuora_host, id: zuora_instance_id.to_i)
-          else
-            appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_host)
+        ZuoraConnect::AppInstance.read_master_db do
+          #Skip session for api requests
+          request.session_options[:skip] = true
+
+          Thread.current[:appinstance] = nil
+          if ZuoraConnect.logger.is_a?(Ougai::Logger); ZuoraConnect.logger.with_fields = {}; end
+          if Rails.logger.is_a?(Ougai::Logger); Rails.logger.with_fields = {}; end
+          if defined?(ElasticAPM) && ElasticAPM.running?
+            if ElasticAPM.respond_to?(:set_label)
+              ElasticAPM.set_label(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
+            else
+              ElasticAPM.set_label(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
+            end
           end
+          start_time = Time.now
+          if request.headers["API-Token"].present?
+            @appinstance = ZuoraConnect::AppInstance.find_by(:api_token => request.headers["API-Token"])
+            ZuoraConnect.logger.debug("API REQUEST - API token") if @appinstance.present?
+            check_instance
+          elsif ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(request.headers.fetch("HOST", nil))
+            zuora_host, zuora_entity_id, zuora_instance_id = [request.headers['zuora-host'], (request.headers['zuora-entity-ids'] || "").gsub('-',''), request.headers['zuora-instance-id']]
 
-          if appinstances.size == 0
-            render json: {"status": 401, "message": "Missing mapping or no deployment for '#{zuora_host}-#{zuora_entity_id}' ."}, status: :unauthorized
-            return
-          elsif appinstances.size > 1
-            render json: {"status": 401, "message": "More than one app instance binded to host and entity ids. Please indicate correct instance via 'zuora-instance-id' header"}, status: :unauthorized
-            return
+            #Validate host present
+            if zuora_host.blank?
+              render json: {"status": 401, "message": "zuora-host header was not supplied."}, status: :unauthorized
+              return
+            end
+            #Validate entity-ids present
+            if zuora_entity_id.blank?
+              render json: {"status": 401, "message": "zuora-entity-ids header was not supplied."}, status: :unauthorized
+              return
+            end
+            #Select with instance id if present. Used where mulitple deployments are done.
+            if zuora_instance_id.present?
+              appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host AND id = :id", entities: [zuora_entity_id], host: zuora_host, id: zuora_instance_id.to_i)
+            else
+              appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_host)
+            end
+
+            if appinstances.size == 0
+              render json: {"status": 401, "message": "Missing mapping or no deployment for '#{zuora_host}-#{zuora_entity_id}' ."}, status: :unauthorized
+              return
+            elsif appinstances.size > 1
+              render json: {"status": 401, "message": "More than one app instance binded to host and entity ids. Please indicate correct instance via 'zuora-instance-id' header"}, status: :unauthorized
+              return
+            else
+              @appinstance = appinstances.first
+              check_instance
+            end
+
+          elsif request.headers.fetch("Authorization", "").include?("Basic ")
+            authenticate_or_request_with_http_basic do |username, password|
+              @appinstance = ZuoraConnect::AppInstance.find_by(:token => password)
+              @appinstance ||= ZuoraConnect::AppInstance.find_by(:api_token => password)
+              ZuoraConnect.logger.debug("API REQUEST - Basic Auth") if @appinstance.present?
+              check_instance
+            end
           else
-            @appinstance = appinstances.first
             check_instance
           end
-      
-        elsif request.headers.fetch("Authorization", "").include?("Basic ")
-          authenticate_or_request_with_http_basic do |username, password|
-            @appinstance = ZuoraConnect::AppInstance.find_by(:token => password)
-            @appinstance ||= ZuoraConnect::AppInstance.find_by(:api_token => password)
-            ZuoraConnect.logger.debug("API REQUEST - Basic Auth") if @appinstance.present?
-            check_instance
+
+          if @appinstance.present?
+            ZuoraConnect.logger.debug("Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
           end
-        else
-          check_instance
-        end
-        
-        if @appinstance.present?
-          ZuoraConnect.logger.debug("Authenticate App API Request Completed In - #{(Time.now - start_time).round(2)}s")
         end
       end
 
@@ -88,59 +90,60 @@ module ZuoraConnect
       end
 
       def authenticate_connect_app_request
-        Thread.current[:appinstance] = nil
-        if ZuoraConnect.logger.is_a?(Ougai::Logger); ZuoraConnect.logger.with_fields = {}; end
-        if Rails.logger.is_a?(Ougai::Logger); Rails.logger.with_fields = {}; end
-        if defined?(ElasticAPM) && ElasticAPM.running?
-          if ElasticAPM.respond_to?(:set_label)
-            ElasticAPM.set_label(:trace_id, request.uuid)
+        ZuoraConnect::AppInstance.read_master_db do
+          Thread.current[:appinstance] = nil
+          if ZuoraConnect.logger.is_a?(Ougai::Logger); ZuoraConnect.logger.with_fields = {}; end
+          if Rails.logger.is_a?(Ougai::Logger); Rails.logger.with_fields = {}; end
+          if defined?(ElasticAPM) && ElasticAPM.running?
+            if ElasticAPM.respond_to?(:set_label)
+              ElasticAPM.set_label(:trace_id, request.uuid)
+            else
+              ElasticAPM.set_label(:trace_id, request.uuid)
+            end
+          end
+          start_time = Time.now
+
+          if ZuoraConnect.configuration.mode == "Production"
+            setup_instance_via_prod_mode
           else
-            ElasticAPM.set_label(:trace_id, request.uuid)
+            setup_instance_via_dev_mode
           end
-        end
-        start_time = Time.now
 
-        if ZuoraConnect.configuration.mode == "Production"
-          setup_instance_via_prod_mode
-        else
-          setup_instance_via_dev_mode
-        end
+          return if performed?
 
-        return if performed?
+          if !defined?(@appinstance) || @appinstance.blank?
+            render "zuora_connect/static/error_handled", :locals => {
+              :title => "Application state could not be found.",
+              :message => "Please relaunch application."
+            }, :layout => false
+            return
+          end
+          #Call .data_lookup with the current session to retrieve session. In some cases session may be stored/cache in redis
+          #so data lookup provides a model method that can be overriden per app.
+          if params[:controller] != 'zuora_connect/api/v1/app_instance' && params[:action] != 'drop'
+            if @appinstance.new_session_for_ui_requests(:params => params)
+              @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
+            end
+          end
 
-        if !defined?(@appinstance) || @appinstance.blank?
-          render "zuora_connect/static/error_handled", :locals => {
-            :title => "Application state could not be found.", 
-            :message => "Please relaunch application."
-          }, :layout => false
-          return 
-        end
-        #Call .data_lookup with the current session to retrieve session. In some cases session may be stored/cache in redis 
-        #so data lookup provides a model method that can be overriden per app.
-        if params[:controller] != 'zuora_connect/api/v1/app_instance' && params[:action] != 'drop'
-          if @appinstance.new_session_for_ui_requests(:params => params)
-            @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
+          if session["#{@appinstance.id}::user::email"].present?
+            ElasticAPM.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) && ElasticAPM.running?
+            PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail)
+          end
+          begin
+            locale = session["#{@appinstance.id}::user::locale"]
+            I18n.locale = locale.present? ? locale : @appinstance.locale
+          rescue I18n::InvalidLocale => ex
+            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
+          rescue
+            ZuoraConnect.logger.error(ex)
           end
-        end
 
-        if session["#{@appinstance.id}::user::email"].present? 
-          ElasticAPM.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) && ElasticAPM.running?
-          PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail)
-        end
-        begin
-          locale = session["#{@appinstance.id}::user::locale"]
-          I18n.locale = locale.present? ? locale : @appinstance.locale
-        rescue I18n::InvalidLocale => ex
-          ZuoraConnect.logger.error(ex) if !ZuoraConnect::AppInstance::IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
+          ZuoraConnect.logger.debug("Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
         end
-        begin
-          Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
-        rescue 
-          ZuoraConnect.logger.error(ex) 
-        end
-
-        ZuoraConnect.logger.debug("Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
-
       rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
         id = @appinstance.id
         ZuoraConnect::AppInstance.destroy(id)

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.53"
+  VERSION = "2.0.54"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.53
+  version: 2.0.54
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment