zuora_connect 2.0.57 → 2.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae04188bc84b9fd594f1a2453128a9f7f8d489e9edd9ffd053ef51c09c32b02d
-  data.tar.gz: 3f19d9ed178c02807f44dbed319f5d2c5b47301de9bdc6666ce5df320cc8c40c
+  metadata.gz: 1b0443ea374a1f1f82e212960a7df80fb9aa953fb4bf0fcb123949e73dfc622d
+  data.tar.gz: a356f5120206bf8febbdca0db439c5792dca19156776356f09f5a39da50cf7b1
 SHA512:
-  metadata.gz: 9a1249ce65d708fe4bd792c890b49946ce1dea1c1ffba97a98ef397d98e69014e5f24021b700f0b2c980c2ce2292b601fbbb9550110f7e66b4099908ee0467ac
-  data.tar.gz: d40bdadd5ccbe7e2416f3ab354830f05aadec4c1c5faea71dccf8a87f1df0e012bfe4a49f1ed7f0a6e29c97ac4e3c04d8548ba48094f81d01f30c55c4484753b
+  metadata.gz: 34e40410cfcd4752b174d584d2cf883084630b56e7e4d897733da177fa66ece76c9ec3b2556e0ea3778b05eed949c6dba9e4c37f635d178fb9d77f776ec5221f
+  data.tar.gz: '08dde90f26d809089f79928c0cfa6d7c43d551b61448b7ce040b0ba05aa64552599ff3e3c49f46feb54340d846565faa75f891730501e2ad1ffe6a8c554856e5'

data/app/assets/javascripts/hallway_wrapper/after.js

@@ -4,12 +4,31 @@ window.define = previousDefine;
 if (isHallway()) {
   $( document ).ajaxError(function( event, jqxhr, settings, thrownError ) {
     if ( jqxhr.status === 401) {
-      window.location.href = '/apps/newlogin.do?retURL=' + window.location.pathname;
+      fetch("https://" + window.location.host + "/apps/v1/navigation").then(response => {
+        if (response.status === 401) {
+          deleteAllCookies();
+          window.location.href = '/apps/newlogin.do?retURL=' + window.location.pathname;
+        }
+      });
     }
   });
 }
 
 function isHallway() {
-  var regex = new RegExp("^/services/");
-  return window.location.pathname.match(regex);
+  var regex = new RegExp("(?<=\\/)services\\/.*");
+  if (regex.test(window.location.pathname)) {
+    return window.location.pathname.match(regex)[0]
+  }
+  return null;
+}
+
+function deleteAllCookies() {
+  var cookies = document.cookie.split(";");
+
+  for (var i = 0; i < cookies.length; i++) {
+    var cookie = cookies[i];
+    var eqPos = cookie.indexOf("=");
+    var name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+    document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/";
+  }
 }

data/app/models/zuora_connect/app_instance_base.rb

@@ -20,7 +20,7 @@ module ZuoraConnect
     BLANK_OBJECT_ID_LOOKUP = 'BlankValueSupplied'
     HOLDING_PATTERN_SLEEP = 5.seconds
     CONNECT_APPLICATION_ID = 0
-    CONNECT_COMMUNICATION_SLEEP= 5.seconds
+    CONNECT_COMMUNICATION_SLEEP = Rails.env.test? ? 0.seconds : 5.seconds
     IGNORED_LOCALS = ['fr', 'ja', 'es', 'zh', 'de']
     INTERNAL_HOSTS = []
     LOGIN_TENANT_DESTINATION = 'target_login'
@@ -98,7 +98,9 @@ module ZuoraConnect
         Redis.current.zrem("InstanceRefreshing", self.id)
       end
       if defined?(Resque.redis)
-        Resque.redis.zrem("PauseQueue", self.id)
+        Resque.redis.zrange("PauseQueue", 0, -1).each do |key|
+          Resque.redis.zrem("PauseQueue", key) if key.split("__").first.to_i == self.id
+        end
       end
       return true
     end
