zuora_connect 3.1.5.pre.g → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf4d387450ce6927d341515534491f97406c5ae7a083aa95733db6f78259fa0e
-  data.tar.gz: b65d9eaf5e74d8cc5ad87fa089504f559454a1aa608b941dafecfc6bccd1e71e
+  metadata.gz: 3ce9871a6d530d5d0146cf591445fd21ec4f1cba986944b8b966ddc493c5f1a1
+  data.tar.gz: db1756a9a29035a6180ce3370021432a6b255567b8aeaea1eb36ad3f25651ff6
 SHA512:
-  metadata.gz: 4a4992ccb7dc60276ce8723a97d999b6b046eeba6391c1a080ddda8fd01dbf0e8895ce7194334e3532ba49c996b569d61e3c059fc9ac4529494c570185423a08
-  data.tar.gz: 66d66669ee2189d94c7f548fa5c48ff3a8c8f349655113b808a7676e0b6d5221d482b1d499b3228e9921e75ab1c178061ce66415c74870c57d462feabcfcab89
+  metadata.gz: aea09cd52f629f8feb5a57a2e200040ad0371a64086c15a662f3408f77ef930211dceb2b01ebbfecc7ca437f268b262a60f52f05d43a3b0ca17e830db72a7e63
+  data.tar.gz: b324ac9bd0f233b04e641efafc2e62e4344218c84f99005fbe67a31a301ececb56411966b67b7a7333ee6581500ee72af4780aea6fa7c58dc15abd60c29c8169

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,5 +1,4 @@
 module ZuoraConnect
-  require "resolv"
   class StaticController < ApplicationController
     before_action :authenticate_connect_app_request, :except => [:health, :initialize_app, :provision, :instance_user, :instance_drop]
     before_action :clear_connect_app_session,        :only =>   [:health, :initialize_app, :provision, :instance_user, :instance_drop]
@@ -52,10 +51,6 @@ module ZuoraConnect
     end
 
     def provision
-      if ZuoraConnect.configuration.disable_provisioning
-        render(json: { status: 403, message: 'Provisioning is suspended' }, status: 403) && return
-      end
-
       create_new_instance
       unless performed?
         render json: {
@@ -125,7 +120,7 @@ module ZuoraConnect
 
     def instance_drop
       host = request.headers.fetch("HOST", nil)
-      if host.present? && (ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(host) || host =~ Resolv::IPv4::Regex)
+      if host.present? && ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(host)
         ZuoraConnect::AppInstance.read_master_db do
           instance_id = params[:id]
           @appinstance = ZuoraConnect::AppInstance.find(instance_id)

data/app/models/zuora_connect/app_instance_base.rb

@@ -516,11 +516,8 @@ module ZuoraConnect
         else
           ZuoraConnect::Exceptions::Error.new("Invalid encryption method '#{encryption_type}'.")
         end
-      rescue ArgumentError, OpenSSL::Cipher::CipherError => ex
-        if (
-          ex.is_a?(ArgumentError) && ['invalid base64', 'data must not be empty'].include?(ex.message) ||
-            ex.is_a?(OpenSSL::Cipher::CipherError) && ['wrong final block length', 'bad decrypt'].include?(ex.message)
-        ) && encryption_type == :envelope && (kms_tries += 1) < 3
+      rescue ArgumentError => ex
+        if ex.message == 'invalid base64' && encryption_type == :envelope && (kms_tries += 1) < 3
           ZuoraConnect.logger.warn("Fallback to encryption 'direct', from '#{encryption_type}'", ex, self.default_ougai_items)
           encryption_type = :direct 
           retry
@@ -907,12 +904,6 @@ module ZuoraConnect
 
         session["#{self.id}::last_refresh"] = self.last_refresh
         session["appInstance"] = self.id
-
-        unless ZuoraConnect::ZuoraUser.current_org_child_org_ids.nil?
-          session["zuora_org_id"] = ZuoraConnect::ZuoraUser.current_org_id
-          session["zuora_org_child_org_ids"] = ZuoraConnect::ZuoraUser.current_org_child_org_ids
-        end
-
         return session
       end
 

data/app/models/zuora_connect/zuora_user.rb

@@ -3,7 +3,7 @@ module ZuoraConnect
     self.table_name = "zuora_users"
     attr_accessor :session
 
-    cattr_accessor :current_user_id, :current_org_id, :current_org_child_org_ids
+    cattr_accessor :current_user_id
 
     # zuora_user_id/zuora_entity_id both come from cookie or headers
     # zuora_current_identity comes from session

data/lib/zuora_connect/configuration.rb

@@ -7,7 +7,7 @@ module ZuoraConnect
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
-    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :insert_migrations, :skip_connect, :encryption_type, :local_task_data, :disable_provisioning
+    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :insert_migrations, :skip_connect, :encryption_type, :local_task_data
 
     def initialize
       @default_locale = :en
@@ -23,7 +23,6 @@ module ZuoraConnect
       @skip_connect = false
       @encryption_type = :direct
       @local_task_data = false
-      @disable_provisioning = false
 
       # Setting the app name for telegraf write
       @enable_metrics = false

data/lib/zuora_connect/controllers/helpers.rb

@@ -66,39 +66,6 @@ module ZuoraConnect
           end
 
           @zuora_user = ZuoraConnect::ZuoraUser.find_by(zuora_user_id: ZuoraConnect::ZuoraUser.current_user_id)
-
-          zuora_org_id = request.headers["Zuora-Org-Id"]
-          zuora_return_nested_orgs_data = request.headers['Zuora-Return-Nested-Orgs-Data'].to_bool
-          ZuoraConnect::ZuoraUser.current_org_id = zuora_org_id
-          ZuoraConnect::ZuoraUser.current_org_child_org_ids = nil
-
-          if zuora_return_nested_orgs_data
-            cached_session = @appinstance.data_lookup(session: session)
-
-            if cached_session['zuora_org_id'] == ZuoraConnect::ZuoraUser.current_org_id &&
-              cached_session.key?('zuora_org_child_org_ids')
-              ZuoraConnect::ZuoraUser.current_org_child_org_ids = cached_session['zuora_org_child_org_ids']
-            else
-              begin
-                zuora_client = @appinstance.target_login.client
-                child_org_list, _ =
-                  zuora_client.rest_call(
-                    url: zuora_client.
-                      rest_endpoint("tenant-registry/listChildOrgsForOrg/#{ZuoraConnect::ZuoraUser.current_org_id}").
-                      gsub('v1/', ''),
-                    session_type: zuora_client.is_a?(ZuoraAPI::Oauth) ? :bearer : :basic,
-                    zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id
-                  )
-              rescue ZuoraAPI::Exceptions::ZuoraAPIError => ex
-                if ex.message.include?('organization does not exist')
-                  raise ZuoraConnect::Exceptions::OrganizationAccessForbidden
-                else
-                  raise
-                end
-              end
-              ZuoraConnect::ZuoraUser.current_org_child_org_ids = child_org_list.map { |org| org['id'] }
-            end
-          end
         end
       end
 
@@ -479,10 +446,6 @@ module ZuoraConnect
 
             #We have no deployed instance for this tenant
             else
-              if ZuoraConnect.configuration.disable_provisioning
-                raise ZuoraConnect::Exceptions::AccessDenied.new("Provisioning is suspended")
-              end
-
               #Ensure user can access oauth creation API
               if !session["ZuoraCurrentUserInfo"]['permissions'].include?("permission.userManagement")
                 Thread.current[:appinstance] = nil
@@ -590,40 +553,6 @@ module ZuoraConnect
               session["appInstance"] = @appinstance.id
             end
 
-            zuora_org_id = cookies['Zuora-Org-Id'] || request.headers['Zuora-Org-Id']
-            zuora_return_nested_orgs_data =
-              cookies['Zuora-Return-Nested-Orgs-Data'].to_bool ||
-                request.headers['Zuora-Return-Nested-Orgs-Data'].to_bool
-            ZuoraConnect::ZuoraUser.current_org_id = zuora_org_id
-            ZuoraConnect::ZuoraUser.current_org_child_org_ids = nil
-
-            if zuora_return_nested_orgs_data
-              cached_session = @appinstance.data_lookup(session: session)
-
-              if cached_session['zuora_org_id'] == ZuoraConnect::ZuoraUser.current_org_id &&
-                cached_session.key?('zuora_org_child_org_ids')
-                ZuoraConnect::ZuoraUser.current_org_child_org_ids = cached_session['zuora_org_child_org_ids']
-              else
-                begin
-                  child_org_list, _ =
-                    zuora_client.rest_call(
-                      url: zuora_client.
-                        rest_endpoint("tenant-registry/listChildOrgsForOrg/#{ZuoraConnect::ZuoraUser.current_org_id}").
-                        gsub('v1/', ''),
-                      session_type: zuora_client.is_a?(ZuoraAPI::Oauth) ? :bearer : :basic,
-                      headers: auth_headers,
-                      zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id
-                    )
-                rescue ZuoraAPI::Exceptions::ZuoraAPIError => ex
-                  if ex.message.include?('organization does not exist')
-                    raise ZuoraConnect::Exceptions::OrganizationAccessForbidden
-                  else
-                    raise
-                  end
-                end
-                ZuoraConnect::ZuoraUser.current_org_child_org_ids = child_org_list.map { |org| org['id'] }
-              end
-            end
           rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
             output_xml, input_xml, response = zuora_client.soap_call(errors: [], z_session: false, zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id) do |xml|
               xml['api'].getUserInfo
@@ -640,17 +569,6 @@ module ZuoraConnect
             redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}&pos=1"
             return
 
