zuora_connect 3.0.1.pre.c → 3.0.2.pre.b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad647d03e32b321e138c9adac68f251170483f170801baa94017ba70e920b8e8
-  data.tar.gz: 80fcbbb2144cbb89e2f79a28dc425350337199528e9a47adaa2f677bfd4be7ec
+  metadata.gz: 88383fb37eab881d442eb16520cc71cf11c98456c4b66e6cc59bc46f8f60e625
+  data.tar.gz: 741a1f55b33c8045d57902ed937fe98cfbfb63fa422f109228ac4d4bebef5cc8
 SHA512:
-  metadata.gz: 1d1f9ce5e3958d4c88f0480158c857cf1dcdce12f72af62c8f11c1a7caf03551b5a1be34fd30b404072058b57ef1a6b3c9834fafa7cea40615e5d5ddc992af6e
-  data.tar.gz: e3a4ac9e3994c489fe4c21e3f2ae313d58dad157a8629965c68032f8a77d4578d7076a90f22ba8bc71c195df9e97cb07cb0160452546c5a16eacdce1e96c9a53
+  metadata.gz: 7d23d6d4c59108331e07c2e7c2003fa2c297ae166b5b7317d982220dff5a1845e99adc30cb93ff6d93976c5eec6442b6986e1db318e5f8f3353746d4d2d66704
+  data.tar.gz: 6954dee8718c38bce95971b3f31e91cc377392bc83019ff6b0ca1964baaf91890c2b57a319edf208051b725b79a11a7dc44fb64ad54792f23c6733cf4b910373

data/app/controllers/concerns/zuora_connect/authenticate.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ZuoraConnect
+  # Methods for authenticating and setting the app instance for the current user
+  module Authenticate
+    extend ActiveSupport::Concern
+
+    def setup_instance_via_dev_mode
+      app_instance_id = ZuoraConnect.configuration.dev_mode_appinstance
+      session['appInstance'] = app_instance_id
+      session["#{app_instance_id}::admin"] = ZuoraConnect.configuration.dev_mode_admin
+
+      values = {
+        id: app_instance_id,
+        access_token: ZuoraConnect.configuration.dev_mode_user,
+        refresh_token: ZuoraConnect.configuration.dev_mode_pass,
+        token: ZuoraConnect.configuration.dev_mode_pass + ZuoraConnect.configuration.dev_mode_pass,
+        api_token: ZuoraConnect.configuration.dev_mode_pass + ZuoraConnect.configuration.dev_mode_pass
+      }
+
+      @appinstance = ZuoraConnect::AppInstance.find_by(id: app_instance_id)
+      ZuoraConnect::ZuoraUser.current_user_id = 0
+      if @appinstance.blank?
+        Apartment::Tenant.switch!('public')
+        begin
+          Apartment::Tenant.create(app_instance_id)
+        rescue Apartment::TenantExists
+          Apartment::Tenant.drop(app_instance_id)
+          retry
+        end
+        @appinstance = ZuoraConnect::AppInstance.new
+      end
+      @appinstance.assign_attributes(values)
+      @appinstance.save(validate: false)
+    end
+  end
+end

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/app/models/zuora_connect/app_instance_base.rb

@@ -1293,8 +1293,8 @@ module ZuoraConnect
     end
 
     def self.read_master_db
-      if self.connection.respond_to?(:stick_to_master!)
-        self.connection.stick_to_master!(false)
+      if self.connection.respond_to?(:stick_to_primary!)
+        self.connection.stick_to_primary!(false)
         yield
         Makara::Context.release_all
       else

data/lib/zuora_connect/controllers/helpers.rb

@@ -26,14 +26,9 @@ module ZuoraConnect
             @appinstance = ZuoraConnect::AppInstance.find_by(:api_token => request.headers["API-Token"])
             ZuoraConnect.logger.debug("API REQUEST - API token") if @appinstance.present?
             check_instance
-          elsif ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(request.headers.fetch("HOST", nil))
+          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']]
 
-            #Validate host present
-            if zuora_host.blank?
-              render json: {"status": 401, "message": "zuora-host header was not supplied."}, status: :unauthorized
-              return
-            end
             #Validate entity-ids present
             if zuora_entity_id.blank?
               render json: {"status": 401, "message": "zuora-entity-ids header was not supplied."}, status: :unauthorized
@@ -663,34 +658,6 @@ module ZuoraConnect
       def generate_token
         rand(36**64).to_s(36)
       end
-
-      def setup_instance_via_dev_mode
-        session["appInstance"] = ZuoraConnect.configuration.dev_mode_appinstance
-        session["#{ZuoraConnect.configuration.dev_mode_appinstance}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
-
-        values = {
-          id: ZuoraConnect.configuration.dev_mode_appinstance,
-          access_token: ZuoraConnect.configuration.dev_mode_user,
-          refresh_token: ZuoraConnect.configuration.dev_mode_pass,
-          token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass,
-          api_token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass
-        }
-
-        @appinstance = ZuoraConnect::AppInstance.find_by(:id => ZuoraConnect.configuration.dev_mode_appinstance.to_i)
-        ZuoraConnect::ZuoraUser.current_user_id = 0
-        if @appinstance.blank?
-          Apartment::Tenant.switch!("public")
-          begin
-            Apartment::Tenant.create(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
-          rescue Apartment::TenantExists => ex
-            Apartment::Tenant.drop(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
-            retry
-          end
-          @appinstance = ZuoraConnect::AppInstance.new()
-        end
-        @appinstance.assign_attributes(values)
-        @appinstance.save(:validate => false)
-      end
     end
   end
 end

data/lib/zuora_connect/engine.rb

@@ -31,6 +31,7 @@ module ZuoraConnect
     initializer "connect.helpers" do
       ActiveSupport.on_load(:action_controller) do
         include ZuoraConnect::Controllers::Helpers
+        include ZuoraConnect::Authenticate
         helper ZuoraConnect::ApplicationHelper
       end
     end

data/lib/zuora_connect/railtie.rb

@@ -1,7 +1,6 @@
 require 'middleware/metrics_middleware'
 require 'middleware/request_id_middleware'
 require 'middleware/json_parse_errors'
-require 'middleware/bad_multipart_form_data_sanitizer'
 
 module ZuoraConnect
   class Railtie < Rails::Railtie
@@ -20,7 +19,6 @@ module ZuoraConnect
     initializer "zuora_connect.configure_rails_initialization" do |app|
       app.middleware.insert_after Rack::Sendfile, ZuoraConnect::MetricsMiddleware
       app.middleware.insert_after ActionDispatch::RequestId, ZuoraConnect::RequestIdMiddleware
-      app.middleware.insert_before Rack::Runtime, ZuoraConnect::BadMultipartFormDataSanitizer
       app.config.middleware.use ZuoraConnect::JsonParseErrors
     end
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.1-c"
+  VERSION = "3.0.2-b"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.1.pre.c
+  version: 3.0.2.pre.b
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -100,13 +100,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -116,7 +130,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -346,6 +360,7 @@ files:
 - app/assets/javascripts/zuora_connect/application.js
 - app/assets/stylesheets/zuora_connect/api/v1/app_instance.css
 - app/assets/stylesheets/zuora_connect/application.css
+- app/controllers/concerns/zuora_connect/authenticate.rb
 - app/controllers/zuora_connect/admin/tenant_controller.rb
 - app/controllers/zuora_connect/api/v1/app_instance_controller.rb
 - app/controllers/zuora_connect/application_controller.rb
@@ -394,7 +409,6 @@ files:
 - db/migrate/20190520232224_add_environment_fields.rb
 - lib/metrics/influx/point_value.rb
 - lib/metrics/net.rb
-- lib/middleware/bad_multipart_form_data_sanitizer.rb
 - lib/middleware/json_parse_errors.rb
 - lib/middleware/metrics_middleware.rb
 - lib/middleware/request_id_middleware.rb
@@ -430,7 +444,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.

data/lib/middleware/bad_multipart_form_data_sanitizer.rb

@@ -1,21 +0,0 @@
-module ZuoraConnect
-  class BadMultipartFormDataSanitizer
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      if env['CONTENT_TYPE'] =~ /multipart\/form-data/
-        begin
-          Rack::Multipart.parse_multipart(env)
-        rescue EOFError => ex
-          # set content-type to multipart/form-data without the boundary part
-          # to handle the case where empty content is submitted
-          env['CONTENT_TYPE'] = 'multipart/form-data'
-        end
-      end
-
-      @app.call(env)
-    end
-  end
-end