Skip to content

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

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 4 commits into from
Jul 14, 2025
Merged

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

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee6c74c
Update getOrg in registry-org controller to allow for uuid or shortname
david-rocca Jul 14, 2025
6f09a77
Update variable name to make it more clear
david-rocca Jul 14, 2025
1c4c288
Merge branch 'dev' into dr_1399_fix_identifier
david-rocca Jul 14, 2025
a33853d
Merge branch 'dev' into dr_1399_fix_identifier
david-rocca Jul 14, 2025
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
9 changes: 5 additions & 4 deletions src/controller/registry-org.controller/registry-org.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand Down
Loading