-          rescue ZuoraConnect::Exceptions::OrganizationAccessForbidden => ex
-            locals = {
-              title: "You cannot operate with the current organization",
-              message: "Please switch the organization and try again"
-            }
-            respond_to do |format|
-              format.html { render "zuora_connect/static/error_handled", locals: locals, status: 403, layout: false }
-              format.js { render "zuora_connect/static/error_handled", locals: locals, status: 202, layout: false }
-              format.json { render json: {'errors' => ex.message}, status: 403 }
-              format.all { render json: ex.message, status: 403 }
-            end
           rescue ZuoraAPI::Exceptions::ZuoraAPIError, Exception => ex
             if ex.message.include?("Referenced User resource(s) not found") && ex.class == ZuoraAPI::Exceptions::ZuoraAPIError
               locals = {title: "Provisioning Error", message: "New tenants need to be provisioned by API Gateway('#{ex.message}'). Please contact support."}
@@ -661,15 +579,7 @@ module ZuoraConnect
                 zuora_details.merge!({:error => ex.response.body})
               end
               ZuoraConnect.logger.error("UI Authorization Error", ex, zuora: zuora_details)
-
-              respond_to do |format|
-                format.html {
-                  render "zuora_connect/static/error_unhandled", locals: {exception: ex, skip_exception: true}, layout: false, status: 500
-                }
-                format.js {
-                  render "zuora_connect/static/error_unhandled", locals: {exception: ex, skip_exception: true}, layout: false, status: 500
-                }
-              end
+              render "zuora_connect/static/error_unhandled", locals: {exception: ex, skip_exception: true}, layout: false, status: 500
             end
             return
           end
@@ -691,10 +601,6 @@ module ZuoraConnect
           @appinstance = ZuoraConnect::AppInstance.find_by(:id => values["appInstance"].to_i)
 
           if @appinstance.blank?
-            if ZuoraConnect.configuration.disable_provisioning
-              raise ZuoraConnect::Exceptions::AccessDenied.new("Provisioning is suspended")
-            end
-
             Apartment::Tenant.switch!("public")
             begin
               Apartment::Tenant.create(values["appInstance"].to_s)

data/lib/zuora_connect/exceptions.rb

@@ -65,19 +65,5 @@ module ZuoraConnect
         @message || @default_message
       end
     end
-
-
-    class OrganizationAccessForbidden < Error
-      attr_writer :default_message
-
-      def initialize(message = nil)
-        @message = message
-        @default_message = "You are not authorized to access with the current organization."
-      end
-
-      def to_s
-        @message || @default_message
-      end
-    end
   end
 end

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.1.5-g"
+  VERSION = "3.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.5.pre.g
+  version: 3.1.5
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -452,9 +452,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: