zuora_connect 3.0.2.pre.c → 3.0.2.pre.g

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0e687018b2dd593320481ce15b4e534d3e6c4225ed04347c1cfc14c3a701ec7
-  data.tar.gz: 84da0a199d5979deb74b1406fc10cdc823c6a4d12912b5a91151b01fa3af06d7
+  metadata.gz: b3cede711b0d2e03b8af4d3b6217efff536d7a1c937622534002a7555982aae1
+  data.tar.gz: 86fb27da334cc101429209aab0a3071209cc8c58286d26ac8d9643402ef0c887
 SHA512:
-  metadata.gz: 64814f726751a7bb7101eb6ed45906af0a32de3f147de994eb2ffa9495a327f7650b4008477dbdcc745c97404ebf061c8a5802a4b6112dd438a881e38c753f7e
-  data.tar.gz: 6a82003bb099575c1f60f2f38ffbe5a0e17e0465b9f021b767ed92cd940750814324b3dcc395f00466e67b6bcecdf9e51aedc089894ca1b490bb7acb4c654bbb
+  metadata.gz: 964dd0285c9ac0202a6f60d17ce4d0c1a17054fb291ae1ff1aeed31205f4e43c4038a98afe416ce154f4b302084f078130aa2f281b998fd84a66bc755ae576cd
+  data.tar.gz: 79f01e5ecf1a176c5e8960d1646c075054effc585196decc5664dde1daa9fabbdb5ec79659156485099739a4dd336022e2a4f7af8b3263f106e7aad4fa5d6392

data/app/models/zuora_connect/app_instance_base.rb

@@ -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

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

@@ -308,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-c"
+  VERSION = "3.0.2-g"
 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.c
+  version: 3.0.2.pre.g
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-08-24 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: