From a55b84e6e643e701a239a15cc5d9bc8e3c31ef96 Mon Sep 17 00:00:00 2001 From: emathew Date: Tue, 17 Mar 2026 12:03:56 -0400 Subject: [PATCH 1/5] syntax fixes --- .../registry-user.controller/registry-user.controller.js | 6 +++--- .../registry-user.controller/registry-user.middleware.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/controller/registry-user.controller/registry-user.controller.js b/src/controller/registry-user.controller/registry-user.controller.js index 658a24ed2..c780258fb 100644 --- a/src/controller/registry-user.controller/registry-user.controller.js +++ b/src/controller/registry-user.controller/registry-user.controller.js @@ -196,7 +196,7 @@ async function createUser (req, res, next) { } const responseMessage = { - message: `${body?.user_id} + ' was successfully created.`, + message: `${body?.username} was successfully created.`, created: returnValue } @@ -374,7 +374,7 @@ async function deleteUser (req, res, next) { const payload = { action: 'delete_registry_user', - change: user.user_id + ' was successfully deleted.', + change: user.username + ' was successfully deleted.', req_UUID: req.ctx.uuid, org_UUID: await orgRepo.getOrgUUID(req.ctx.org) } @@ -382,7 +382,7 @@ async function deleteUser (req, res, next) { logger.info(JSON.stringify(payload)) const responseMessage = { - message: user.user_id + ' was successfully deleted.' + message: user.username + ' was successfully deleted.' } return res.status(200).json(responseMessage) diff --git a/src/controller/registry-user.controller/registry-user.middleware.js b/src/controller/registry-user.controller/registry-user.middleware.js index 7f24b2a13..6b30b69e0 100644 --- a/src/controller/registry-user.controller/registry-user.middleware.js +++ b/src/controller/registry-user.controller/registry-user.middleware.js @@ -4,7 +4,7 @@ function parsePostParams (req, res, next) { utils.reqCtxMapping(req, 'body', []) utils.reqCtxMapping(req, 'params', ['identifier']) utils.reqCtxMapping(req, 'query', [ - 'new_user_id', + 'new_username', 'name.first', 'name.last', 'name.middle', 'name.suffix', 'org_affiliations.add', 'org_affiliations.remove', 'cve_program_org_membership.add', 'cve_program_org_membership.remove' From 5d23372eaa8a696c98fb7ca92ac059e3ffc80339 Mon Sep 17 00:00:00 2001 From: emathew Date: Tue, 17 Mar 2026 13:34:36 -0400 Subject: [PATCH 2/5] add 'username' to body parameters --- src/controller/org.controller/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/controller/org.controller/index.js b/src/controller/org.controller/index.js index 1cd686ac5..9ac46ecc1 100644 --- a/src/controller/org.controller/index.js +++ b/src/controller/org.controller/index.js @@ -725,6 +725,7 @@ router.post('/registry/org/:shortname/user', mw.onlySecretariatOrAdmin, mw.onlyOrgWithPartnerRole, param(['shortname']).isString().trim().notEmpty().isLength({ min: CONSTANTS.MIN_SHORTNAME_LENGTH, max: CONSTANTS.MAX_SHORTNAME_LENGTH }), + body(['username']).isString().trim().notEmpty(), body(['org_uuid']).optional().isString().trim(), body(['uuid']).optional().isString().trim(), body(['name.first']).optional().isString().trim().isLength({ max: CONSTANTS.MAX_FIRSTNAME_LENGTH }).withMessage(errorMsgs.FIRSTNAME_LENGTH), @@ -1638,6 +1639,7 @@ router.post('/org/:shortname/user', mw.onlyOrgWithPartnerRole, param(['shortname']).isString().trim().notEmpty().isLength({ min: CONSTANTS.MIN_SHORTNAME_LENGTH, max: CONSTANTS.MAX_SHORTNAME_LENGTH }), query().custom((query) => { return mw.validateQueryParameterNames(query, ['']) }), + body(['username']).isString().trim().notEmpty(), body(['org_uuid']).optional().isString().trim(), body(['uuid']).optional().isString().trim(), body(['name.first']).optional().isString().trim().isLength({ max: CONSTANTS.MAX_FIRSTNAME_LENGTH }).withMessage(errorMsgs.FIRSTNAME_LENGTH), From a3817ec40cf87b8c25956f9c36f4a23afe1b51c6 Mon Sep 17 00:00:00 2001 From: emathew Date: Tue, 17 Mar 2026 13:38:06 -0400 Subject: [PATCH 3/5] undo changes --- src/controller/org.controller/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controller/org.controller/index.js b/src/controller/org.controller/index.js index 9ac46ecc1..0cfcb0417 100644 --- a/src/controller/org.controller/index.js +++ b/src/controller/org.controller/index.js @@ -728,6 +728,7 @@ router.post('/registry/org/:shortname/user', body(['username']).isString().trim().notEmpty(), body(['org_uuid']).optional().isString().trim(), body(['uuid']).optional().isString().trim(), + body(['username']).isString().trim().notEmpty(), body(['name.first']).optional().isString().trim().isLength({ max: CONSTANTS.MAX_FIRSTNAME_LENGTH }).withMessage(errorMsgs.FIRSTNAME_LENGTH), body(['name.last']).optional().isString().trim().isLength({ max: CONSTANTS.MAX_LASTNAME_LENGTH }).withMessage(errorMsgs.LASTNAME_LENGTH), body(['name.middle']).optional().isString().trim().isLength({ max: CONSTANTS.MAX_MIDDLENAME_LENGTH }).withMessage(errorMsgs.MIDDLENAME_LENGTH), From 976393ceb87e01c773890706656854588f2b2bf1 Mon Sep 17 00:00:00 2001 From: emathew Date: Tue, 17 Mar 2026 13:41:51 -0400 Subject: [PATCH 4/5] revert change --- src/controller/org.controller/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/controller/org.controller/index.js b/src/controller/org.controller/index.js index 0cfcb0417..1cd686ac5 100644 --- a/src/controller/org.controller/index.js +++ b/src/controller/org.controller/index.js @@ -725,10 +725,8 @@ router.post('/registry/org/:shortname/user', mw.onlySecretariatOrAdmin, mw.onlyOrgWithPartnerRole, param(['shortname']).isString().trim().notEmpty().isLength({ min: CONSTANTS.MIN_SHORTNAME_LENGTH, max: CONSTANTS.MAX_SHORTNAME_LENGTH }), - body(['username']).isString().trim().notEmpty(), body(['org_uuid']).optional().isString().trim(), body(['uuid']).optional().isString().trim(), - body(['username']).isString().trim().notEmpty(), body(['name.first']).optional().isString().trim().isLength({ max: CONSTANTS.MAX_FIRSTNAME_LENGTH }).withMessage(errorMsgs.FIRSTNAME_LENGTH), body(['name.last']).optional().isString().trim().isLength({ max: CONSTANTS.MAX_LASTNAME_LENGTH }).withMessage(errorMsgs.LASTNAME_LENGTH), body(['name.middle']).optional().isString().trim().isLength({ max: CONSTANTS.MAX_MIDDLENAME_LENGTH }).withMessage(errorMsgs.MIDDLENAME_LENGTH), @@ -1640,7 +1638,6 @@ router.post('/org/:shortname/user', mw.onlyOrgWithPartnerRole, param(['shortname']).isString().trim().notEmpty().isLength({ min: CONSTANTS.MIN_SHORTNAME_LENGTH, max: CONSTANTS.MAX_SHORTNAME_LENGTH }), query().custom((query) => { return mw.validateQueryParameterNames(query, ['']) }), - body(['username']).isString().trim().notEmpty(), body(['org_uuid']).optional().isString().trim(), body(['uuid']).optional().isString().trim(), body(['name.first']).optional().isString().trim().isLength({ max: CONSTANTS.MAX_FIRSTNAME_LENGTH }).withMessage(errorMsgs.FIRSTNAME_LENGTH), From da7d627653611c6ae4b6b93185e9455478c62b2c Mon Sep 17 00:00:00 2001 From: emathew Date: Tue, 17 Mar 2026 14:44:50 -0400 Subject: [PATCH 5/5] fix delete user bugs --- .../registry-user.controller/registry-user.controller.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/controller/registry-user.controller/registry-user.controller.js b/src/controller/registry-user.controller/registry-user.controller.js index c780258fb..3ab1a6de7 100644 --- a/src/controller/registry-user.controller/registry-user.controller.js +++ b/src/controller/registry-user.controller/registry-user.controller.js @@ -368,9 +368,14 @@ async function deleteUser (req, res, next) { const orgRepo = req.ctx.repositories.getBaseOrgRepository() const userUUID = req.ctx.params.identifier - const user = await userRepo.findOneByUUID(userUUID) + const user = await userRepo.findUserByUUID(userUUID) - await userRepo.deleteByUUID(userUUID) + if (!user) { + logger.info({ uuid: req.ctx.uuid, message: 'User DNE' }) + return res.status(404).json(error.userDne(userUUID)) + } + + await userRepo.deleteUserByUUID(userUUID) const payload = { action: 'delete_registry_user',