feat(API): Allow deletion of users from projects

packages/cli/src/controllers/project.controller.ts

@@ -196,14 +196,7 @@ export class ProjectController {
 			await this.projectsService.updateProject(req.body.name, req.params.projectId);
 		}
 		if (req.body.relations) {
-			try {
+			await this.syncProjectRelations(req.params.projectId, req.body.relations);
-				await this.projectsService.syncProjectRelations(req.params.projectId, req.body.relations);
-			} catch (e) {
-				if (e instanceof UnlicensedProjectRoleError) {
-					throw new BadRequestError(e.message);
-				}
-				throw e;
-			}
 
 			this.eventService.emit('team-project-updated', {
 				userId: req.user.id,
@@ -214,6 +207,20 @@ export class ProjectController {
 		}
 	}
 
+	async syncProjectRelations(
+		projectId: string,
+		relations: ProjectRequest.ProjectRelationPayload[],
+	) {
+		try {
+			await this.projectsService.syncProjectRelations(projectId, relations);
+		} catch (e) {
+			if (e instanceof UnlicensedProjectRoleError) {
+				throw new BadRequestError(e.message);
+			}
+			throw e;
+		}
+	}
+
 	@Delete('/:projectId')
 	@ProjectScope('project:delete')
 	async deleteProject(req: ProjectRequest.Delete) {

packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts

@@ -12,6 +12,7 @@ import { encodeNextCursor } from '../../shared/services/pagination.service';
 type Create = ProjectRequest.Create;
 type Update = ProjectRequest.Update;
 type Delete = ProjectRequest.Delete;
+type DeleteUser = ProjectRequest.DeleteUser;
 type GetAll = PaginatedRequest;
 
 export = {
@@ -64,4 +65,26 @@ export = {
 			});
 		},
 	],
+	deleteUserFromProject: [
+		isLicensed('feat:projectRole:admin'),
+		globalScope('project:update'),
+		async (req: DeleteUser, res: Response) => {
+			const { projectId, id: userId } = req.params;
+
+			const project = await Container.get(ProjectRepository).findOne({
+				where: { id: projectId },
+				relations: { projectRelations: true },
+			});
+
+			if (!project) {
+				return res.status(404).send({ message: 'Not found' });
+			}
+
+			const relations = project.projectRelations.filter((relation) => relation.userId !== userId);
+
+			await Container.get(ProjectController).syncProjectRelations(projectId, relations);
+
+			return res.status(204).send();
+		},
+	],
 };

packages/cli/src/public-api/v1/handlers/projects/spec/paths/projects.projectId.users.id.yml

@@ -0,0 +1,44 @@
+delete:
+  x-eov-operation-id: deleteUserFromProject
+  x-eov-operation-handler: v1/handlers/projects/projects.handler
+  tags:
+    - Projects
+  summary: Delete a user from a project
+  description: Delete a user from a project from your instance.
+  parameters:
+    - $ref: '../schemas/parameters/projectId.yml'
+    - $ref: '../../../users/spec/schemas/parameters/userIdentifier.yml'
+  responses:
+    '204':
+      description: Operation successful.
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '403':
+      $ref: '../../../../shared/spec/responses/forbidden.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
+# put:
+#   x-eov-operation-id: updateProject
+#   x-eov-operation-handler: v1/handlers/projects/projects.handler
+#   tags:
+#     - Project
+#   summary: Update a project
+#   description: Update a project.
+#   requestBody:
+#     description: Updated project object.
+#     content:
+#       application/json:
+#         schema:
+#           $ref: '../schemas/project.yml'
+#     required: true
+#   responses:
+#     '204':
+#       description: Operation successful.
+#     '400':
+#       $ref: '../../../../shared/spec/responses/badRequest.yml'
+#     '401':
+#       $ref: '../../../../shared/spec/responses/unauthorized.yml'
+#     '403':
+#       $ref: '../../../../shared/spec/responses/forbidden.yml'
+#     '404':
+#       $ref: '../../../../shared/spec/responses/notFound.yml'

packages/cli/src/public-api/v1/openapi.yml

@@ -82,6 +82,8 @@ paths:
     $ref: './handlers/projects/spec/paths/projects.yml'
   /projects/{projectId}:
     $ref: './handlers/projects/spec/paths/projects.projectId.yml'
+  /projects/{projectId}/users/{id}:
+    $ref: './handlers/projects/spec/paths/projects.projectId.users.id.yml'
 components:
   schemas:
     $ref: './shared/spec/schemas/_index.yml'

packages/cli/src/requests.ts

@@ -563,6 +563,7 @@ export declare namespace ProjectRequest {
 		{ name?: string; relations?: ProjectRelationPayload[] }
 	>;
 	type Delete = AuthenticatedRequest<{ projectId: string }, {}, {}, { transferId?: string }>;
+	type DeleteUser = AuthenticatedRequest<{ projectId: string; id: string }, {}, {}, {}>;
 }
 
 // ----------------------------------