Merge pull request #1438 from CVEProject/dr_1399_fix_identifier

Resolves Issue #1399 - Update getOrg in registry-org controller to allow for uuid or shortname

Author: david-rocca

src/controller/registry-org.controller/registry-org.controller.js

@@ -51,19 +51,20 @@ async function getAllOrgs (req, res, next) {
 async function getOrg (req, res, next) {
   try {
     const repo = req.ctx.repositories.getRegistryOrgRepository()
+    // User passed in parameter to filter for
     const identifier = req.ctx.params.identifier
     const orgShortName = req.ctx.org
     const isSecretariat = await repo.isSecretariat(orgShortName)
     const org = await repo.findOneByShortName(orgShortName)
-    let orgIdentifer = orgShortName
-    let agt = setAggregateOrgObj({ UUID: identifier })
+    let requestingUserOrgIdentifier = orgShortName
+    let agt = setAggregateOrgObj({ short_name: identifier })
 
     if (validateUUID(identifier)) {
-      orgIdentifer = org.UUID
+      requestingUserOrgIdentifier = org.UUID
       agt = setAggregateOrgObj({ UUID: identifier })
     }
 
-    if (orgIdentifer !== identifier && !isSecretariat) {
+    if (requestingUserOrgIdentifier !== identifier && !isSecretariat) {
       logger.info({ uuid: req.ctx.uuid, message: identifier + ' organization can only be viewed by the users of the same organization or the Secretariat.' })
       return res.status(403).json(error.notSameOrgOrSecretariat())
     }