@@ -161,6 +163,7 @@ module ZuoraConnect
         end
 
         self.build_task(task_data: mock_task_data, session: session)
+        self.last_refresh = Time.now.to_i
       else
         time_expire = (session["#{self.id}::last_refresh"] || Time.now).to_i - INSTANCE_REFRESH_WINDOW.ago.to_i
 
@@ -202,14 +205,14 @@ module ZuoraConnect
           else
             self.new_session_message = "REBUILDING - Expires in #{time_expire} seconds"
           end
-          ZuoraConnect.logger.debug(self.new_session_message)
+          ZuoraConnect.logger.debug(self.new_session_message, self.default_ougai_items)
           self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         end
       end
       return self
     rescue ZuoraConnect::Exceptions::HoldingPattern => ex
       while self.marked_for_refresh?
-        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'")
+        ZuoraConnect.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'", self.default_ougai_items)
         sleep(HOLDING_PATTERN_SLEEP)
       end
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
@@ -218,17 +221,17 @@ module ZuoraConnect
     rescue ZuoraConnect::Exceptions::MissMatch => ex
       self.delete_app_instance
       session = {}
-      ZuoraConnect.logger.error(ex, app_instance_id_new: self.task_data['id'])
+      ZuoraConnect.logger.error(ex, self.default_ougai_items.merge({app_instance_id_new: self.task_data['id']}))
       retry
     rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
       raise
     rescue => ex
       if recoverable_session
-        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache", ex)
+        ZuoraConnect.logger.warn("REBUILDING - Using backup expired cache", ex, self.default_ougai_items)
         self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         return self
       else
-        ZuoraConnect.logger.error("Failed new session", ex)
+        ZuoraConnect.logger.error("Failed new session", ex, self.default_ougai_items)
         raise
       end
     ensure
@@ -276,11 +279,8 @@ module ZuoraConnect
         #Check how app was deployed
         if self.id < 25000000 && !skip_connect 
           self.check_oauth_state
-          start = Time.now
           response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
-          response_time = Time.now - start
 
-          ZuoraConnect.logger.debug("REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
           if response.code == 200
             begin
               parsed_json = JSON.parse(response.body)
@@ -312,7 +312,7 @@ module ZuoraConnect
         refresh_count += 1
         if refresh_count < 3
           sleep(10)
-          ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex)
+          ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
           retry
         else
           ZuoraConnect.logger.fatal("REFRESH TASK - Connection Failed", ex)
@@ -321,17 +321,17 @@ module ZuoraConnect
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
         refresh_count += 1
         if refresh_count < 3
-          ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex)
+          ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
           self.refresh_oauth if ex.code == 401
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex)
+          ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex, self.default_ougai_items)
           raise
         end
       end
     rescue => ex
       if self['zuora_logins'].present?
-        ZuoraConnect.logger.warn("REFRESH TASK - Fallback to local encrypted store", ex)
+        ZuoraConnect.logger.warn("REFRESH TASK - Fallback to local encrypted store", ex, self.default_ougai_items)
         skip_connect = true
         retry
       end
@@ -653,16 +653,12 @@ module ZuoraConnect
       end
 
       def refresh_oauth
-        refresh_oauth_count ||= 0
-        start = Time.now
-        params = {
-                  :grant_type => "refresh_token",
-                  :redirect_uri => ZuoraConnect.configuration.oauth_client_redirect_uri,
-                  :refresh_token => self.refresh_token
-                }
-        response = HTTParty.post("#{ZuoraConnect.configuration.url}/oauth/token",:body => params)
-        response_time = Time.now - start
-        ZuoraConnect.logger.debug("REFRESH OAUTH - In #{response_time.round(2).to_s}")
+        refresh_oauth_count ||= 0        
+        response = HTTParty.post("#{ZuoraConnect.configuration.url}/oauth/token", body: {
+          :grant_type => "refresh_token",
+          :redirect_uri => ZuoraConnect.configuration.oauth_client_redirect_uri,
+          :refresh_token => self.refresh_token
+        })
 
         if response.code == 200
           response_body = JSON.parse(response.body)
