Skip to content

fix for 1288 #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rakeshSgr merged 2 commits into from
Feb 29, 2024
Merged

fix for 1288 #434

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbb729d
fix for 1288
priyanka-TL Feb 29, 2024
fd19675
Merge pull request #433 from ELEVATE-Project/issue#1288
rakeshSgr Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion src/services/account.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down