Merge pull request #1651 from CVEProject/cb_ur_minor_fixes

Addressed minor user registry bugs

Author: david-rocca

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' }] })
         }
       }

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
       }
     }
   }

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) {
@@ -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)
@@ -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
       }
     }
   }

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)
       }