Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-09-05 17:53:12 +02:00
Code Issues Projects Releases Wiki Activity

fix: Include deletion events for when a user is removed from a project role

Browse Source
This commit is contained in:
sighphyre 2022-01-14 13:01:00 +02:00
parent cab9f5dffc
commit 433ba12c55
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import { projectSchema } from './project-schema';
import NotFoundError from '../error/notfound-error';
import {
ProjectUserAddedEvent,
ProjectUserRemovedEvent,
PROJECT_CREATED,
PROJECT_DELETED,
PROJECT_UPDATED,
@ -284,12 +285,12 @@ export default class ProjectService {
};
}
// TODO: should be an event too
// TODO: Remove the optional nature of createdBy - this in place to make sure enterprise is compatible
async addUser(
projectId: string,
roleId: number,
userId: number,
createdBy: string,
createdBy?: string,
): Promise<void> {
const [roles, users] = await this.accessService.getProjectRoleUsers(
projectId,
@ -309,20 +310,21 @@ export default class ProjectService {
await this.accessService.addUserToRole(userId, role.id, projectId);
this.eventStore.store(
await this.eventStore.store(
new ProjectUserAddedEvent({
project: projectId,
createdBy,
data: { roleId, userId },
data: { roleId, userId, roleName: role.name },
}),
);
}
// TODO: should be an event too
// TODO: Remove the optional nature of createdBy - this in place to make sure enterprise is compatible
async removeUser(
projectId: string,
roleId: number,
userId: number,
createdBy?: string,
): Promise<void> {
const roles = await this.accessService.getRolesForProject(projectId);
const role = roles.find((r) => r.id === roleId);
@ -343,6 +345,14 @@ export default class ProjectService {
}
await this.accessService.removeUserFromRole(userId, role.id, projectId);
await this.eventStore.store(
new ProjectUserRemovedEvent({
project: projectId,
createdBy,
preData: { roleId, userId, roleName: role.name },
}),
);
}
async getMembers(projectId: string): Promise<number> {

20
src/lib/types/events.ts
View File

@ -41,7 +41,6 @@ export const PROJECT_DELETED = 'project-deleted';
export const PROJECT_IMPORT = 'project-import';
export const PROJECT_USER_ADDED = 'project-user-added';
export const PROJECT_USER_REMOVED = 'project-user-removed';
export const PROJECT_USER_UPDATED = 'project-user-updated';
export const DROP_PROJECTS = 'drop-projects';
export const TAG_CREATED = 'tag-created';
export const TAG_DELETED = 'tag-deleted';
@ -387,10 +386,29 @@ export class ProjectUserAddedEvent extends BaseEvent {
readonly data: any;
readonly preData: any;
constructor(p: { project: string; createdBy: string; data: any }) {
super(PROJECT_USER_ADDED, p.createdBy);
const { project, data } = p;
this.project = project;
this.data = data;
this.preData = null;
}
}
export class ProjectUserRemovedEvent extends BaseEvent {
readonly project: string;
readonly data: any;
readonly preData: any;
constructor(p: { project: string; createdBy: string; preData: any }) {
super(PROJECT_USER_REMOVED, p.createdBy);
const { project, preData } = p;
this.project = project;
this.data = null;
this.preData = preData;
}
}