zuora_connect 2.0.57e → 2.0.57j

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2e138a9e6f9b4a52f7137f75f1e5b42ea0ec86d3b171200c8c1f72f420e354
-  data.tar.gz: 1a3623a3c7642fd58874073a40df968ca2cf873d57e37ce1b6cc73b4578a7a92
+  metadata.gz: 20a3be40ccdd0ae006685145eb4d5500389fc6cf220402bfb93072cffb911a41
+  data.tar.gz: 9821553b9795ea6ac6d73cebabb38d881c72dc6f845af86aa5e704def9e36b55
 SHA512:
-  metadata.gz: 24c23ef88ab8eedae5a9f2f3a6dfd5f7e7156f9bbac0e1d8c17e6194ad88b28c0bdbb3ac6e7d6d4ff8a5000b8a0296bd122190c6e6e300b85597e4be9f0283c9
-  data.tar.gz: 13dfee8116281ea45195120f9ede4e7317eb80b6fe138e912207c5ab6106f931516e251c95dc470efcc1d30dc46863216c5bb8d4124d03ad74b145ce09f67884
+  metadata.gz: 65c1c86d4dc83c3de5c9791dd2f1b688015c300111b2521f0c3f7bc4f52b4115c3bf13c9a5ff477c90734171f204df6b24966524d78d0a11aa8a21036ecf253a
+  data.tar.gz: a9675847a52ef1b26027a57f87a680a87755175ecf48ce929ae9cc7a4e740f7d090ff88dd07364f69e9ea8173a3cb0db58c1188b79cefbce6a41833711c9853c

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'
@@ -225,7 +225,7 @@ module ZuoraConnect
       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
@@ -277,11 +277,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)
@@ -313,7 +310,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)
@@ -322,17 +319,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
@@ -654,16 +651,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)
@@ -677,11 +670,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
@@ -692,10 +685,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
@@ -745,10 +738,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
@@ -764,7 +757,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
@@ -828,10 +821,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

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/zuora_connect/controllers/helpers.rb

@@ -149,24 +149,24 @@ module ZuoraConnect
         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 +196,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 +246,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 +268,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_same_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
+              unless is_same_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 +303,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,7 +311,7 @@ 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
@@ -330,7 +337,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 +357,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 +366,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 +396,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 +451,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
@@ -477,7 +484,7 @@ module ZuoraConnect
             end
             redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
             return
-         
+
           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."}
@@ -490,7 +497,7 @@ module ZuoraConnect
               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
-            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)
           session.clear
@@ -529,10 +536,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.57e
+  version: 2.0.57j
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-06-04 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