Skip to content

Addressed minor user registry bugs #1651

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
david-rocca merged 6 commits into from
Mar 3, 2026
Merged

Addressed minor user registry bugs #1651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1829a8f
Fixed order of arguments in isAdmin util functions
cberger8 Feb 25, 2026
3d0e6e7
Fixed incorrect legacy to registry conversion
cberger8 Feb 25, 2026
f00322e
Added missing .save when removing user roles
cberger8 Feb 25, 2026
1c4cae6
Fixed incorrect time field when converting from registry to legacy ob…
cberger8 Feb 25, 2026
9e84765
Removed unnecessary string length check
cberger8 Feb 25, 2026
b5d1ce8
Merge branch 'dev' into cb_ur_minor_fixes
david-rocca Mar 3, 2026
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
2 changes: 1 addition & 1 deletion src/controller/org.controller/org.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }] })
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/repositories/baseOrgRepository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@ class BaseOrgRepository extends BaseRepository {
},
time: {
created: registryOrg?.created ?? null,
modified: registryOrg?.modified ?? null
modified: registryOrg?.last_updated ?? null
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/repositories/baseUserRepository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -516,7 +517,7 @@ class BaseUserRepository extends BaseRepository {

if (!isRegistryObject) {
legacyObjectRaw = incomingUser
registryObjectRaw = this.convertRegistryToLegacy(incomingUser)
registryObjectRaw = this.convertLegacyToRegistry(incomingUser)
} else {
registryObjectRaw = incomingUser
legacyObjectRaw = this.convertRegistryToLegacy(incomingUser)
Expand Down Expand Up @@ -667,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
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/utils/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down
Loading