zuora_connect 3.1.5.pre.f → 3.1.5.pre.g

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7cf44ea03e56588c25363d7b5936a80d017a14cf2066b5c8c67cbadc9d0a9b5
-  data.tar.gz: a6b4fdae9c657e6e9419121cb6e60bb51a9964e62ee8b86c095eec8720b851ac
+  metadata.gz: bf4d387450ce6927d341515534491f97406c5ae7a083aa95733db6f78259fa0e
+  data.tar.gz: b65d9eaf5e74d8cc5ad87fa089504f559454a1aa608b941dafecfc6bccd1e71e
 SHA512:
-  metadata.gz: 75dbdbb95811a32409b4ec3e77add0cb179db9077186f24aab672c616ae4d10bbb973af80e30a0de6b765ebec13f0e796faeb1ec7ee8b33f9c1c72a5dd0d46cf
-  data.tar.gz: c0abe51457a0b1792a7a378002c18fac16c7e674dbf3fc6bd4d5e4826a4edc637fa02a81f59a47639d804bed0eff8d9c750462fd60838f8658472389a068e07a
+  metadata.gz: 4a4992ccb7dc60276ce8723a97d999b6b046eeba6391c1a080ddda8fd01dbf0e8895ce7194334e3532ba49c996b569d61e3c059fc9ac4529494c570185423a08
+  data.tar.gz: 66d66669ee2189d94c7f548fa5c48ff3a8c8f349655113b808a7676e0b6d5221d482b1d499b3228e9921e75ab1c178061ce66415c74870c57d462feabcfcab89

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,4 +1,5 @@
 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]
@@ -124,7 +125,7 @@ module ZuoraConnect
 
     def instance_drop
       host = request.headers.fetch("HOST", nil)
-      if host.present? && ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(host)
+      if host.present? && (ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(host) || host =~ Resolv::IPv4::Regex)
         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

@@ -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,6 +907,12 @@ 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
+    cattr_accessor :current_user_id, :current_org_id, :current_org_child_org_ids
 
     # zuora_user_id/zuora_entity_id both come from cookie or headers
     # zuora_current_identity comes from session

data/lib/zuora_connect/controllers/helpers.rb

@@ -21,7 +21,6 @@ module ZuoraConnect
           end
 
           ZuoraConnect::ZuoraUser.current_user_id = request.headers["Zuora-User-Id"]
-          ZuoraConnect::ZuoraUser.current_org_id = request.headers["Zuora-Org-Id"]
 
           if request.headers["API-Token"].present?
             @appinstance = ZuoraConnect::AppInstance.find_by(:api_token => request.headers["API-Token"])
@@ -67,6 +66,39 @@ 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
 
@@ -417,8 +449,6 @@ module ZuoraConnect
             end
 
             zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId'] || request.headers["Zuora-User-Id"]
-            zuora_org_id = cookies['Zuora-Org-Id'] || request.headers['Zuora-Org-Id']
-            ZuoraConnect::ZuoraUser.current_org_id = zuora_org_id
 
             if appinstances.size == 1
               ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
@@ -560,6 +590,40 @@ 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
@@ -576,6 +640,17 @@ 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/exceptions.rb

@@ -72,7 +72,7 @@ module ZuoraConnect
 
       def initialize(message = nil)
         @message = message
-        @default_message = "You are not authorized to access this page with the current organization."
+        @default_message = "You are not authorized to access with the current organization."
       end
 
       def to_s

data/lib/zuora_connect/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.5.pre.f
+  version: 3.1.5.pre.g
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment