Skip to content

Resolves #1506 - Fixed tests for resetting secret #1519

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
merged 2 commits into from
Sep 15, 2025
Merged

Resolves #1506 - Fixed tests for resetting secret #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
791e03d
Fixed tests for resetting secret
david-rocca Sep 15, 2025
7e83cdb
Linting issues
david-rocca Sep 15, 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
2 changes: 0 additions & 2 deletions src/controller/org.controller/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,8 +1004,6 @@ router.put('/org/:shortname/user/:username/reset_secret',
}
}
*/
param(['registry']).optional().isBoolean(),
mw.handleRegistryParameter,
mw.validateUser,
mw.onlyOrgWithPartnerRole,
param(['shortname']).isString().trim().notEmpty().isLength({ min: CONSTANTS.MIN_SHORTNAME_LENGTH, max: CONSTANTS.MAX_SHORTNAME_LENGTH }),
Expand Down
2 changes: 1 addition & 1 deletion test/unit-tests/user/mockObjects.user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ const userC = { // same org_UUID as userA but different username
active_roles: []
},
org_UUID: existentOrgDummy.UUID,
UUID: '33394284-4acf-423b-b199-9e57656ee451',
UUID: '13394284-4acf-423b-b199-9e57656ee451',
secret: '$argon2i$v=19$m=4096,t=3,p=1$meXeqZas6Ba2eQrIb3xbiA$x8KRFqYVuvlvsyMiUA2/hSaFbd2mxaKhEM5rXUfx9sw'
}

Expand Down
147 changes: 76 additions & 71 deletions test/unit-tests/user/userResetSecretTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@ const mongoose = require('mongoose')
// Mock Repositories and Controller
const OrgRepository = require('../../../src/repositories/orgRepository.js')
const UserRepository = require('../../../src/repositories/userRepository.js')
const RegistryOrgRepository = require('../../../src/repositories/registryOrgRepository.js')
const RegistryUserRepository = require('../../../src/repositories/registryUserRepository.js')
const BaseOrgRepository = require('../../../src/repositories/baseOrgRepository.js')
const BaseUserRepository = require('../../../src/repositories/baseUserRepository.js')

const orgController = require('../../../src/controller/org.controller/org.controller.js')

// Mocks for error messages and fixtures
const { OrgControllerError } = require('../../../src/controller/org.controller/error.js')
const error = new OrgControllerError()
const userFixtures = require('./mockObjects.user.js')

describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpoint', () => {
let status, json, res, next, getOrgRepository, orgRepo, regOrgRepo, getUserRepository, getRegistryOrgRepository,
userRepo, userRegistryRepo, mockSession, orgUUIDStub, regOrgUUIDStub, userUUIDStub, regUserUUIDStub,
isSecretariatStub, isAdminStub, findOneUserStub, findOneRegUserStub, updateUserStub, updateRegUserStub,
isRegSecretariatStub, isRegAdminStub, getRegistryUserRepository
describe('Testing the PUT /org/:shortname/user/:username/reset_secret endpoint', () => {
let status, json, res, next, getOrgRepository, orgRepo, getUserRepository,
userRepo, mockSession, orgUUIDStub, regOrgUUIDStub, userUUIDStub, regUserUUIDStub,
isSecretariatStub, isAdminStub, findOneUserStub, updateUserStub,
isRegSecretariatStub, isRegAdminStub, baseOrgRepo, getBaseOrgRepository, baseUserRepo, getBaseUserRepository, isSecretariatByShortName

beforeEach(() => {
// Mock Express response objects
Expand All @@ -45,10 +46,12 @@ describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpo
getOrgRepository = sinon.stub().returns(orgRepo)
userRepo = new UserRepository()
getUserRepository = sinon.stub().returns(userRepo)
regOrgRepo = new RegistryOrgRepository()
getRegistryOrgRepository = sinon.stub().returns(regOrgRepo)
userRegistryRepo = new RegistryUserRepository()
getRegistryUserRepository = sinon.stub().returns(userRegistryRepo)

baseOrgRepo = new BaseOrgRepository()
getBaseOrgRepository = sinon.stub().returns(baseOrgRepo)

baseUserRepo = new BaseUserRepository()
getBaseUserRepository = sinon.stub().returns(baseUserRepo)

// Set up stubs for all repository methods that will be called
isSecretariatStub = sinon.stub(orgRepo, 'isSecretariat')
Expand All @@ -59,12 +62,11 @@ describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpo
userUUIDStub = sinon.stub(userRepo, 'getUserUUID')

// Stubs for registry repositories
isRegSecretariatStub = sinon.stub(regOrgRepo, 'isSecretariat')
isRegAdminStub = sinon.stub(userRegistryRepo, 'isAdmin')
regOrgUUIDStub = sinon.stub(regOrgRepo, 'getOrgUUID')
findOneRegUserStub = sinon.stub(userRegistryRepo, 'findOneByUserNameAndOrgUUID')
updateRegUserStub = sinon.stub(userRegistryRepo, 'updateByUserNameAndOrgUUID')
regUserUUIDStub = sinon.stub(userRegistryRepo, 'getUserUUID')
isRegSecretariatStub = sinon.stub(baseOrgRepo, 'isSecretariat')
isSecretariatByShortName = sinon.stub(baseOrgRepo, 'isSecretariatByShortName')
isRegAdminStub = sinon.stub(baseUserRepo, 'isAdmin')
regOrgUUIDStub = sinon.stub(baseOrgRepo, 'getOrgUUID')
regUserUUIDStub = sinon.stub(baseUserRepo, 'getUserUUID')
})

afterEach(() => {
Expand All @@ -81,11 +83,11 @@ describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpo
uuid: faker.datatype.uuid(),
org: 'secretariat_org',
user: 'secretariat_user',
repositories: { getOrgRepository, getUserRepository, getRegistryOrgRepository, getRegistryUserRepository }
},
params: {
shortname: userFixtures.nonExistentOrg.short_name,
username: userFixtures.existentUser.username
repositories: { getOrgRepository, getUserRepository, getBaseUserRepository, getBaseOrgRepository },
params: {
shortname: userFixtures.nonExistentOrg.short_name,
username: userFixtures.existentUser.username
}
}
}

Expand All @@ -94,7 +96,7 @@ describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpo
const errObj = error.orgDnePathParam(userFixtures.nonExistentOrg.short_name)
expect(status.calledWith(404)).to.be.true
expect(json.calledWithMatch({ error: errObj.error, message: errObj.message })).to.be.true
expect(mockSession.abortTransaction.called).to.be.false
expect(mockSession.abortTransaction.called).to.be.true
expect(mockSession.endSession.calledOnce).to.be.true
})

Expand All @@ -104,18 +106,17 @@ describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpo
isSecretariatStub.resolves(true)
isRegSecretariatStub.resolves(true)
findOneUserStub.resolves(null)
findOneRegUserStub.resolves(null)

const req = {
ctx: {
uuid: faker.datatype.uuid(),
org: 'secretariat_org',
user: 'secretariat_user',
repositories: { getOrgRepository, getUserRepository, getRegistryOrgRepository, getRegistryUserRepository }
},
params: {
shortname: userFixtures.existentOrg.short_name,
username: userFixtures.nonExistentUser.username
repositories: { getOrgRepository, getUserRepository, getBaseUserRepository, getBaseOrgRepository },
params: {
shortname: userFixtures.existentOrg.short_name,
username: userFixtures.nonExistentUser.username
}
}
}

Expand All @@ -124,35 +125,39 @@ describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpo
const errObj = error.userDne(userFixtures.nonExistentUser.username)
expect(status.calledWith(404)).to.be.true
expect(json.calledWithMatch({ error: errObj.error, message: errObj.message })).to.be.true
expect(mockSession.abortTransaction.called).to.be.false
expect(mockSession.abortTransaction.called).to.be.true
expect(mockSession.endSession.calledOnce).to.be.true
})

