release: v3.3.22 – develop → staging

src/constants/blacklistConfig.js

@@ -299,6 +299,7 @@ const organization = {
 	update: [
 		'id',
 		'org_admin',
+		'code',
 		'tenant_code',
 		'parent_id',
 		'related_orgs',

src/constants/common.js

@@ -102,8 +102,9 @@ module.exports = {
 	READ_ACCESS: 'r',
 	TYPE_ALL: 'all',
 	ENGLISH_LANGUGE_CODE: 'en',
-	ORG_CODE_HEADER: 'organizationcode',
-	TENANT_CODE_HEADER: 'tenantcode',
+	ORG_CODE_HEADER: process.env.ORG_CODE_HEADER_NAME.toLowerCase(),
+	ORG_ID_HEADER: process.env.ORG_ID_HEADER_NAME.toLowerCase(),
+	TENANT_CODE_HEADER: process.env.TENANT_CODE_HEADER_NAME.toLowerCase(),
 	DELETE_METHOD: 'DELETE',
 	SEQUELIZE_FOREIGN_KEY_CONSTRAINT_ERROR: 'SequelizeForeignKeyConstraintError',
 	BULK_INVITATION_VALIDITY: '604800000', //SET to one week by default if not set by tenant (In Sec),

src/controllers/v1/admin.js

@@ -110,7 +110,7 @@ module.exports = class Admin {
 				req.body.organization_id,
 				req.decodedToken.id,
 				req.body?.identifier,
-				req.headers?.['tenant-id'],
+				req.headers?.[common.TENANT_CODE_HEADER],
 				req.body?.phone_code
 			)
 			return orgAdminCreation
@@ -154,7 +154,7 @@ module.exports = class Admin {
 
 			const result = await adminService.deactivateOrg(
 				req.params.id,
-				req.headers?.['tenant-id'],
+				req.headers?.[common.TENANT_CODE_HEADER],
 				req.decodedToken.id
 			)
 			return result
@@ -196,6 +196,36 @@ module.exports = class Admin {
 		}
 	}
 
+	/**
+	 * Execute raw SELECT query with pagination
+	 * @method
+	 * @name executeRawQuery
+	 * @param {Object} req - Request object containing query in body and pagination params
+	 * @param {String} req.body.query - Raw SQL SELECT query
+	 * @param {Number} req.pageNo - Page number
+	 * @param {Number} req.pageSize - Page size limit
+	 * @returns {JSON} - Paginated query results
+	 */
+	async executeRawQuery(req) {
+		try {
+			if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, common.ADMIN_ROLE)) {
+				throw responses.failureResponse({
+					message: 'USER_IS_NOT_A_ADMIN',
+					statusCode: httpStatusCode.bad_request,
+					responseCode: 'CLIENT_ERROR',
+				})
+			}
+
+			const { query } = req.body
+
+			const pageNo = req.pageNo
+			const pageSize = req.pageSize
+
+			return await adminService.executeRawQuery(query, req.decodedToken.id, pageNo, pageSize)
+		} catch (error) {
+			return error
+		}
+	}
 	async triggerViewRebuild(req) {
 		try {
 			if (!req.decodedToken.roles.some((role) => role.title === common.ADMIN_ROLE)) {

src/controllers/v1/form.js

@@ -7,6 +7,7 @@
 
 // Dependencies
 const formsService = require('@services/form')
+const common = require('@constants/common')
 
 module.exports = class Form {
 	/**
@@ -100,7 +101,7 @@ module.exports = class Form {
 					req.params.id,
 					params,
 					req?.decodedToken?.organization_id || null,
-					req?.decodedToken?.tenant_code || req?.headers?.tenant_code || null,
+					req?.decodedToken?.tenant_code || req?.headers?.[common.TENANT_CODE_HEADER] || null,
 					domain
 				)
 				return form

src/controllers/v1/public.js

@@ -1,10 +1,11 @@
 const publicService = require('@services/public')
 const { getDomainFromRequest } = require('@utils/domain')
+const common = require('@constants/common')
 
 module.exports = class Public {
 	async branding(req) {
 		let domain = ''
-		let tenantCode = req?.headers?.tenantid || null
+		let tenantCode = req?.headers?.[common.TENANT_CODE_HEADER] || null
 		if (!tenantCode) {
 			domain = getDomainFromRequest(req)
 		}

src/controllers/v1/tenant.js

@@ -146,8 +146,8 @@ module.exports = class Tenant {
 			const tenant = await tenantService.userBulkUpload(
 				req.body.file_path,
 				req.decodedToken.id,
-				req.headers.organization,
-				req.headers.tenant,
+				req.headers?.[common.ORG_CODE_HEADER],
+				req.headers?.[common.TENANT_CODE_HEADER],
 				req?.body?.editable_fields,
 				req?.body?.upload_type.toUpperCase()
 			)

src/database/queries/tenants.js

@@ -67,6 +67,7 @@ exports.update = async (filter, updatedata) => {
 		return await Tenant.update(updatedata, {
 			where: filter,
 			returning: true,
+			raw: true,
 		})
 	} catch (error) {
 		throw error

src/distributionColumns.sql

@@ -19,6 +19,7 @@ SELECT create_distributed_table('user_sessions', 'tenant_code');
 -- Organization-related tables
 SELECT create_distributed_table('organization_email_domains', 'tenant_code');
 SELECT create_distributed_table('organization_features', 'tenant_code');
+SELECT create_distributed_table('organization_registration_codes', 'tenant_code');
 
 -- Invitation / user-related
 SELECT create_distributed_table('invitations','tenant_code');

src/dtos/organizationDTO.js

@@ -11,29 +11,20 @@ class organizationDTO {
 		}
 	}
 
-	static eventBodyDTO({ entity, eventType, entityId, changedValues = [], args = {} }) {
+	static eventBodyDTO({ entity, eventType, entityId, oldValues, newValues, args = {} }) {
 		try {
 			if (!entity || !eventType || !entityId)
 				throw new Error('Entity, EventType & EntityId values are mandatory for an Event')
 
 			const disallowedArgs = ['deleted_at']
+			disallowedArgs.forEach((key) => delete args[key])
 
-			disallowedArgs.forEach((key) => {
-				delete args[key]
-			})
-
-			const changes = changedValues.reduce((result, obj) => {
-				const { fieldName, oldValue, newValue } = obj
-				if (!result[fieldName]) result[fieldName] = {}
-				if (oldValue) result[fieldName].oldValue = oldValue
-				if (newValue) result[fieldName].newValue = newValue
-				return result
-			}, {})
 			return {
 				entity,
 				eventType,
 				entityId,
-				changes,
+				...(oldValues ? { oldValues } : {}),
+				...(newValues ? { newValues } : {}),
 				...args,
 			}
 		} catch (error) {

src/dtos/tenantDTO.js

@@ -20,7 +20,7 @@ class TenantResponseDTO {
 		}
 	}
 
-	static eventBodyDTO({ entity, eventType, entityId, changedValues = [], args = {} }) {
+	static eventBodyDTO({ entity, eventType, entityId, oldValues, newValues, args = {} }) {
 		try {
 			if (!entity || !eventType || !entityId)
 				throw new Error('Entity, EventType & EntityId values are mandatory for an Event')
@@ -31,18 +31,12 @@ class TenantResponseDTO {
 				delete args[key]
 			})
 
-			const changes = changedValues.reduce((result, obj) => {
-				const { fieldName, oldValue, newValue } = obj
-				if (!result[fieldName]) result[fieldName] = {}
-				if (oldValue) result[fieldName].oldValue = oldValue
-				if (newValue) result[fieldName].newValue = newValue
-				return result
-			}, {})
 			return {
 				entity,
 				eventType,
 				entityId,
-				changes,
+				...(oldValues ? { oldValues } : {}),
+				...(newValues ? { newValues } : {}),
 				...args,
 			}
 		} catch (error) {

src/dtos/userDTO.js

@@ -77,7 +77,8 @@ class UserDTO {
 		]
 		return input.filter((key) => !restrictedKeys.includes(key))
 	}
-	static eventBodyDTO({ entity, eventType, entityId, changedValues = [], args = {} }) {
+
+	static eventBodyDTO({ entity, eventType, entityId, oldValues = {}, newValues = {}, args = {} }) {
 		try {
 			if (!entity || !eventType || !entityId)
 				throw new Error('Entity, EventType & EntityId values are mandatory for an Event')
@@ -91,23 +92,20 @@ class UserDTO {
 				'custom_entity_text',
 			]
 
-			disallowedArgs.forEach((key) => {
-				delete args[key]
-			})
+			const sanitize = (obj) => {
+				if (obj && typeof obj === 'object') {
+					disallowedArgs.forEach((key) => delete obj[key])
+				}
+				return obj
+			}
 
-			const changes = changedValues.reduce((result, obj) => {
-				const { fieldName, oldValue, newValue } = obj
-				if (!result[fieldName]) result[fieldName] = {}
-				if (oldValue) result[fieldName].oldValue = oldValue
-				if (newValue) result[fieldName].newValue = newValue
-				return result
-			}, {})
 			return {
 				entity,
 				eventType,
 				entityId,
-				changes,
-				...args,
+				...(Object.keys(sanitize(oldValues)).length ? { oldValues } : {}),
+				...(Object.keys(sanitize(newValues)).length ? { newValues } : {}),
+				...sanitize(args),
 			}
 		} catch (error) {
 			console.error(error)

src/envVariables.js

@@ -458,6 +458,21 @@ let enviromentVariables = {
 			value: 'true',
 		},
 	},
+	ORG_ID_HEADER_NAME: {
+		message: 'Required ORG_ID_HEADER_NAME',
+		optional: true,
+		default: 'x-org-id',
+	},
+	ORG_CODE_HEADER_NAME: {
+		message: 'Required ORG_CODE_HEADER_NAME',
+		optional: true,
+		default: 'x-org-code',
+	},
+	TENANT_CODE_HEADER_NAME: {
+		message: 'Required TENANT_CODE_HEADER_NAME',
+		optional: true,
+		default: 'x-tenant-code',
+	},
 }
 let success = true
 

src/generics/utils.js

@@ -1112,6 +1112,29 @@ function extractUpdatedValues(oldData = {}, newData = {}, updateData = {}) {
 	return changes
 }
 
+function flattenLeafPaths(obj, prefix = '') {
+	const out = []
+	for (const [k, v] of Object.entries(obj || {})) {
+		const path = prefix ? `${prefix}.${k}` : k
+		if (v && typeof v === 'object' && !Array.isArray(v)) out.push(...flattenLeafPaths(v, path))
+		else out.push(path)
+	}
+	return out
+}
+
+function extractDelta(oldData = {}, newData = {}, updateData) {
+	const delta = {}
+	const paths =
+		updateData && Object.keys(updateData).length ? flattenLeafPaths(updateData) : flattenLeafPaths(newData) // fallback to full compare
+
+	for (const p of paths) {
+		const oldVal = _.get(oldData, p)
+		const newVal = _.get(newData, p)
+		if (!_.isEqual(oldVal, newVal)) _.set(delta, p, newVal)
+	}
+	return delta
+}
+
 module.exports = {
 	generateToken,
 	hashPassword,
@@ -1159,4 +1182,5 @@ module.exports = {
 	appendParamsToUrl,
 	parseMetaData,
 	extractUpdatedValues,
+	extractDelta,
 }

src/helpers/eventBroadcasterMain.js

@@ -1,6 +1,7 @@
 'use strict'
 const requester = require('@utils/requester')
 const kafkaCommunication = require('@generics/kafka-communication')
+const util = require('util')
 
 const getEndpoints = (eventGroup) => {
 	switch (eventGroup) {
@@ -86,6 +87,9 @@ exports.eventBroadcasterKafka = async (eventGroup, { requestBody }) => {
 }
 exports.broadcastEvent = async (eventGroup, { requestBody, headers = {}, isInternal = true }) => {
 	try {
+		//TODO: Remove this log after testing
+		console.log(util.inspect(requestBody, { depth: null, colors: true, compact: false }))
+
 		// Fire both broadcaster functions concurrently
 		const broadcastPromises = [
 			exports.eventBroadcasterMain(eventGroup, { requestBody, headers, isInternal }),

src/locales/en.json

@@ -182,5 +182,15 @@
 	"REG_CODE_ERROR": "registration_code is not valid or unique.",
 	"INVALID_REG_CODE_ERROR": "registration_codes {{errorMessage}}. Invalid Code(s) : {{errorValues}}",
 	"UNIQUE_CONSTRAINT_ERROR": "{{fields}} is Invalid.",
-	"USER_PROFILE_FETCHED_SUCCESSFULLY": "User profile fetched successfully!"
+	"USER_PROFILE_FETCHED_SUCCESSFULLY": "User profile fetched successfully!",
+	"QUERY_EXECUTED_SUCCESSFULLY": "Raw query executed successfully!",
+	"INVALID_QUERY_INPUT": "Invalid query input provided.",
+	"ONLY_SELECT_QUERIES_ALLOWED": "Only SELECT queries are allowed.",
+	"QUERY_EXECUTION_FAILED": "Failed to execute query.",
+	"QUERY_INVALID_OR_UNBALANCED_QUOTES": "Query contains unbalanced or invalid quotes.",
+	"QUERY_FORBIDDEN_INJECTION_PATTERNS": "Query contains forbidden injection patterns.",
+	"QUERY_FORBIDDEN_PATTERNS": "Query contains forbidden SQL operations.",
+	"ADD_ORG_HEADER": "Please provide all required organization headers: {{orgCodeHeader}}, and {{tenantCodeHeader}} for admin override.",
+	"INVALID_ORG_ID": "Organization ID must be a valid positive integer.",
+	"INVALID_ORG_OR_TENANT_CODE": "The provided organization or tenant code is invalid or does not match."
 }