zuora_connect 2.0.5s → 2.0.5t

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5f0aee37797f56d7006e8e7aea1e2a708bff45df18c45b95bfcad5227ca1091
-  data.tar.gz: 1902e2cd7cd8c6eb00ee1be515135fab5a1fd5f468ca675d9ac3b195bfd9ced7
+  metadata.gz: 39768dc5cd2950a55c95e3afea3e72ea1e48c8ee2cf2fc340f7b1b71b5585bc5
+  data.tar.gz: d13f2e38f8a27ad0b7233771663c23739d368062395ada699fe9802795f612cc
 SHA512:
-  metadata.gz: 2693b9d711f338500ffcfe6379a1e1d5cdf00c621c03d46f43c09f9f99a40967adfc139d7f04335cc93f83b1739049ea960197e1b1a23d35cab14bda57c4be46
-  data.tar.gz: e6dcabf5cc494d01b0b6bbb38c7ce9cd9ebea97cc5c167b507cd19e3afefc4cfb9bd194e63b6124b955a6cca522528c930b4d0c7e6cce1cb8803e6a50fb85e0c
+  metadata.gz: 981fa2396d8f297e8018587f00b084795f477eb9f46303a9a01e7b40d72a8ef81d0b8391b6cae803176b8b60e799f5bc534a643c5a3503b517d9134c08f36b20
+  data.tar.gz: 001e7fafa0f8baa245e49ef5325b09b34a2715014fc45bb589429efb77df60d6d5bddec45fc438c200cc1ec6462a062af4ccbf91fd37a7809a1f7b8b8761d5a4

data/lib/zuora_connect/controllers/helpers.rb

@@ -88,25 +88,25 @@ module ZuoraConnect
           zuora_entity_id = request.headers['ZuoraCurrentEntity'] || cookies['ZuoraCurrentEntity']
 
           if zuora_entity_id.present?
-
-            #Do we need to refresh session identity
             zuora_host = request.headers["HTTP_X_FORWARDED_HOST"] || "apisandbox.zuora.com"
-            if request.headers["Zuora-Auth-Token"].present?
-              zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", bearer_token: request.headers["Zuora-Auth-Token"], oauth_session_expires_at: Time.now + 5.minutes )
-            elsif cookies['ZSession'].present?
-              zuora_client = ZuoraAPI::Basic.new(url: "https://#{zuora_host}", session: cookies['ZSession'])
-            else
-              render "zuora_connect/static/error_handled", :locals => {
-                :title => "Missing Authorization Token", 
-                :message => "Zuora 'Zuora-Auth-Token' header and 'ZSession' cookie not present."
-              }
-              return
-            end
-            zuora_instance_id = params[:sidebar_launch].to_bool ? nil : (params[:app_instance_id] || session["appInstance"])
 
-            #Identity blank or current entity different
-            if (session["ZuoraCurrentIdentity"].blank? || (session["ZuoraCurrentEntity"] != zuora_entity_id) || (session["ZSession"] != cookies['ZSession']))
-              begin
+            begin
+              #Do we need to refresh session identity
+              if request.headers["Zuora-Auth-Token"].present?
+                zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", bearer_token: request.headers["Zuora-Auth-Token"], oauth_session_expires_at: Time.now + 5.minutes )
+              elsif cookies['ZSession'].present?
+                zuora_client = ZuoraAPI::Basic.new(url: "https://#{zuora_host}", session: cookies['ZSession'])
+              else
+                render "zuora_connect/static/error_handled", :locals => {
+                  :title => "Missing Authorization Token", 
+                  :message => "Zuora 'Zuora-Auth-Token' header and 'ZSession' cookie not present."
+                }
+                return
+              end
+              zuora_instance_id = params[:sidebar_launch].to_bool ? nil : (params[:app_instance_id] || session["appInstance"])
+
+              #Identity blank or current entity different
+              if (session["ZuoraCurrentIdentity"].blank? || (session["ZuoraCurrentEntity"] != zuora_entity_id) || (session["ZSession"] != cookies['ZSession']))
                 identity, response = zuora_client.rest_call(url: zuora_client.rest_endpoint("identity"))
                 session["ZuoraCurrentIdentity"] = identity
                 session["ZuoraCurrentEntity"] = identity['entityId']
@@ -120,24 +120,14 @@ module ZuoraConnect
                 end
 
                 raise ZuoraConnect::Exceptions::Error.new("Header entity id, '#{zuora_entity_id}' does not match identity call entity id, '#{identity['entityId']}'.") if zuora_entity_id != identity['entityId']
-
-              rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
-                redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{CGI.escape(request.fullpath)}"
-                return
-              rescue => ex
-                ZuoraConnect.logger.error(ex)
-                render "zuora_connect/static/error_unhandled", :locals => {:exception => ex}
-                return              
               end
-            end
 
-            #Find matching app instances.
-            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_client.rest_domain, id: zuora_instance_id).pluck(:id, :name)
-            else
-              #if app_instance_ids is present then permissions still controlled by connect
-              if params[:app_instance_ids].present? 
-                begin
+              #Find matching app instances.
+              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_client.rest_domain, id: zuora_instance_id).pluck(:id, :name)
+              else
+                #if app_instance_ids is present then permissions still controlled by connect
+                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"
@@ -145,48 +135,44 @@ module ZuoraConnect
                   task_ids = JSON.parse(Base64.urlsafe_decode64(CGI.parse(URI.parse(url).query)["app_instance_ids"][0]))
                   
                   appinstances = ZuoraConnect::AppInstance.where(:id => task_ids).pluck(:id, :name)
-                rescue => ex
-                  ZuoraConnect.logger.error(ex)
-                  render "zuora_connect/static/error_unhandled", :locals => {:exception => ex}
-                  return
+                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
-              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
-            end
 
-            zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId']
+              zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId']
 
-            #One deployed instance
-            if appinstances.size == 1
-              ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
-              @appinstance = ZuoraConnect::AppInstance.find(appinstances.to_h.keys.first)
+              #One deployed instance
+              if appinstances.size == 1
+                ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
+                @appinstance = ZuoraConnect::AppInstance.find(appinstances.to_h.keys.first)
 
-              #Add user/update 
-              @zuora_user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
-              if @zuora_user.present?
-                ZuoraConnect.logger.debug("Current zuora user #{zuora_user_id}")
-                if @zuora_user.updated_at < Time.now - 1.day
-                  @zuora_user.zuora_identity_response[zuora_entity_id] = session["ZuoraCurrentIdentity"]
-                  @zuora_user.save!
-                end
-              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 
-              @zuora_user.session = session
-              session["#{@appinstance.id}::user::email"] = session['ZuoraCurrentIdentity']["username"]
-              session["#{@appinstance.id}::user::timezone"] = session['ZuoraCurrentIdentity']["timeZone"]
-              session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["language"]
-              session["appInstance"] = @appinstance.id
-
-            #We have multiple, user must pick
-            elsif appinstances.size > 1 
-              ZuoraConnect.logger.debug("User must select instance. #{@names}")
-              render "zuora_connect/static/launch", :locals => {:names => appinstances.to_h}
-              return
-            else 
-              begin
+                #Add user/update 
+                @zuora_user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
+                if @zuora_user.present?
+                  ZuoraConnect.logger.debug("Current zuora user #{zuora_user_id}")
+                  if @zuora_user.updated_at < Time.now - 1.day
+                    @zuora_user.zuora_identity_response[zuora_entity_id] = session["ZuoraCurrentIdentity"]
+                    @zuora_user.save!
+                  end
+                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 
+                @zuora_user.session = session
+                session["#{@appinstance.id}::user::email"] = session['ZuoraCurrentIdentity']["username"]
+                session["#{@appinstance.id}::user::timezone"] = session['ZuoraCurrentIdentity']["timeZone"]
+                session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["language"]
+                session["appInstance"] = @appinstance.id
+
+              #We have multiple, user must pick
+              elsif appinstances.size > 1 
+                ZuoraConnect.logger.debug("User must select instance. #{@names}")
+                render "zuora_connect/static/launch", :locals => {:names => appinstances.to_h}
+                return
+
+              #We have no deployed instance for this tenant
+              else 
                 #Ensure user can access oauth creation API 
                 if session["ZuoraCurrentIdentity"]['platformRole'] != 'ADMIN' 
                   Thread.current[:appinstance] = nil
@@ -200,7 +186,7 @@ module ZuoraConnect
 
                 ActiveRecord::Base.transaction do
                   ActiveRecord::Base.connection.execute('LOCK public.zuora_users IN ACCESS EXCLUSIVE MODE')
-                  sleep(2) #Sleep needed to wait for instance insertion
+                  sleep(5) #Sleep needed to wait for instance insertion
                   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)
                   if appinstances.size > 0
                     ZuoraConnect.logger.warn("Double tenant create for '#{zuora_client.rest_domain}' - '#{zuora_entity_id}' - '#{session["ZuoraCurrentIdentity"]["username"]}'")
@@ -276,12 +262,16 @@ module ZuoraConnect
                 end
                 @appinstance.refresh
                 session["appInstance"] = @appinstance.id
-
-              rescue => ex
-                ZuoraConnect.logger.error(ex)
-                render "zuora_connect/static/error_unhandled", :locals => {:exception => ex}
-                return
               end
+
+            rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
+              session.clear
+              redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
+              return
+            rescue => ex
+              ZuoraConnect.logger.error(ex)
+              render "zuora_connect/static/error_unhandled", :locals => {:exception => ex}
+              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)
             setup_instance_via_data

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5s"
+  VERSION = "2.0.5t"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5s
+  version: 2.0.5t
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.43
+        version: 1.6.48
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.43
+        version: 1.6.48
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.43
+        version: 1.6.48
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.43
+        version: 1.6.48
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement