From 98d7a8adfd5f65301d1964f91368b4dd52d079f3 Mon Sep 17 00:00:00 2001 From: PraveenDass Date: Mon, 24 Nov 2025 20:48:58 +0530 Subject: [PATCH 1/2] scp_changes_fortenantDetails --- generics/services/users.js | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/generics/services/users.js b/generics/services/users.js index a41a16ae..30f87b20 100644 --- a/generics/services/users.js +++ b/generics/services/users.js @@ -390,32 +390,15 @@ const getOrgDetails = function (organisationIdentifier, tenantId) { const fetchTenantDetails = function (tenantId, userToken = '', aggregateValidOrgs = false) { return new Promise(async (resolve, reject) => { try { - let url, headers - - if (userToken) { - // External request - url = - interfaceServiceUrl + - process.env.USER_SERVICE_BASE_URL + - CONSTANTS.endpoints.TENANT_READ + - '/' + - tenantId - headers = { - 'content-type': 'application/json', - 'X-auth-token': userToken, - } - } else { - // Internal request - url = - interfaceServiceUrl + - process.env.USER_SERVICE_BASE_URL + - CONSTANTS.endpoints.TENANT_READ_INTERNAL + - '/' + - tenantId - headers = { - 'content-type': 'application/json', - internal_access_token: process.env.INTERNAL_ACCESS_TOKEN, - } + let url = + interfaceServiceUrl + + process.env.USER_SERVICE_BASE_URL + + CONSTANTS.endpoints.TENANT_READ_INTERNAL + + '/' + + tenantId + let headers = { + 'content-type': 'application/json', + internal_access_token: process.env.INTERNAL_ACCESS_TOKEN, } const options = { headers } From 27d6a60d47cfd67edc476259515c8e38107f5840 Mon Sep 17 00:00:00 2001 From: PraveenDass Date: Fri, 28 Nov 2025 00:16:53 +0530 Subject: [PATCH 2/2] tenant changes --- generics/helpers/programSolutionUtilities.js | 4 ++-- generics/helpers/solutionAndProjectTemplateUtils.js | 6 +----- generics/middleware/authenticator.js | 2 +- generics/services/users.js | 2 +- module/programs/helper.js | 6 +----- module/solutions/helper.js | 2 +- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/generics/helpers/programSolutionUtilities.js b/generics/helpers/programSolutionUtilities.js index 60ff2b32..85df8047 100644 --- a/generics/helpers/programSolutionUtilities.js +++ b/generics/helpers/programSolutionUtilities.js @@ -29,7 +29,7 @@ function getUpdateObjectTOAddScope(bodyData, tenantId, orgId, userDetails) { // Check if user is Admin or Tenant Admin if (UTILS.validateRoles(userDetails.userInformation.roles, adminTenantAdminRole)) { // Fetch tenant details to validate organization codes - tenantDetails = await userService.fetchTenantDetails(tenantId, userDetails.userToken) + tenantDetails = await userService.fetchTenantDetails(tenantId) if (!tenantDetails?.success || !tenantDetails?.data?.meta) { throw { message: CONSTANTS.apiResponses.FAILED_TO_FETCH_TENANT_DETAILS, @@ -166,7 +166,7 @@ function getUpdateObjectToRemoveScope(currentScope, bodyData, tenantId, userDeta let tenantDetails if (UTILS.validateRoles(userDetails.userInformation.roles, adminTenantAdminRole)) { // Fetch tenant meta details if user is admin/tenant admin - tenantDetails = await userService.fetchTenantDetails(tenantId, userDetails.userToken) + tenantDetails = await userService.fetchTenantDetails(tenantId) if (!tenantDetails?.success || !tenantDetails?.data?.meta) { throw { message: CONSTANTS.apiResponses.FAILED_TO_FETCH_TENANT_DETAILS, diff --git a/generics/helpers/solutionAndProjectTemplateUtils.js b/generics/helpers/solutionAndProjectTemplateUtils.js index 5d1f4608..bc4f13d0 100644 --- a/generics/helpers/solutionAndProjectTemplateUtils.js +++ b/generics/helpers/solutionAndProjectTemplateUtils.js @@ -328,11 +328,7 @@ function setScope(solutionId, scopeData, userDetails) { userDetails.userInformation.roles.includes(CONSTANTS.common.ADMIN_ROLE) ) { // call user-service to fetch related orgs - let validOrgs = await userService.fetchTenantDetails( - userDetails.tenantAndOrgInfo.tenantId, - userDetails.userToken, - true - ) + let validOrgs = await userService.fetchTenantDetails(userDetails.tenantAndOrgInfo.tenantId, true) if (!validOrgs.success) { throw { success: false, diff --git a/generics/middleware/authenticator.js b/generics/middleware/authenticator.js index 8b05523a..53883e00 100644 --- a/generics/middleware/authenticator.js +++ b/generics/middleware/authenticator.js @@ -369,7 +369,7 @@ module.exports = async function (req, res, next, token = '') { */ async function validateIfOrgsBelongsToTenant(tenantId, orgId, token) { let orgIdArr = Array.isArray(orgId) ? orgId : typeof orgId === 'string' ? orgId.split(',') : [] - let orgDetails = await userService.fetchTenantDetails(tenantId, token) + let orgDetails = await userService.fetchTenantDetails(tenantId) let validOrgIds = null if ( diff --git a/generics/services/users.js b/generics/services/users.js index 30f87b20..99bb3a4a 100644 --- a/generics/services/users.js +++ b/generics/services/users.js @@ -387,7 +387,7 @@ const getOrgDetails = function (organisationIdentifier, tenantId) { * @returns {Promise} A promise that resolves with the organization details or rejects with an error. */ -const fetchTenantDetails = function (tenantId, userToken = '', aggregateValidOrgs = false) { +const fetchTenantDetails = function (tenantId, aggregateValidOrgs = false) { return new Promise(async (resolve, reject) => { try { let url = diff --git a/module/programs/helper.js b/module/programs/helper.js index 30d53b02..56b244d9 100644 --- a/module/programs/helper.js +++ b/module/programs/helper.js @@ -47,11 +47,7 @@ module.exports = class ProgramsHelper { userDetails.userInformation.roles.includes(CONSTANTS.common.ADMIN_ROLE) ) { // call user-service to fetch related orgs - let validOrgs = await userService.fetchTenantDetails( - userDetails.tenantAndOrgInfo.tenantId, - userDetails.userToken, - true - ) + let validOrgs = await userService.fetchTenantDetails(userDetails.tenantAndOrgInfo.tenantId, true) if (!validOrgs.success) { throw { success: false, diff --git a/module/solutions/helper.js b/module/solutions/helper.js index a215a7be..a1730cae 100644 --- a/module/solutions/helper.js +++ b/module/solutions/helper.js @@ -1354,7 +1354,7 @@ module.exports = class SolutionsHelper { } // fetch tenant domain by calling tenant details API - let tenantDetailsResponse = await userService.fetchTenantDetails(solution.tenantId, token) + let tenantDetailsResponse = await userService.fetchTenantDetails(solution.tenantId) const domains = tenantDetailsResponse?.data?.domains || [] // Error handling if API failed or no domains found