Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-08-23 13:46:45 +02:00
Code Issues Projects Releases Wiki Activity

fix: remove user from project (#5383)

Browse Source 
Removing a user from a project was impossible if you only had 1 owner.
It worked fine when having more than an owner. This should fix it and
we'll add tests later
This commit is contained in:
Gastón Fournier 2023-11-21 15:44:12 +01:00
parent c9a3f33b1c
commit 818a618782
No known key found for this signature in database
GPG Key ID: AF45428626E17A8E
2 changed files with 55 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/services/project-service.ts
View File

@ -429,7 +429,9 @@ export default class ProjectService {
return this.accessService.getProjectRoleAccess(projectId);
}
// Deprecated: See addAccess instead.
/**
* @deprecated see addAccess instead.
*/
async addUser(
projectId: string,
roleId: number,
@ -469,6 +471,9 @@ export default class ProjectService {
);
}
/**
* @deprecated use removeUserAccess
*/
async removeUser(
projectId: string,
roleId: number,
@ -510,7 +515,10 @@ export default class ProjectService {
const ownerRole = await this.accessService.getRoleByName(
RoleName.OWNER,
);
await this.validateAtLeastOneOwner(projectId, ownerRole);
if (existingRoles.includes(ownerRole.id)) {
await this.validateAtLeastOneOwner(projectId, ownerRole);
}
await this.accessService.removeUserAccess(projectId, userId);
@ -539,7 +547,10 @@ export default class ProjectService {
const ownerRole = await this.accessService.getRoleByName(
RoleName.OWNER,
);
await this.validateAtLeastOneOwner(projectId, ownerRole);
if (existingRoles.includes(ownerRole.id)) {
await this.validateAtLeastOneOwner(projectId, ownerRole);
}
await this.accessService.removeGroupAccess(projectId, groupId);
@ -591,6 +602,9 @@ export default class ProjectService {
);
}
/**
* @deprecated use removeGroupAccess
*/
async removeGroup(
projectId: string,
roleId: number,
@ -744,7 +758,6 @@ export default class ProjectService {
if (hasOwnerRole && isRemovingOwnerRole) {
await this.validateAtLeastOneOwner(projectId, ownerRole);
}
await this.validateAtLeastOneOwner(projectId, ownerRole);
await this.accessService.setProjectRolesForGroup(
projectId,
@ -870,7 +883,6 @@ export default class ProjectService {
// Nothing to do....
return;
}
await this.validateAtLeastOneOwner(projectId, currentRole);
await this.accessService.updateUserProjectRole(
@ -924,7 +936,6 @@ export default class ProjectService {
// Nothing to do....
return;
}
await this.validateAtLeastOneOwner(projectId, currentRole);
await this.accessService.updateGroupProjectRole(

38
src/test/e2e/services/project-service.e2e.test.ts
View File

@ -1048,6 +1048,44 @@ describe('ensure project has at least one owner', () => {
);
});
test('should be able to remove member user from the project when another is owner', async () => {
const project = {
id: 'remove-users-members-allowed',
name: 'New project',
description: 'Blah',
mode: 'open' as const,
defaultStickiness: 'clientId',
};
await projectService.createProject(project, user);
const memberRole = await stores.roleStore.getRoleByName(
RoleName.MEMBER,
);
const memberUser = await stores.userStore.insert({
name: 'Some Name',
email: 'member@getunleash.io',
});
await projectService.addAccess(
project.id,
[memberRole.id],
[],
[memberUser.id],
'test',
);
const usersBefore = await projectService.getProjectUsers(project.id);
await projectService.removeUserAccess(
project.id,
memberUser.id,
'test',
);
const usersAfter = await projectService.getProjectUsers(project.id);
expect(usersBefore).toHaveLength(2);
expect(usersAfter).toHaveLength(1);
});
test('should not update role for user on project when she is the owner', async () => {
const project = {
id: 'update-users-not-allowed',