zuora_connect 3.1.5.pre.g → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf4d387450ce6927d341515534491f97406c5ae7a083aa95733db6f78259fa0e
-  data.tar.gz: b65d9eaf5e74d8cc5ad87fa089504f559454a1aa608b941dafecfc6bccd1e71e
+  metadata.gz: d04a0fdede87007e236c944ed42bfc822846276fce78a310d22bb89961ed6bee
+  data.tar.gz: fe5e370e36988531ff42f08e493a39118a9e0de078e3334df9c1a3c79ad3460f
 SHA512:
-  metadata.gz: 4a4992ccb7dc60276ce8723a97d999b6b046eeba6391c1a080ddda8fd01dbf0e8895ce7194334e3532ba49c996b569d61e3c059fc9ac4529494c570185423a08
-  data.tar.gz: 66d66669ee2189d94c7f548fa5c48ff3a8c8f349655113b808a7676e0b6d5221d482b1d499b3228e9921e75ab1c178061ce66415c74870c57d462feabcfcab89
+  metadata.gz: c8836d2516b37c25dce916ed9f976a5bff9456254378301d7a2d5ca457b6d6fc778eb28a7d73d0c16f27f1adc683c12610f8f5b60461a962abae682a7e8d4a7c
+  data.tar.gz: e8f4bff78c8fd8160f5a681743cdefe108d0b9a8a3e4e1e6c96fc72b9990e13c27800d91e8dc3b23db008425d23d5d7d3c53f1473300f5d817dda38e48998332

data/app/models/zuora_connect/app_instance_base.rb

@@ -519,7 +519,7 @@ module ZuoraConnect
       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)
+          ex.is_a?(OpenSSL::Cipher::CipherError) && ['wrong final block length', 'bad decrypt'].include?(ex.message)
         ) && 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 
@@ -907,12 +907,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/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
 
@@ -260,6 +227,39 @@ module ZuoraConnect
         return (request.headers['ZuoraCurrentEntity'].present? || cookies['ZuoraCurrentEntity'].present?)
       end
 
+      def org_relation_mapping(root_org_relation)
+        relation = {}
+
+        return relation if root_org_relation.blank?
+
+        root_org_id = root_org_relation.dig(0, 'rootOrgId')
+        relation[root_org_id] = []
+
+        root_org_relation.each do |child_org|
+          relation[child_org['id']] = []
+        end
+
+        root_org_relation.each do |child_org|
+          parent_org_id = child_org['parentOrgId']
+          relation[parent_org_id].push(child_org['id'])
+        end
+
+        relation
+      end
+
+      def get_child_orgs_from_relation_mapping(relation_mapping, org_id)
+        if relation_mapping.blank? || org_id.blank? || relation_mapping[org_id].blank?
+          return []
+        end
+
+        child_orgs = relation_mapping[org_id].dup
+        relation_mapping[org_id].each do |child_org_id|
+          child_orgs += get_child_orgs_from_relation_mapping(relation_mapping, child_org_id)
+        end
+
+        child_orgs
+      end
+
       def create_new_instance
         ZuoraConnect::AppInstance.read_master_db do
           Thread.current[:appinstance] = nil
@@ -595,35 +595,53 @@ module ZuoraConnect
               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
+            ZuoraConnect::ZuoraUser.current_org_child_org_ids = []
 
-            if zuora_return_nested_orgs_data
-              cached_session = @appinstance.data_lookup(session: session)
+            if zuora_org_id.present? && zuora_return_nested_orgs_data
+              cached_org_relationship = Redis.current.get("MultiOrgRelationship:#{@appinstance.id}")
 
-              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']
+              if cached_org_relationship.present?
+                cached_org_relationship = JSON.parse(cached_org_relationship)
+                ZuoraConnect::ZuoraUser.current_org_child_org_ids =
+                  get_child_orgs_from_relation_mapping(cached_org_relationship, ZuoraConnect::ZuoraUser.current_org_id)
               else
-                begin
-                  child_org_list, _ =
+                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
+                  )
+
+                root_org_id = (child_org_list || {}).dig(0, 'rootOrgId').to_s
+                if root_org_id.present?
+                  root_child_org_list, _ =
                     zuora_client.rest_call(
                       url: zuora_client.
-                        rest_endpoint("tenant-registry/listChildOrgsForOrg/#{ZuoraConnect::ZuoraUser.current_org_id}").
+                        rest_endpoint("tenant-registry/listChildOrgsForOrg/#{root_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
+
+                  org_relationship = org_relation_mapping(root_child_org_list)
+                  Redis.current.setex(
+                    "MultiOrgRelationship:#{@appinstance.id}",
+                    1.day,
+                    org_relationship.to_json
+                  )
+
+                  ZuoraConnect::ZuoraUser.current_org_child_org_ids =
+                    get_child_orgs_from_relation_mapping(org_relationship, ZuoraConnect::ZuoraUser.current_org_id)
+                else
+                  ZuoraConnect.logger.info("Failed to get root org id for #{@appinstance.id}")
                 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 +658,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."}

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.1.5-g"
+  VERSION = "3.2.0"
 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.2.0
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2022-12-23 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: