Merge pull request #434 from ELEVATE-Project/develop

fix for 1288

Author: rakeshSgr

src/services/account.js

@@ -895,8 +895,30 @@ module.exports = class AccountHelper {
 			delete user.password
 			delete user.otpInfo
 
+			let defaultOrg = await organizationQueries.findOne(
+				{ code: process.env.DEFAULT_ORGANISATION_CODE },
+				{ attributes: ['id'] }
+			)
+			let defaultOrgId = defaultOrg.id
+			const modelName = await userQueries.getModelName()
+
+			let validationData = await entityTypeQueries.findUserEntityTypesAndEntities({
+				status: 'ACTIVE',
+				organization_id: {
+					[Op.in]: [user.organization_id, defaultOrgId],
+				},
+				model_names: { [Op.contains]: [modelName] },
+			})
+
+			const prunedEntities = removeDefaultOrgEntityTypes(validationData, user.organization_id)
+			user = utils.processDbResponse(user, prunedEntities)
+
 			// Check if user and user.image exist, then fetch a downloadable URL for the image
-			if (user && user.image) user.image = await utils.getDownloadableUrl(user.image)
+			if (user && user.image) {
+				user.image = await utils.getDownloadableUrl(user.image)
+			}
+			user.email = plaintextEmailId
+
 			const result = { access_token: accessToken, refresh_token: refreshToken, user }
 			return responses.successResponse({
 				statusCode: httpStatusCode.ok,