From 1829a8f8808619e497c88caf9c05df9e52df37c4 Mon Sep 17 00:00:00 2001 From: Chris Berger Date: Wed, 25 Feb 2026 13:05:23 -0500 Subject: [PATCH 1/5] Fixed order of arguments in isAdmin util functions --- src/utils/utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/utils.js b/src/utils/utils.js index 3ef47e2a9..355f5178e 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -125,7 +125,7 @@ async function isAdmin (requesterUsername, requesterShortName, isRegistry = fals if (user) { if (isRegistry) { - result = baseUserRepository.isAdmin(requesterShortName, requesterUsername, options) + result = baseUserRepository.isAdmin(requesterUsername, requesterShortName, options) } else { result = user.authority.active_roles.includes(CONSTANTS.USER_ROLE_ENUM.ADMIN) } @@ -147,7 +147,7 @@ async function isAdminUUID (requesterUsername, requesterOrgUUID, isRegistry = fa if (user && orgObject) { if (isRegistry) { - result = baseUserRepository.isAdmin(orgObject.short_name, requesterUsername, options) + result = baseUserRepository.isAdmin(requesterUsername, orgObject.short_name, options) } else { result = user.authority.active_roles.includes(CONSTANTS.USER_ROLE_ENUM.ADMIN) } From 3d0e6e7f7b4e15d83d5e035a5020a842217e119e Mon Sep 17 00:00:00 2001 From: Chris Berger Date: Wed, 25 Feb 2026 13:08:59 -0500 Subject: [PATCH 2/5] Fixed incorrect legacy to registry conversion --- src/repositories/baseUserRepository.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/repositories/baseUserRepository.js b/src/repositories/baseUserRepository.js index e9074d898..056ff8b35 100644 --- a/src/repositories/baseUserRepository.js +++ b/src/repositories/baseUserRepository.js @@ -516,7 +516,7 @@ class BaseUserRepository extends BaseRepository { if (!isRegistryObject) { legacyObjectRaw = incomingUser - registryObjectRaw = this.convertRegistryToLegacy(incomingUser) + registryObjectRaw = this.convertLegacyToRegistry(incomingUser) } else { registryObjectRaw = incomingUser legacyObjectRaw = this.convertRegistryToLegacy(incomingUser) From f00322eab57d53f77cb60e2e8dc109643815e057 Mon Sep 17 00:00:00 2001 From: Chris Berger Date: Wed, 25 Feb 2026 13:09:52 -0500 Subject: [PATCH 3/5] Added missing .save when removing user roles --- src/repositories/baseUserRepository.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/repositories/baseUserRepository.js b/src/repositories/baseUserRepository.js index 056ff8b35..af968929a 100644 --- a/src/repositories/baseUserRepository.js +++ b/src/repositories/baseUserRepository.js @@ -435,6 +435,7 @@ class BaseUserRepository extends BaseRepository { if (rolesToRemove.includes('ADMIN')) { const filteredUuids = registryOrg.admins.filter(uuid => uuid !== registryUser.UUID) registryOrg.admins = filteredUuids + await registryOrg.save(options) } if (rolesToAdd.includes('ADMIN') && !incomingParameters?.org_short_name) { From 1c4cae6e59b25b658fd5b70333b91606b2fd8d0d Mon Sep 17 00:00:00 2001 From: Chris Berger Date: Wed, 25 Feb 2026 13:11:56 -0500 Subject: [PATCH 4/5] Fixed incorrect time field when converting from registry to legacy objects --- src/repositories/baseOrgRepository.js | 2 +- src/repositories/baseUserRepository.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/repositories/baseOrgRepository.js b/src/repositories/baseOrgRepository.js index 17eadc711..a14dcb800 100644 --- a/src/repositories/baseOrgRepository.js +++ b/src/repositories/baseOrgRepository.js @@ -1055,7 +1055,7 @@ class BaseOrgRepository extends BaseRepository { }, time: { created: registryOrg?.created ?? null, - modified: registryOrg?.modified ?? null + modified: registryOrg?.last_updated ?? null } } } diff --git a/src/repositories/baseUserRepository.js b/src/repositories/baseUserRepository.js index af968929a..910888b02 100644 --- a/src/repositories/baseUserRepository.js +++ b/src/repositories/baseUserRepository.js @@ -668,7 +668,7 @@ class BaseUserRepository extends BaseRepository { active: registryUser.status === 'active', time: { created: registryUser?.created ?? null, - modified: registryUser?.modified ?? null + modified: registryUser?.last_updated ?? null } } } From 9e847658518bb22397f66e9b7109d8b82095a41b Mon Sep 17 00:00:00 2001 From: Chris Berger Date: Wed, 25 Feb 2026 13:12:29 -0500 Subject: [PATCH 5/5] Removed unnecessary string length check --- src/controller/org.controller/org.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controller/org.controller/org.controller.js b/src/controller/org.controller/org.controller.js index 05b9fc572..16d4a67ca 100644 --- a/src/controller/org.controller/org.controller.js +++ b/src/controller/org.controller/org.controller.js @@ -448,7 +448,7 @@ async function createUser (req, res, next) { return res.status(400).json({ message: 'Parameters were invalid', errors: result.errors }) } } else { - if (!body?.username || typeof body?.username !== 'string' || !body?.username.length > 0) { + if (!body?.username || typeof body?.username !== 'string') { return res.status(400).json({ message: 'Parameters were invalid', details: [{ param: 'username', msg: 'Parameter must be a non empty string' }] }) } }