it('Should fail if a non-Secretariat user tries to access a different organization', async () => {
orgUUIDStub.resolves(userFixtures.existentOrg.UUID)
regOrgUUIDStub.resolves(userFixtures.existentOrg.UUID)
isSecretariatStub.resolves(false)
isSecretariatByShortName.resolves(false)
isRegSecretariatStub.resolves(false)
isRegAdminStub.resolves(false)
regUserUUIDStub.onFirstCall().resolves(userFixtures.existentUser.UUID)
regUserUUIDStub.onSecondCall().resolves('FakeUUID')

const req = {
ctx: {
uuid: faker.datatype.uuid(),
org: userFixtures.owningOrg.short_name,
user: 'some_user',
repositories: { getOrgRepository, getUserRepository, getRegistryOrgRepository, getRegistryUserRepository }
},
params: {
shortname: userFixtures.existentOrg.short_name,
username: userFixtures.existentUser.username
repositories: { getOrgRepository, getUserRepository, getBaseUserRepository, getBaseOrgRepository },
params: {
shortname: userFixtures.existentOrg.short_name,
username: userFixtures.existentUser.username
}
}

}

await orgController.USER_RESET_SECRET(req, res, next)

const errObj = error.notSameOrgOrSecretariat()
expect(status.calledWith(403)).to.be.true
expect(json.calledWithMatch({ error: errObj.error, message: errObj.message })).to.be.true
expect(mockSession.abortTransaction.called).to.be.false
expect(mockSession.abortTransaction.called).to.be.true
expect(mockSession.endSession.calledOnce).to.be.true
})

Expand All @@ -164,18 +169,19 @@ describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpo
isAdminStub.resolves(false)
isRegAdminStub.resolves(false)
findOneUserStub.resolves(userFixtures.userC)
findOneRegUserStub.resolves(userFixtures.userC)
regUserUUIDStub.onFirstCall().resolves(userFixtures.userC.UUID)
regUserUUIDStub.onSecondCall().resolves(userFixtures.userA.UUID)

const req = {
ctx: {
uuid: faker.datatype.uuid(),
org: userFixtures.existentOrgDummy.short_name,
user: userFixtures.userA.username,
repositories: { getOrgRepository, getUserRepository, getRegistryOrgRepository, getRegistryUserRepository }
},
params: {
shortname: userFixtures.existentOrgDummy.short_name,
username: userFixtures.userC.username
repositories: { getOrgRepository, getUserRepository, getBaseOrgRepository, getBaseUserRepository },
params: {
shortname: userFixtures.existentOrgDummy.short_name,
username: userFixtures.userC.username
}
}
}

Expand All @@ -184,7 +190,7 @@ describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpo
const errObj = error.notSameUserOrSecretariat()
expect(status.calledWith(403)).to.be.true
expect(json.calledWithMatch({ error: errObj.error, message: errObj.message })).to.be.true
expect(mockSession.abortTransaction.called).to.be.false
expect(mockSession.abortTransaction.called).to.be.true
expect(mockSession.endSession.calledOnce).to.be.true
})
})
Expand All @@ -195,30 +201,28 @@ describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpo
orgUUIDStub.resolves(userFixtures.existentOrgDummy.UUID)
regOrgUUIDStub.resolves(userFixtures.existentOrgDummy.UUID)
updateUserStub.resolves({ matchedCount: 1, modifiedCount: 1 })
updateRegUserStub.resolves({ matchedCount: 1, modifiedCount: 1 })
userUUIDStub.resolves(userFixtures.userA.UUID)
regUserUUIDStub.resolves(userFixtures.userA.UUID)
})

it('Should reset the secret if the requester is the user themselves', async () => {
isSecretariatStub.resolves(false)
isRegSecretariatStub.resolves(false)
isAdminStub.resolves(false)
isSecretariatByShortName.resolves(false)
isRegAdminStub.resolves(false)
findOneUserStub.resolves(userFixtures.userA)
findOneRegUserStub.resolves(userFixtures.userA)
sinon.stub(baseUserRepo, 'resetSecret').resolves('ANEWUUID')

const req = {
ctx: {
uuid: faker.datatype.uuid(),
org: userFixtures.existentOrgDummy.short_name,
user: userFixtures.userA.username,
repositories: { getOrgRepository, getUserRepository, getRegistryOrgRepository, getRegistryUserRepository }
},
params: {
shortname: userFixtures.existentOrgDummy.short_name,
username: userFixtures.userA.username
repositories: { getOrgRepository, getUserRepository, getBaseOrgRepository, getBaseUserRepository },
params: {
shortname: userFixtures.existentOrgDummy.short_name,
username: userFixtures.userA.username
}
}

}

await orgController.USER_RESET_SECRET(req, res, next)
Expand All @@ -230,25 +234,25 @@ describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpo
})

it('Should reset the secret if the requester is a Secretariat', async () => {
isSecretariatStub.resolves(true)
isRegSecretariatStub.resolves(true)
isSecretariatByShortName.resolves(true)
isAdminStub.resolves(false)
isRegAdminStub.resolves(false)
findOneUserStub.resolves(userFixtures.existentUser)
findOneRegUserStub.resolves(userFixtures.existentUser)
regUserUUIDStub.onFirstCall().resolves(userFixtures.userC.UUID)
regUserUUIDStub.onSecondCall().resolves(userFixtures.userA.UUID)
orgUUIDStub.withArgs(userFixtures.existentOrg.short_name).resolves(userFixtures.existentOrg.UUID)
regOrgUUIDStub.withArgs(userFixtures.existentOrg.short_name).resolves(userFixtures.existentOrg.UUID)
sinon.stub(baseUserRepo, 'resetSecret').resolves('ANEWUUID')

const req = {
ctx: {
uuid: faker.datatype.uuid(),
org: 'secretariat_org',
user: 'secretariat_user',
repositories: { getOrgRepository, getUserRepository, getRegistryOrgRepository, getRegistryUserRepository }
},
params: {
shortname: userFixtures.existentOrg.short_name,
username: userFixtures.existentUser.username
repositories: { getBaseOrgRepository, getBaseUserRepository },
params: {
shortname: userFixtures.existentOrg.short_name,
username: userFixtures.existentUser.username
}
}
}

Expand All @@ -260,23 +264,24 @@ describe.skip('Testing the PUT /org/:shortname/user/:username/reset_secret endpo
})

it('Should reset the secret if the requester is an admin of the target user\'s org', async () => {
isSecretariatStub.resolves(false)
isSecretariatByShortName.resolves(false)
isRegSecretariatStub.resolves(false)
isAdminStub.resolves(true)
isRegAdminStub.resolves(true)
findOneUserStub.resolves(userFixtures.userC)
findOneRegUserStub.resolves(userFixtures.userC)
regUserUUIDStub.onFirstCall().resolves(userFixtures.userC.UUID)
regUserUUIDStub.onSecondCall().resolves(userFixtures.userA.UUID)
sinon.stub(baseUserRepo, 'resetSecret').resolves('ANEWUUID')

const req = {
ctx: {
uuid: faker.datatype.uuid(),
org: userFixtures.existentOrgDummy.short_name,
user: userFixtures.userA.username,
repositories: { getOrgRepository, getUserRepository, getRegistryOrgRepository, getRegistryUserRepository }
},
params: {
shortname: userFixtures.existentOrgDummy.short_name,
username: userFixtures.userC.username
repositories: { getBaseOrgRepository, getBaseUserRepository },
params: {
shortname: userFixtures.existentOrgDummy.short_name,
username: userFixtures.userC.username
}
}
}

Expand Down
Loading