zuora_connect 3.0.2.pre.a → 3.0.2.pre.e

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6af8cf178f6060ca9e70f81f24505e99f875197d51cb34ddc78de16da46dd81e
-  data.tar.gz: 4cad94cbd73e4576a6ef4a7567a169b2eb6e4768432a46b8231ff1260df4ebdc
+  metadata.gz: 7d1be219ec34e867fe4e4b368cc47cf32331199fb75fba7b13e48b8302698899
+  data.tar.gz: 693fcb0a597f5e4430d1ea71916034f0d8bf0ba1b6af24390d6c189c79db105f
 SHA512:
-  metadata.gz: 06a45682d61c210d192023ede3408aac2a41654d5046ef44a3ee8083e4259a3a9fc10c19666136eba1917c457cb56accd7418a985dd4aa7883b16766cb339561
-  data.tar.gz: 76e424517a93b5b5ba0a858c41005c01de1f1f7520e482a7ed727a1d60a59a0c9562ac40795e7a46093014753eb664b89fa89659493956b9de19463770c4320b
+  metadata.gz: 6e9758779261866d0bf013a3c27aafafc1e250310f43dcb4fb029b6602e54f00cfb29efcf903cd57d35a973decfbb1be33c7400ee9de148d860cd1bff4b51b77
+  data.tar.gz: 669ca1f044f2b783288c7fe15e50a2f6c322278cda00e8fba0a0fe744ec5dc10ec6b95506ff4378b4f989af43aeb48a2662296e84d2d24d554f990f0eaf3a69c

data/app/models/concerns/zuora_connect/auditable.rb

@@ -10,6 +10,7 @@ module ZuoraConnect
     included do
       before_create :set_created_by_id
       before_update :set_updated_by_id
+      before_destroy :set_updated_by_id
 
       private
 

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.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'

data/lib/zuora_connect/controllers/helpers.rb

@@ -28,6 +28,8 @@ module ZuoraConnect
             check_instance
           elsif ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(request.headers.fetch("HOST", nil)) && request.headers['zuora-host'].present?
             zuora_host, zuora_entity_id, zuora_instance_id = [request.headers['zuora-host'], (request.headers['zuora-entity-ids'] || "").gsub('-',''), request.headers['zuora-instance-id']]
+            zuora_host_mapping = {'origin-gateway.sbx.auw2.zuora.com' => 'rest.apisandbox.zuora.com',  'origin-gateway.prod.auw2.zuora.com' => 'rest.zuora.com'}
+            zuora_host = zuora_host_mapping[zuora_host] if zuora_host_mapping.keys.include?(zuora_host)
 
             #Validate entity-ids present
             if zuora_entity_id.blank?
@@ -306,7 +308,7 @@ module ZuoraConnect
         if zuora_entity_id.present?
           zuora_tenant_id = cookies['Zuora-Tenant-Id']
           zuora_user_id = cookies['Zuora-User-Id']
-          zuora_host = request.headers['HTTP_X_FORWARDED_HOST'] || request.headers['Zuora-Host'] || 'apisandbox.zuora.com'
+          zuora_host = request.headers['HTTP_X_FORWARDED_HOST'] || request.headers['HTTP_ZUORA_HOST'] || 'apisandbox.zuora.com'
 
           zuora_details = {'host' => zuora_host, 'user_id' => zuora_user_id, 'tenant_id' => zuora_tenant_id, 'entity_id' => zuora_entity_id}
           auth_headers = {}

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-a"
+  VERSION = '3.0.2-e'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.2.pre.a
+  version: 3.0.2.pre.e
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-08-18 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: 
@@ -444,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Summary of Connect.