zuora_connect 3.0.2.pre.d → 3.0.2.pre.h

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527f334aa53550fcb76ec478571ff72b4d93a3b1dac00b72e44bd675b377ae2a
-  data.tar.gz: 555db3194402d86913d295ce38a74dc1983f65cd8ac0521ab88960d8d96c99cf
+  metadata.gz: 1daf70331d29259febac6329ca469eb0a452dbd2528b2fca8df344bf4eba70ae
+  data.tar.gz: d9a36bda5170c74140511e7e2538ad2e71c02af12c311cd57dbd9e825c970bbf
 SHA512:
-  metadata.gz: b6880e4c9ae5aba34292326f6f78e2d60011ccb85bb3d0e1523b617ca61e975f3cf8b2616cdf3813e78f4a3254867e8fd5f1a0e8d46989d2674b387c499f56ba
-  data.tar.gz: 548da9f9da6499333c850257e928fe639444040d18127af630d224f9322622d3493ab7aa6b70640034fb35f5586348b1de219425a799bc177cb26b3157c36336
+  metadata.gz: a4db46ecf8fa9ef1f8aea8e1622450e95ba85e9a1f34764e5461ecaa1a4da8987704a5fd15e73946030f9592253bf099db4f4e83515ea81064216bf058dddf05
+  data.tar.gz: 8a71664252ae4b807e0bfe851cb5246de049591787da15a909bb2e67e3c4addd960c0d0fbbdce47758716722bf4c245a0b1aa2b6adbbdb70155c4a23b0770754

data/app/models/zuora_connect/app_instance_base.rb

@@ -266,7 +266,7 @@ module ZuoraConnect
 
         params = {
           name: self.task_data.dig('name'),
-          zuora_entity_ids: (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).map{|e| e['id']}.uniq,
+          zuora_entity_ids: (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).select {|entity| !entity['skip'].to_bool}.map{|e| e['id']}.uniq,
           zuora_tenant_ids: tenants.map(&:to_s).uniq,
           organizations: organizations
         }
@@ -397,7 +397,8 @@ module ZuoraConnect
         end
       end
     rescue => ex
-      if self['zuora_logins'].present?
+      refresh_count += 1
+      if self['zuora_logins'].present? && refresh_count < 3
         ZuoraConnect.logger.warn("REFRESH TASK - Fallback to local encrypted store", ex, self.default_ougai_items)
         skip_connect = true
         retry
@@ -812,7 +813,7 @@ module ZuoraConnect
       def strip_cache_data(object: {}, keys: ['applications', 'tokens','tenant_ids', 'organizations','user_settings'] )
         keys.each {|key| object.delete(key) }
         object.select {|k,v| k.include?('login') && v['tenant_type'] == 'Zuora'}.each do |login_key, login_data|
-          object[login_key]['entities'] = login_data.fetch('entities',[]).map {|entity| entity.slice('id', 'tenantId', 'entityId', 'displayName')}
+          object[login_key]['entities'] = login_data.fetch('entities',[]).map {|entity| entity.slice('id', 'tenantId', 'entityId', 'displayName', 'identifier')}
         end
         return object
       end

data/app/models/zuora_connect/login.rb

@@ -1,27 +1,29 @@
 module ZuoraConnect
   class Login
-
+    attr_accessor :clients, :identifier_to_ids, :default_entity
     def initialize (fields)
-      @clients = {}
+      self.clients = {}
+      self.identifier_to_ids = {}
       if fields["tenant_type"] == "Zuora"
         login_fields = fields.map{|k,v| [k.to_sym, v]}.to_h
         login_type = fields.dig("authentication_type").blank? ? 'Basic' : fields.dig("authentication_type").capitalize
         
         raise ZuoraConnect::Exceptions::InvalidCredentialSet.new("Cannot setup application with ZSession Login.") if login_type == "Session"
-        @clients["Default"] = "::ZuoraAPI::#{login_type}".constantize.new(**login_fields)
-        @default_entity = fields["entities"][0]["id"] if (fields.dig("entities") || []).size == 1
+        self.clients["Default"] = "::ZuoraAPI::#{login_type}".constantize.new(**login_fields)
+        self.default_entity = fields["entities"][0]["id"] if (fields.dig("entities") || []).size == 1
         if fields["entities"] && fields["entities"].size > 0
           fields["entities"].each do |entity|
-            params = {:entity_id => entity["id"]}.merge(login_fields)
-            @clients[entity["id"]] =  "::ZuoraAPI::#{login_type}".constantize.new(**params)
+            params = {:entity_id => entity["id"], :entity_identifier => entity["identifier"]}.merge(login_fields)
+            self.clients[entity["id"]] =  "::ZuoraAPI::#{login_type}".constantize.new(**params)
+            self.identifier_to_ids[entity["identifier"]] = entity["id"]
           end
         end
-        self.attr_builder("available_entities", @clients.keys) 
+        self.attr_builder("available_entities", self.clients.keys) 
       end
       fields.each do |k,v|
         self.attr_builder(k,v)
       end
-      @default_entity ||= "Default"
+      self.default_entity ||= "Default"
     end
 
     def attr_builder(field,val)
@@ -29,9 +31,19 @@ module ZuoraConnect
       send("#{field}=", val)
     end
 
-    def client(id = @default_entity)
-      return id.blank? ? @clients[@default_entity] : @clients[id]
-    end
+    def client(id = self.default_entity)
+      use_entity_name = self.identifier_to_ids.keys.include?(id)
+
+      # Translate entity name to entity id
+      id = self.identifier_to_ids[id] if use_entity_name
+
+      client = id.blank? ? self.clients[self.default_entity] : self.clients[id]
 
+      if client
+        client.entity_header_type = use_entity_name ? :entity_name : :entity_id
+      end
+
+      client
+    end
   end
 end

data/app/views/zuora_connect/static/error_handled.js.erb

@@ -1 +1 @@
-$('body').html('<%= escape_javascript render(:file=> "zuora_connect/static/error_handled", :formats => [:html], :locals => local_assigns, :layout => false) %>');
+$('body').html('<%= escape_javascript render(:template=> "zuora_connect/static/error_handled", :formats => [:html], :locals => local_assigns, :layout => false) %>');

data/app/views/zuora_connect/static/error_unhandled.js.erb

@@ -1 +1 @@
-$('body').html('<%= escape_javascript render(:file=> "zuora_connect/static/error_unhandled", :formats => [:html], :locals => local_assigns, :layout => false) %>');
+$('body').html('<%= escape_javascript render(:template=> "zuora_connect/static/error_unhandled", :formats => [:html], :locals => local_assigns, :layout => false) %>');

data/lib/middleware/metrics_middleware.rb

@@ -46,19 +46,10 @@ module ZuoraConnect
       if !ActionDispatch::Request::HTTP_METHODS.include?(env["REQUEST_METHOD"].upcase)
         [405, {"Content-Type" => "text/plain"}, ["Method Not Allowed"]]
       else
-        if (env['HTTP_ZUORA_LAYOUT_FETCH_TEMPLATE_ID'].present?)
-          Thread.current[:isHallway] = "/#{env['HTTP_ZUORA_LAYOUT_FETCH_TEMPLATE_ID']}"
-          env['PATH_INFO'] = env['PATH_INFO'].gsub(Thread.current[:isHallway], '')
-          env['REQUEST_URI'] = env['REQUEST_URI'].gsub(Thread.current[:isHallway], '')
-          env['REQUEST_PATH'] = env['REQUEST_PATH'].gsub(Thread.current[:isHallway], '')
-
-          #We need the forwarded host header to identify location of tenant
+        if Thread.current[:isHallway]
+          # We need the forwarded host header to identify location of tenant
           whitelist = Regexp.new(".*[\.]zuora[\.]com$|^zuora[\.]com$")
-          if whitelist.match(env['HTTP_X_FORWARDED_HOST']).present?
-            @bad_headers.delete('HTTP_X_FORWARDED_HOST')
-          end
-        else
-          Thread.current[:isHallway] = nil
+          @bad_headers.delete('HTTP_X_FORWARDED_HOST') if whitelist.match(env['HTTP_X_FORWARDED_HOST']).present?
         end
 
         #Remove bad headers
@@ -88,28 +79,18 @@ module ZuoraConnect
         begin
           @status, @headers, @response = @app.call(env)
         ensure