@@ -676,11 +672,11 @@ module ZuoraConnect
         end
       rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (refresh_oauth_count += 1) < 3
-          sleep(5)
-          ZuoraConnect.logger.debug("REFRESH OAUTH - Connection Failure Retrying(#{refresh_oauth_count})", ex)
+          sleep(CONNECT_COMMUNICATION_SLEEP)
+          ZuoraConnect.logger.debug("REFRESH OAUTH - Connection Failure Retrying(#{refresh_oauth_count})", ex, self.default_ougai_items)
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH OAUTH - Connection Failed", ex)
+          Rails.logger.fatal("REFRESH OAUTH - Connection Failed", ex, self.default_ougai_items)
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
@@ -691,10 +687,10 @@ module ZuoraConnect
         return if !self.oauth_expired?
 
         if (refresh_oauth_count += 1) < 3
-          ZuoraConnect.logger.debug("REFRESH OAUTH - Communication Failure Retrying(#{refresh_oauth_count})", ex)
+          ZuoraConnect.logger.debug("REFRESH OAUTH - Communication Failure Retrying(#{refresh_oauth_count})", ex, self.default_ougai_items)
           retry
         else
-          ZuoraConnect.logger.fatal("REFRESH OAUTH - Communication Failed #{ex.code}", ex)
+          ZuoraConnect.logger.fatal("REFRESH OAUTH - Communication Failed #{ex.code}", ex, self.default_ougai_items)
           raise
         end
       end
@@ -744,10 +740,10 @@ module ZuoraConnect
             end
           end
           if cached_instance.blank?
-            ZuoraConnect.logger.debug("Cached AppInstance Missing")
+            ZuoraConnect.logger.debug("Cached AppInstance Missing", self.default_ougai_items)
             return session
           else
-            ZuoraConnect.logger.debug("Cached AppInstance Found")
+            ZuoraConnect.logger.debug("Cached AppInstance Found", self.default_ougai_items)
             return decrypt_data(data: cached_instance, rescue_return: session).merge(session)
           end
         else
@@ -763,7 +759,7 @@ module ZuoraConnect
         if defined?(Redis.current)
           #Task data must be present and the last refresh cannot be old. We dont want to overwite new cache data with old
           if self.task_data.present? &&  (self.last_refresh.to_i > INSTANCE_REFRESH_WINDOW.ago.to_i)
-            ZuoraConnect.logger.debug("Caching AppInstance")
+            ZuoraConnect.logger.debug("Caching AppInstance", self.default_ougai_items)
             Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, self.encrypt_data(data: self.save_data))
           end
         end
@@ -827,10 +823,10 @@ module ZuoraConnect
           begin
             return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
           rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
-            ZuoraConnect.logger.error("Error Decrypting", ex) if log_fatal
+            ZuoraConnect.logger.error("Error Decrypting", ex, self.default_ougai_items) if log_fatal
             return rescue_return
           rescue JSON::ParserError => ex
-            ZuoraConnect.logger.error("JSON Parse Error", ex) if log_fatal
+            ZuoraConnect.logger.error("JSON Parse Error", ex, self.default_ougai_items) if log_fatal
             return encryptor.decrypt_and_verify(CGI::unescape(data))
           end
         end
@@ -1127,6 +1123,15 @@ module ZuoraConnect
       # Data from each schema will be loaded into table(aggregate_name) into the public schema
       def self.refresh_aggregate_table(aggregate_name: 'all_tasks_processing', table_name: 'tasks', where_clause: "where status in ('Processing', 'Queued')", index_table: true, ignore_indexes: [])
         self.update_functions
+
+        sql_result = ActiveRecord::Base.connection.execute <<-eos
+          SELECT pid, relname, mode
+          FROM pg_locks l
+          JOIN pg_class t ON l.relation = t.oid AND t.relkind = 'r'
+          WHERE t.relname = '#{aggregate_name}' AND l.mode ='AccessExclusiveLock';
+        eos
+        raise ZuoraConnect::Exceptions::Error.new("An existing lock detected while dropping table '#{aggregate_name}'") if sql_result.count > 0
+
         if index_table
           ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Index\', \'{%s}\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause), ignore_indexes.map { |index| "\"#{index}\"" }.join(',')])
         else
