zuora_connect 3.2.2 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcc9097dca797e7574ab64d1d168f9c97503bec9575a312ab82a36dbc57bf60c
-  data.tar.gz: 56b303735ab06d5ae0e04a5c065039f4bda146782d6d9cca7f8b9e393f1758eb
+  metadata.gz: 616f15048a650618223bf57d362d0284f50a0d66b36228940a684ca364432dfb
+  data.tar.gz: 702b6927ff3a14059378ee64be74f7cb8403cb6794d688a76f0d9aea03da32b6
 SHA512:
-  metadata.gz: 2b3ec3561a78b529378a1ed8946ed7445d63542e21bc3ef734959d2b41638855c5f052b4b57de70eac3f14ec5226f0e137135fcd986add16524b79fb7990d811
-  data.tar.gz: 515298d976b032e723a9bbdc59a6d17a457e718354a9a2f8a7e4c114df4371dcb6e2e15d21fc422bdf3351f5eced0612973f284fa7d0597bdf1c4b620136b430
+  metadata.gz: 8ae3fc967fa600378ff3d40df0515fe781fc1c3e6fab1598581eca49d123903f2e91f944dc6db64294350b3a73674ca42912e45aa78bbe70bd83f326ea815005
+  data.tar.gz: 37549efe15ebef568920fa4b8923d0f2106486b5beffbe7a3e04ebbda3dea2ff358e656d7fee5e9771efac4e3ac6c79ef79d73a64e2682d054cddf536f2aa7a5

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

@@ -20,6 +20,8 @@ module ZuoraConnect
 
       @appinstance = ZuoraConnect::AppInstance.find_by(id: app_instance_id)
       ZuoraConnect::ZuoraUser.current_user_id = 0
+      zuora_org_ids = cookies['Zuora-Org-Ids'] || request.headers['Zuora-Org-Ids']
+      ZuoraConnect::ZuoraUser.current_org_ids = zuora_org_ids.split('|') if zuora_org_ids
       if @appinstance.blank?
         Apartment::Tenant.switch!('public')
         begin

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, :current_org_ids
 
     # zuora_user_id/zuora_entity_id both come from cookie or headers
     # zuora_current_identity comes from session

data/app/views/sql/refresh_aggregate_table.txt

@@ -67,17 +67,18 @@ BEGIN
     -- Finally, we'll select everything from this schema's target table, plus the schema's name,
     -- and insert them into our new aggregate table
     EXECUTE format(
-      'SELECT string_agg(column_name, '','') from information_schema.columns where table_name = ''%s'' AND table_schema = ''%s''',  
+      'SELECT string_agg(column_name, '','' order by column_name) from information_schema.columns where table_name = ''%s'' AND table_schema = ''%s''',  
       table_name, schema.nspname
     ) into fields_order;
     
     raise notice 'Importing Schema %', schema.nspname;
 
     EXECUTE format(        
-      'INSERT INTO "public".%I (schema_name, %s) (SELECT ''%s'' AS schema_name, * FROM %I.%I  %s )',
+      'INSERT INTO "public".%I (schema_name, %s) (SELECT ''%s'' AS schema_name, %s FROM %I.%I  %s )',
       aggregate_table_name,
       fields_order,
       schema.nspname,
+      fields_order,
       schema.nspname, table_name, 
       filter
     );

data/lib/zuora_connect/controllers/helpers.rb

@@ -66,62 +66,9 @@ module ZuoraConnect
           end
 
           @zuora_user = ZuoraConnect::ZuoraUser.find_by(zuora_user_id: ZuoraConnect::ZuoraUser.current_user_id)
+          zuora_org_ids = request.headers["Zuora-Org-Ids"]
+          ZuoraConnect::ZuoraUser.current_org_ids = zuora_org_ids.split('|') if zuora_org_ids
 
-          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 = []
-
-          if zuora_org_id.present? && zuora_return_nested_orgs_data
-            cached_org_relationship = Redis.current.get("MultiOrgRelationship:#{@appinstance.id}")
-
-            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
-                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
-                  )
-
-                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/#{root_org_id}").
-                        gsub('v1/', ''),
-                      session_type: zuora_client.is_a?(ZuoraAPI::Oauth) ? :bearer : :basic,
-                      zuora_track_id: ZuoraConnect::RequestIdMiddleware.zuora_request_id
-                    )
-
-                  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
-              rescue ZuoraAPI::Exceptions::ZuoraAPIError => ex
-                  render json: {
-                    status: 401,
-                    message: ex.message
-                  }.to_json, status: :unauthorized
-              end
-            end
-          end
         end
       end
 
@@ -282,40 +229,6 @@ module ZuoraConnect
       def hallway_integration?
         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
@@ -646,57 +559,8 @@ 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 = []
-
-            if zuora_org_id.present? && zuora_return_nested_orgs_data
-              cached_org_relationship = Redis.current.get("MultiOrgRelationship:#{@appinstance.id}")
-
-              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
-                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/#{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
-                    )
-
-                  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
-              end
-            end
+            zuora_org_ids = cookies['Zuora-Org-Ids'] || request.headers['Zuora-Org-Ids']
+            ZuoraConnect::ZuoraUser.current_org_ids = zuora_org_ids.split('|') if zuora_org_ids
 
           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|

data/lib/zuora_connect/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.4
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment