Skip to content

Resolves #1507 - Fixing tests and update user bug fixes #1512

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

Closed
wants to merge 1 commit into from
+351 −52
Closed

Resolves #1507 - Fixing tests and update user bug fixes #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 39 additions & 39 deletions src/controller/org.controller/org.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,19 @@ async function updateUser (req, res, next) {
return res.status(404).json(error.orgDnePathParam(shortNameParams))
}

if (shortNameParams !== requesterShortName && !isRequesterSecretariat) {
logger.info({ uuid: req.ctx.uuid, message: `${shortNameParams} organization data can only be modified by users of the same organization or the Secretariat.` })
await session.abortTransaction()
return res.status(403).json(error.notSameOrgOrSecretariat())
}

// Specific check for org_short_name (Secretariat only)
if (queryParametersJson.org_short_name && !isRequesterSecretariat) {
logger.info({ uuid: req.ctx.uuid, message: 'Only Secretariat can reassign user organization.' })
await session.abortTransaction()
return res.status(403).json(error.notAllowedToChangeOrganization())
}

if (!isRequesterSecretariat && !isAdmin) {
if (targetUserUUID !== requesterUUID) {
if (!targetUserUUID) {
Expand All @@ -565,29 +578,41 @@ async function updateUser (req, res, next) {
}
}

if (!targetUserUUID) {
logger.info({ uuid: req.ctx.uuid, message: 'User DNE' })
await session.abortTransaction()
return res.status(404).json(error.userDne(usernameParams))
const newOrgShortNameToMoveTo = queryParametersJson.org_short_name

if (newOrgShortNameToMoveTo) {
if (newOrgShortNameToMoveTo === shortNameParams) {
logger.info({ uuid: req.ctx.uuid, message: `User ${usernameParams} is already in organization ${newOrgShortNameToMoveTo}.` })
await session.abortTransaction()
return res.status(403).json(error.alreadyInOrg(newOrgShortNameToMoveTo, usernameParams))
}

const newTargetRegistryOrgUUID = await orgRepo.getOrgUUID(newOrgShortNameToMoveTo, { session })

if (!newTargetRegistryOrgUUID) {
logger.info({ uuid: req.ctx.uuid, message: `New target organization ${newOrgShortNameToMoveTo} does not exist.` })
await session.abortTransaction()
return res.status(404).json(error.orgDne(newOrgShortNameToMoveTo, 'org_short_name', 'query'))
}
}

if (shortNameParams !== requesterShortName && !isRequesterSecretariat) {
logger.info({ uuid: req.ctx.uuid, message: `${shortNameParams} organization data can only be modified by users of the same organization or the Secretariat.` })
await session.abortTransaction()
return res.status(403).json(error.notSameOrgOrSecretariat())
if (queryParametersJson.active) {
if (requesterUUID === targetUserUUID) {
await session.abortTransaction()
return res.status(403).json(error.notOrgAdminOrSecretariatUpdate())
}
}

if (await userRepo.orgHasUser(shortNameParams, targetUserUUID, { session })) {
logger.info({ uuid: req.ctx.uuid, message: `User ${usernameParams} does not exist for ${shortNameParams} organization.` })
if (!targetUserUUID) {
logger.info({ uuid: req.ctx.uuid, message: 'User DNE' })
await session.abortTransaction()
return res.status(404).json(error.userDne(usernameParams))
}

// Specific check for org_short_name (Secretariat only)
if (queryParametersJson.org_short_name && !isRequesterSecretariat) {
logger.info({ uuid: req.ctx.uuid, message: 'Only Secretariat can reassign user organization.' })
if (!await userRepo.orgHasUserByUUID(shortNameParams, targetUserUUID, { session })) {
logger.info({ uuid: req.ctx.uuid, message: `User ${usernameParams} does not exist for ${shortNameParams} organization.` })
await session.abortTransaction()
return res.status(403).json(error.notAllowedToChangeOrganization())
return res.status(404).json(error.userDne(usernameParams))
}

// General permission check for fields requiring admin/secretariat
Expand All @@ -609,13 +634,6 @@ async function updateUser (req, res, next) {
}
}

if (queryParametersJson.active) {
if (requesterUUID === targetUserUUID) {
await session.abortTransaction()
return res.status(403).json(error.notOrgAdminOrSecretariatUpdate())
}
}

// This is a special case, and needs to be handled in the controller, and not in the repository
const rolesFromQuery = queryParametersJson['active_roles.remove'] ?? []
const removeRolesCollector = []
Expand All @@ -633,24 +651,6 @@ async function updateUser (req, res, next) {
}
}

const newOrgShortNameToMoveTo = queryParametersJson.org_short_name

if (newOrgShortNameToMoveTo) {
if (newOrgShortNameToMoveTo === shortNameParams) {
logger.info({ uuid: req.ctx.uuid, message: `User ${usernameParams} is already in organization ${newOrgShortNameToMoveTo}.` })
await session.abortTransaction()
return res.status(403).json(error.alreadyInOrg(newOrgShortNameToMoveTo, usernameParams))
}

const newTargetRegistryOrgUUID = await orgRepo.getOrgUUID(newOrgShortNameToMoveTo, { session })

if (!newTargetRegistryOrgUUID) {
logger.info({ uuid: req.ctx.uuid, message: `New target organization ${newOrgShortNameToMoveTo} does not exist.` })
await session.abortTransaction()
return res.status(404).json(error.orgDne(newOrgShortNameToMoveTo, 'org_short_name', 'query'))
}
}

const payload = await userRepo.updateUser(usernameParams, shortNameParams, queryParametersJson, { session })
await session.commitTransaction()
return res.status(200).json({ message: `${usernameParams} was successfully updated.`, updated: payload })
Expand Down
10 changes: 10 additions & 0 deletions src/repositories/baseUserRepository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@ class BaseUserRepository extends BaseRepository {
}

// Check if an org has a user by username
async orgHasUserByUUID (orgShortName, uuid, options = {}, isLegacyObject = false) {
const org = await BaseOrgModel.findOne({ short_name: orgShortName }, null, options)
if (!org || !Array.isArray(org.users)) {
return false
}

// 4. Check if any UUID is present in org.users
return org.users.includes(uuid)
}

async orgHasUser (orgShortName, username, options = {}, isLegacyObject = false) {
// 1. Find all users with this username
const users = await BaseUser.find({ username }, null, options)
Expand Down
Loading
Loading