@@ -1214,6 +1219,16 @@ module ZuoraConnect
       end
     end
 
+    def self.without_sticking
+       if self.connection.respond_to?(:without_sticking)
+        self.connection.without_sticking do 
+          yield
+        end
+      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/app/views/zuora_connect/static/launch.html.erb

@@ -3,12 +3,7 @@
     <title>Select Task ID</title>
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <style>
-      body {
-        background-color: #EFEFEF;
-        margin: 0;
-      }
-
-      div.connect-dialog {
+      .connect-dialog {
         width: 95%;
         max-width: 33em;
         margin: 4em auto 0;
@@ -16,7 +11,11 @@
         text-align: center;
       }
 
-      div.connect-dialog > div {
+      .connect-dialog div {
+        background-color: white;
+        color: #2E2F30;
+        text-align: center;
+        font-family: arial, sans-serif;
         margin: 0 0 1em;
         border: 1px solid #CCC;
         border-right-color: #999;
@@ -27,19 +26,17 @@
         border-top-right-radius: 9px;
         border-bottom-left-radius: 9px;
         border-bottom-right-radius: 9px;
-        background-color: white;
         padding: 7px 12% 0;
         box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
       }
 
-      div.connect-dialog > h1 {
+      .connect-dialog h1 {
         font-size: 100%;
         color: #3D4B5A;
         line-height: 1.5em;
       }
 
-        
-      div.connect-dialog > div.launch_button {
+      .connect-dialog .launch_button {
         margin: 1em 0 1em;
         margin-right: auto;
         margin-left: auto;

data/lib/resque/plugins/app_instance_job.rb

@@ -24,9 +24,13 @@ module Resque
           @appinstance.new_session(holding_pattern: true)
         rescue ActiveRecord::RecordNotFound => exception
           # If we can't find app_instance let make sure we cleanup
-          Rails.logger.info("No instance found, purge")
-          ZuoraConnect::AppInstance.new(id: args['app_instance_id'].to_i).prune_data
-          return
+          if Redis.current.zscore("AppInstance:Deleted", args['app_instance_id'].to_i).present?
+            Rails.logger.info("No instance found, purge")
+            ZuoraConnect::AppInstance.new(id: args['app_instance_id'].to_i).prune_data
+            return
+          else
+            raise
+          end
         rescue ActiveRecord::StatementInvalid => exception
           if (connection_count += 1) <= 3 &&
             (

data/lib/zuora_connect.rb

@@ -23,6 +23,8 @@ module ZuoraConnect
       case Rails.env.to_s
       when 'development'
         Rails.logger
+       when 'test'
+        Rails.logger
       else
         @logger ||= custom_logger(name: "Connect", level: Rails.logger.level)
       end

data/lib/zuora_connect/configuration.rb

@@ -7,7 +7,7 @@ module ZuoraConnect
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
-    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :json_logging
+    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :json_logging, :insert_migrations
 
     def initialize
       @default_locale = :en
@@ -19,6 +19,7 @@ module ZuoraConnect
       @additional_apartment_models = []
       @silencer_resque_finish = true
       @blpop_queue = false
+      @insert_migrations = true
 
       # Setting the app name for telegraf write
       @enable_metrics = false
@@ -42,7 +43,7 @@ module ZuoraConnect
       @aws_region = "us-west-2"
       @s3_bucket_name = "rbm-apps"
       @s3_folder_name = Rails.application.class.parent_name
-      @json_logging = Rails.env.to_s == 'development' ? false : true
+      @json_logging = Rails.env.development? || Rails.env.test? ? false : true
     end
 
     def private_key

data/lib/zuora_connect/controllers/helpers.rb

@@ -19,7 +19,6 @@ module ZuoraConnect
               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?
@@ -48,7 +47,7 @@ module ZuoraConnect
               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
+              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", "instances": appinstances.map {|instance| instance.id }.sort }, status: :unauthorized
               return
             else
               @appinstance = appinstances.first
@@ -65,10 +64,6 @@ module ZuoraConnect
           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
       end
 
@@ -101,7 +96,6 @@ module ZuoraConnect
               ElasticAPM.set_label(:trace_id, request.uuid)
             end
           end
-          start_time = Time.now
 
           if ZuoraConnect.configuration.mode == "Production"
             setup_instance_via_prod_mode
@@ -141,32 +135,30 @@ module ZuoraConnect
           rescue
             ZuoraConnect.logger.error(ex)
           end
-
-          ZuoraConnect.logger.debug("Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
         end
       rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
         id = @appinstance.id
         ZuoraConnect::AppInstance.destroy(id)
         Apartment::Tenant.drop(id)
         render "zuora_connect/static/error_handled", :locals => {
-          :title => "Application Setup Error", 
+          :title => "Application Setup Error",
           :message => "Application cannot be run using Zuora Session. Delete old application \
           deployment and create new with Zuora Basic or OAuth credentials."
         }, :layout => false
-        return 
+        return
       rescue ZuoraConnect::Exceptions::AccessDenied => ex
         respond_to do |format|
-          format.html { 
+          format.html {
             render "zuora_connect/static/error_handled", :locals => {
-                :title => "Application State Error", 
+                :title => "Application State Error",
                 :message => ex.message
-              }, status: 401, layout: false 
+              }, status: 401, layout: false
           }
-          format.js { 
+          format.js {
             render "zuora_connect/static/error_handled", :locals => {
-                :title => "Application State Error", 
+                :title => "Application State Error",
                 :message => ex.message
-              }, status: 401, layout: false 
+              }, status: 401, layout: false
           }
           format.json { render json: {'errors' => ex.message}, status: 401 }
           format.all { render json: ex.message, status: 401 }
@@ -196,17 +188,17 @@ module ZuoraConnect
           raise ZuoraConnect::Exceptions::AccessDenied.new("User is not an authorized admin for this application") if raise_error
 
           respond_to do |format|
-            format.html { 
+            format.html {
               render "zuora_connect/static/error_handled", :locals => {
-                  :title => "Unauthorized", 
+                  :title => "Unauthorized",
                   :message => "User is not an authorized admin for this application"
                 }, status: 401, :layout => false
             }
-            format.js { 
+            format.js {
               render "zuora_connect/static/error_handled", :locals => {
-                  :title => "Unauthorized", 
+                  :title => "Unauthorized",
                   :message => "User is not an authorized admin for this application"
-                }, status: 401, :layout => false 
+                }, status: 401, :layout => false
             }
             format.json { render json: {'errors' => ex.message}, status: 401 }
             format.all { render json: ex.message, status: 401 }
@@ -246,7 +238,7 @@ module ZuoraConnect
             auth_headers.merge!({'Authorization' => "ZSession-a3N2w #{zuora_client.get_session(prefix: false, auth_type: :basic)}"})
           else
             render "zuora_connect/static/error_handled", :locals => {
-              :title => "Missing Authorization Token", 
+              :title => "Missing Authorization Token",
               :message => "Zuora 'Zuora-Auth-Token' header and 'ZSession' cookie not present."
             }, :layout => false
             return
@@ -268,27 +260,34 @@ module ZuoraConnect
                 if zuora_tenant_id.to_s == "10548"
                   session.clear
                   render "zuora_connect/static/error_handled", :locals => {
-                    :title => "Security Testing", 
+                    :title => "Security Testing",
                     :message => "Ya we know it you"
                   }, :layout => false
                   return
                 else
-                  raise ZuoraConnect::Exceptions::Error.new("Header entity id does not match identity call entity id.") 
+                  raise ZuoraConnect::Exceptions::Error.new("Header entity id does not match identity call entity id.")
                 end
               end
 
+              ##
+              # If the ZSession was refreshed, but it's still the same user and they aren't launching from the side bar,
+              # we don't need to continue
+              is_different_user = identity.slice("entityId", "tenantId", "userId", "userProfileId") == (session["ZuoraCurrentIdentity"] || {}).slice("entityId", "tenantId", "userId", "userProfileId")
+              zuora_details["identity"]["entityId"] = identity['entityId']
               session["ZuoraCurrentIdentity"] = identity
               session["ZuoraCurrentEntity"] = identity['entityId']
               session["ZSession"] = cookies['ZSession']
-              zuora_instance_id = nil
-              zuora_details["identity"]["entityId"] = identity['entityId']
-
-              client_describe, response = zuora_client.rest_call(
-                url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''), 
-                session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic, 
-                headers: auth_headers
-              )
-              session["ZuoraCurrentUserInfo"] = client_describe
+              if is_different_user || params[:sidebar_launch].to_s.to_bool
+                zuora_instance_id = nil
+                ZuoraConnect.logger.debug("UI Authorization", zuora: zuora_details)
+
+                client_describe, response = zuora_client.rest_call(
+                    url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''),
+                    session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic,
+                    headers: auth_headers
+                )
+                session["ZuoraCurrentUserInfo"] = client_describe
+              end
             end
 
             #Find matching app instances.
@@ -296,7 +295,7 @@ module ZuoraConnect
               appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host AND id = :id", entities: [zuora_entity_id], host: zuora_client.rest_domain, id: zuora_instance_id.to_i).pluck(:id, :name)
             else
               #if app_instance_ids is present then permissions still controlled by connect
-              if params[:app_instance_ids].present? 
+              if params[:app_instance_ids].present?
                 navbar, response = zuora_client.rest_call(url: zuora_client.rest_endpoint("navigation"))
                 urls = navbar['menus'].map {|x| x['url']}
                 app_env = ENV["DEIS_APP"] || "xyz123"
@@ -304,23 +303,27 @@ module ZuoraConnect
                 if url.blank?
                   if navbar['menus'].map {|x| x['label']}.include?('Link Connect Account')
                     render "zuora_connect/static/error_handled", :locals => {
-                      :title => "Link Account", 
+                      :title => "Link Account",
                       :message => "Link Connect account to gain access to application."
                     }, :layout => false
                     return
                   end
-                  ZuoraConnect::Exceptions::APIError.new(message: "#{app_env} navbar url was blank", response: response)
+                  raise ZuoraConnect::Exceptions::APIError.new(message: "#{app_env} navbar url was blank", response: response)
                 else
-                  begin
-                    task_ids = JSON.parse(Base64.urlsafe_decode64(CGI.parse(URI.parse(url).query)["app_instance_ids"][0]))
-                  rescue => ex
-                    raise ZuoraConnect::Exceptions::APIError.new(message: "Failure in parsing the navbar urls.", response: response)
+                  query_params = CGI.parse(URI.parse(url).query)
+                  app_instance_ids = query_params["app_instance_ids"][0]
+                  if app_instance_ids.present?
+                    begin
+                      task_ids = JSON.parse(Base64.urlsafe_decode64(app_instance_ids))
+
+                      appinstances = ZuoraConnect::AppInstance.where(:id => task_ids).pluck(:id, :name)
+                    rescue => ex
+                      raise ZuoraConnect::Exceptions::APIError.new(message: "Failure in parsing the navbar urls.", response: response)
+                    end
                   end
                 end
-                appinstances = ZuoraConnect::AppInstance.where(:id => task_ids).pluck(:id, :name)
-              else
-                appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
               end
+              appinstances ||= ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
             end
 
             zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId']
@@ -330,7 +333,7 @@ module ZuoraConnect
               ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
               @appinstance = ZuoraConnect::AppInstance.find(appinstances.to_h.keys.first)
 
-              #Add user/update 
+              #Add user/update
               begin
                 @zuora_user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
               rescue ActiveRecord::StatementInvalid => ex
@@ -350,7 +353,7 @@ module ZuoraConnect
               else
                 ZuoraConnect.logger.debug("New zuora user object for #{zuora_user_id}")
                 @zuora_user = ZuoraConnect::ZuoraUser.create!(:zuora_user_id => zuora_user_id, :zuora_identity_response => {zuora_entity_id => session["ZuoraCurrentIdentity"]})
-              end 
+              end
               @zuora_user.session = session
               session["#{@appinstance.id}::user::localUserId"] = @zuora_user.id
               session["#{@appinstance.id}::user::email"] = session['ZuoraCurrentIdentity']["username"]
@@ -359,19 +362,19 @@ module ZuoraConnect
               session["appInstance"] = @appinstance.id
 
             #We have multiple, user must pick
-            elsif appinstances.size > 1 
+            elsif appinstances.size > 1
               ZuoraConnect.logger.debug("User must select instance. #{@names}")
               render "zuora_connect/static/launch", :locals => {:names => appinstances.to_h}, :layout => false
               return
 
             #We have no deployed instance for this tenant
-            else 
-              #Ensure user can access oauth creation API 
+            else
+              #Ensure user can access oauth creation API
               if !session["ZuoraCurrentUserInfo"]['permissions'].include?("permission.userManagement")
                 Thread.current[:appinstance] = nil
                 session["appInstance"] = nil
                 render "zuora_connect/static/error_handled", :locals => {
-                  :title => "Application can only complete its initial setup via platform administrator", 
+                  :title => "Application can only complete its initial setup via platform administrator",
                   :message => "Please contact admin who has user managment permissions in tenant and have them click and finish setup."
                 }, :layout => false
                 return
@@ -389,20 +392,20 @@ module ZuoraConnect
                 next_id = (ZuoraConnect::AppInstance.all.where('id > 24999999').order(id: :desc).limit(1).pluck(:id).first || 24999999) + 1
                 user = (ENV['DEIS_APP'] || "Application").split('-').map(&:capitalize).join(' ')
                 body = {
-                  'userId' => zuora_user_id, 
-                  'entityIds' => [zuora_entity_id.unpack("a8a4a4a4a12").join('-')], 
-                  'customAuthorities' => [], 
+                  'userId' => zuora_user_id,
+                  'entityIds' => [zuora_entity_id.unpack("a8a4a4a4a12").join('-')],
+                  'customAuthorities' => [],
                   'additionalInformation' => {
-                    'description' => "This user is for #{user} application.", 
+                    'description' => "This user is for #{user} application.",
                     'name' => "#{user} API User #{next_id}"
                   }
                 }
 
                 oauth_response, response = zuora_client.rest_call(
-                  method: :post, 
-                  body: body.to_json, 
-                  url: zuora_client.rest_endpoint("genesis/clients").gsub('v1/', ''), 
-                  session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic, 
+                  method: :post,
+                  body: body.to_json,
+                  url: zuora_client.rest_endpoint("genesis/clients").gsub('v1/', ''),
+                  session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic,
                   headers: auth_headers
                 )
 
@@ -444,7 +447,7 @@ module ZuoraConnect
                     Thread.current[:appinstance] = nil
                     session["appInstance"] = nil
                     render "zuora_connect/static/error_handled", :locals => {
-                      :title => "Application could not create unique tokens.", 
+                      :title => "Application could not create unique tokens.",
                       :message => "Please contact support or retry launching application."
                     }, :layout => false
                     return
@@ -472,19 +475,27 @@ module ZuoraConnect
               ZuoraConnect.logger.warn("UI Authorization Error", ex, zuora: zuora_details.merge({:error => response.body}))
             elsif final_error != "INVALID_SESSION"
               ZuoraConnect.logger.warn("UI Authorization Error", ex, zuora: zuora_details.merge({:error => final_error}))
+            else
+              ZuoraConnect.logger.info("UI Authorization Error", ex, zuora: zuora_details.merge({:error => final_error}))
             end
             redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
             return
-          rescue => ex
-            session.clear
-            if defined?(ex.response) && ex.response.present? && defined?(ex.response.body)
-              zuora_details.merge!({:error => ex.response.body})
+
+          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
+            else
+              session.clear
+              if defined?(ex.response) && ex.response.present? && defined?(ex.response.body)
+                zuora_details.merge!({:error => ex.response.body})
+              end
+              ZuoraConnect.logger.error("UI Authorization Error", ex, zuora: zuora_details)
+              render "zuora_connect/static/error_unhandled", locals: {exception: ex, skip_exception: true}, layout: false, status: 500
             end
-            ZuoraConnect.logger.error("UI Authorization Error", ex, zuora: zuora_details)
-            render "zuora_connect/static/error_unhandled", locals: {exception: ex, skip_exception: true}, layout: false, status: 500
-            return              
+            return
           end
-        elsif request["data"] && /^([A-Za-z0-9+\/\-\_]{4})*([A-Za-z0-9+\/]{4}|[A-Za-z0-9+\/]{3}=|[A-Za-z0-9+\/]{2}==)$/.match(request["data"].to_s)
+        elsif request["data"].present? && (request["connectInstanceId"].present? || /^([A-Za-z0-9+\/\-\_]{4})*([A-Za-z0-9+\/]{4}|[A-Za-z0-9+-_\/]{3}=|[A-Za-z0-9+\/]{2}==)$/.match(request["data"].to_s))
           session.clear
           values = JSON.parse(ZuoraConnect::AppInstance.decrypt_response(Base64.urlsafe_decode64(request["data"])))
           values.fetch("param_data", {}).each do |k ,v|
@@ -499,8 +510,6 @@ module ZuoraConnect
             session["#{values["appInstance"]}::user::email"] = values["current_user"]["email"]
           end
 
-          ZuoraConnect.logger.debug({msg: 'Setup values', connect: values}) if Rails.env != "production"
-
           @appinstance = ZuoraConnect::AppInstance.find_by(:id => values["appInstance"].to_i)
 
           if @appinstance.blank?
@@ -521,10 +530,10 @@ module ZuoraConnect
             else
               raise ZuoraConnect::Exceptions::AccessDenied.new("Authorization mismatch. Possible tampering with session.")
             end
-          end 
+          end
         else
           if session["appInstance"].present?
-            @appinstance = ZuoraConnect::AppInstance.find_by(:id => session["appInstance"]) 
+            @appinstance = ZuoraConnect::AppInstance.find_by(:id => session["appInstance"])
           else
             raise ZuoraConnect::Exceptions::AccessDenied.new("No application state or session found.")
           end

data/lib/zuora_connect/engine.rb

@@ -16,10 +16,13 @@ module ZuoraConnect
       end
     end
 
+
     initializer :append_migrations do |app|
-      unless app.root.to_s.match root.to_s
-        config.paths["db/migrate"].expanded.each do |expanded_path|
-          app.config.paths["db/migrate"] << expanded_path
+      if ZuoraConnect.configuration.insert_migrations
+        unless app.root.to_s.match root.to_s
+          config.paths["db/migrate"].expanded.each do |expanded_path|
+            app.config.paths["db/migrate"] << expanded_path
+          end
         end
       end
     end

data/lib/zuora_connect/railtie.rb

@@ -13,6 +13,7 @@ module ZuoraConnect
       PATH_INFO
       CONTENT_TYPE
       ORIGINAL_FULLPATH
+      QUERY_STRING
     )
 
     config.before_initialize do
@@ -46,7 +47,7 @@ module ZuoraConnect
       require 'lograge'
       
       Rails.configuration.logger = ZuoraConnect.custom_logger(name: "Rails") 
-      if Rails.env != 'development'
+      if !Rails.env.test? && !Rails.env.development?
         Rails.configuration.lograge.enabled = true
         Rails.configuration.colorize_logging = false
       end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.57"
+  VERSION = "2.0.58"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.57
+  version: 2.0.58
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -42,16 +42,16 @@ dependencies:
   name: ougai-formatters-customizable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: zuora_api
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mono_logger
   requirement: !ruby/object:Gem::Requirement