+          # Writing to telegraf: Handle 404
+          if [404, 500].include?(@status)
+            content_type = @headers['Content-Type'].split(';')[0] if @headers['Content-Type']
+            content_type = content_type.gsub('text/javascript', 'application/javascript')
+            tags = { status: @status, content_type: content_type }
 
-          # Uncomment following block of code for handling engine requests/requests without controller
-          # else
-          #   # Handling requests which do not have controllers (engines)
-          if env["SCRIPT_NAME"].present?
-            controller_path = "#{env['SCRIPT_NAME'][1..-1]}"
-            controller_path = controller_path.sub("/", "::")
-            request_path = "#{controller_path}#UnknownAction"
-          else
-            # Writing to telegraf: Handle 404
-            if [404, 500].include?(@status)
-              content_type = @headers['Content-Type'].split(';')[0] if @headers['Content-Type']
-              content_type = content_type.gsub('text/javascript', 'application/javascript')
-              tags = {status: @status, content_type: content_type}
-
-              tags = tags.merge({controller: 'ActionController'})
-              tags = tags.merge({action: 'RoutingError' }) if @status == 404
-
-              values = {response_time: ((Time.now - start_time)*1000).round(2) }
-
-              ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: :inbound, tags: tags, values: values)
-            end
+            tags = tags.merge({ controller: 'ActionController' })
+            tags = tags.merge({ action: 'RoutingError' }) if @status == 404
+
+            values = { response_time: ((Time.now - start_time) * 1000).round(2) }
+
+            ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: :inbound, tags: tags, values: values)
           end
           Thread.current[:inbound_metric] = nil
         end

data/lib/zuora_connect/middleware/hallway.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module ZuoraConnect
+  module Middleware
+    # Enables requests to be served from dynamic paths, determined by headers
+    class Hallway
+      UI_PATH = 'HTTP_ZUORA_UI_PATH'
+      LAYOUT_ID = 'HTTP_ZUORA_LAYOUT_FETCH_TEMPLATE_ID'
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        dynamic_path = env[UI_PATH].presence || layout_id(env)
+
+        Thread.current[:isHallway] = dynamic_path
+
+        if dynamic_path.present?
+          env['SCRIPT_NAME'] = dynamic_path
+          env['PATH_INFO'] = env['PATH_INFO'].sub(dynamic_path, '')
+        end
+
+        @app.call(env)
+      end
+
+      private
+
+      def layout_id(env)
+        "/#{env[LAYOUT_ID]}" if env[LAYOUT_ID].present?
+      end
+    end
+  end
+end

data/lib/zuora_connect/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'middleware/metrics_middleware'
 require 'middleware/request_id_middleware'
 require 'middleware/json_parse_errors'
@@ -17,7 +19,8 @@ module ZuoraConnect
     end
 
     initializer "zuora_connect.configure_rails_initialization" do |app|
-      app.middleware.insert_after Rack::Sendfile, ZuoraConnect::MetricsMiddleware
+      app.middleware.insert_after Rack::Sendfile, ZuoraConnect::Middleware::Hallway
+      app.middleware.insert_after ZuoraConnect::Middleware::Hallway, ZuoraConnect::MetricsMiddleware
       app.middleware.insert_after ActionDispatch::RequestId, ZuoraConnect::RequestIdMiddleware
       app.config.middleware.use ZuoraConnect::JsonParseErrors
     end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ZuoraConnect
-  VERSION = "3.0.2-d"
+  VERSION = "3.0.2-h"
 end

data/lib/zuora_connect.rb

@@ -2,6 +2,7 @@ require 'zuora_connect/configuration'
 require "zuora_connect/engine"
 require 'zuora_connect/exceptions'
 require 'zuora_connect/controllers/helpers'
+require 'zuora_connect/middleware/hallway'
 require 'zuora_connect/railtie'
 require 'resque/additions'
 require 'resque/dynamic_queues'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.2.pre.d
+  version: 3.0.2.pre.h
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -424,6 +424,7 @@ files:
 - lib/zuora_connect/controllers/helpers.rb
 - lib/zuora_connect/engine.rb
 - lib/zuora_connect/exceptions.rb
+- lib/zuora_connect/middleware/hallway.rb
 - lib/zuora_connect/railtie.rb
 - lib/zuora_connect/version.rb
 homepage: