diff --git a/src/lib/db/access-store.ts b/src/lib/db/access-store.ts index f23ab4e468..bee8ac56fe 100644 --- a/src/lib/db/access-store.ts +++ b/src/lib/db/access-store.ts @@ -554,20 +554,6 @@ export class AccessStore implements IAccessStore { }); } - async removeGroupFromRole( - groupId: number, - roleId: number, - projectId?: string, - ): Promise { - return this.db(T.GROUP_ROLE) - .where({ - group_id: groupId, - role_id: roleId, - project: projectId, - }) - .delete(); - } - async updateUserProjectRole( userId: number, roleId: number, diff --git a/src/lib/events/index.ts b/src/lib/events/index.ts index 8f1f6165d9..e71a52472a 100644 --- a/src/lib/events/index.ts +++ b/src/lib/events/index.ts @@ -79,7 +79,6 @@ export const PROJECT_USER_ADDED = 'project-user-added' as const; export const PROJECT_USER_REMOVED = 'project-user-removed' as const; export const PROJECT_USER_ROLE_CHANGED = 'project-user-role-changed' as const; export const PROJECT_GROUP_ADDED = 'project-group-added' as const; -export const PROJECT_GROUP_REMOVED = 'project-group-removed' as const; export const PROJECT_GROUP_ROLE_CHANGED = 'project-group-role-changed' as const; export const DROP_PROJECTS = 'drop-projects' as const; export const TAG_CREATED = 'tag-created' as const; @@ -273,7 +272,6 @@ export const IEventTypes = [ PROJECT_USER_ROLE_CHANGED, PROJECT_GROUP_ROLE_CHANGED, PROJECT_GROUP_ADDED, - PROJECT_GROUP_REMOVED, ROLE_CREATED, ROLE_UPDATED, ROLE_DELETED, diff --git a/src/lib/features/project/project-service.ts b/src/lib/features/project/project-service.ts index ee308890de..2c707417b4 100644 --- a/src/lib/features/project/project-service.ts +++ b/src/lib/features/project/project-service.ts @@ -45,7 +45,6 @@ import { ProjectCreatedEvent, ProjectDeletedEvent, ProjectGroupAddedEvent, - ProjectGroupRemovedEvent, ProjectGroupUpdateRoleEvent, ProjectRevivedEvent, ProjectUpdatedEvent, @@ -805,44 +804,6 @@ export default class ProjectService { ); } - /** - * @deprecated use removeGroupAccess - */ - async removeGroup( - projectId: string, - roleId: number, - groupId: number, - auditUser: IAuditUser, - ): Promise { - const group = await this.groupService.getGroup(groupId); - const role = await this.accessService.getRole(roleId); - const project = await this.getProject(projectId); - if (group.id == null) - throw new ValidationError( - 'Unexpected empty group id', - [], - undefined, - ); - - await this.accessService.removeGroupFromRole( - group.id, - role.id, - project.id, - ); - - await this.eventService.storeEvent( - new ProjectGroupRemovedEvent({ - project: projectId, - auditUser, - preData: { - groupId: group.id, - projectId: project.id, - roleName: role.name, - }, - }), - ); - } - private isAdmin(userId: number, roles: IRoleWithProject[]): boolean { return ( userId === SYSTEM_USER_ID || diff --git a/src/lib/services/access-service.ts b/src/lib/services/access-service.ts index f644736f8e..3fac745236 100644 --- a/src/lib/services/access-service.ts +++ b/src/lib/services/access-service.ts @@ -455,14 +455,6 @@ export class AccessService { return this.store.removeUserFromRole(userId, roleId, projectId); } - async removeGroupFromRole( - groupId: number, - roleId: number, - projectId: string, - ): Promise { - return this.store.removeGroupFromRole(groupId, roleId, projectId); - } - async updateUserProjectRole( userId: number, roleId: number, diff --git a/src/lib/types/events.ts b/src/lib/types/events.ts index 34659b0d64..6f931ced6d 100644 --- a/src/lib/types/events.ts +++ b/src/lib/types/events.ts @@ -77,7 +77,6 @@ import { PROJECT_ENVIRONMENT_REMOVED, PROJECT_FAVORITED, PROJECT_GROUP_ADDED, - PROJECT_GROUP_REMOVED, PROJECT_GROUP_ROLE_CHANGED, PROJECT_IMPORT, PROJECT_REVIVED, @@ -1038,28 +1037,6 @@ export class ProjectGroupAddedEvent extends BaseEvent { } } -export class ProjectGroupRemovedEvent extends BaseEvent { - readonly project: string; - - readonly data: any; - - readonly preData: any; - - /** - */ - constructor(p: { - project: string; - preData: any; - auditUser: IAuditUser; - }) { - super(PROJECT_GROUP_REMOVED, p.auditUser); - const { project, preData } = p; - this.project = project; - this.data = null; - this.preData = preData; - } -} - export class ProjectGroupUpdateRoleEvent extends BaseEvent { readonly project: string; diff --git a/src/lib/types/stores/access-store.ts b/src/lib/types/stores/access-store.ts index 3d19af8ffb..093c1db15d 100644 --- a/src/lib/types/stores/access-store.ts +++ b/src/lib/types/stores/access-store.ts @@ -131,12 +131,6 @@ export interface IAccessStore extends Store { projectId?: string, ): Promise; - removeGroupFromRole( - groupId: number, - roleId: number, - projectId?: string, - ): Promise; - updateUserProjectRole( userId: number, roleId: number, diff --git a/src/test/fixtures/fake-access-store.ts b/src/test/fixtures/fake-access-store.ts index a5895f19db..9546de2f0a 100644 --- a/src/test/fixtures/fake-access-store.ts +++ b/src/test/fixtures/fake-access-store.ts @@ -69,14 +69,6 @@ export class FakeAccessStore implements IAccessStore { throw new Error('Method not implemented.'); } - removeGroupFromRole( - groupId: number, - roleId: number, - projectId?: string, - ): Promise { - throw new Error('Method not implemented.'); - } - updateUserProjectRole( userId: number, roleId: number,