Complete preliminary list, update, create group in project

backend/src/ee/services/group/group-service.ts

@@ -154,8 +154,8 @@ export const groupServiceFactory = ({
     return group;
   };
 
-  const getGroupUserMemberships = async ({
-    slug,
+  const listGroupUsers = async ({
+    groupSlug,
     actor,
     actorId,
     orgId,
@@ -167,19 +167,19 @@ export const groupServiceFactory = ({
 
     const group = await groupDAL.findOne({
       orgId,
-      slug
+      slug: groupSlug
     });
 
     if (!group)
       throw new BadRequestError({
-        message: `Failed to find group with slug ${slug}`
+        message: `Failed to find group with slug ${groupSlug}`
       });
 
     const users = await groupDAL.findAllGroupMembers(group.orgId, group.id);
     return users;
   };
 
-  const createGroupUserMemberships = async ({
+  const addUserToGroup = async ({
     groupSlug,
     username,
     actor,
@@ -241,15 +241,15 @@ export const groupServiceFactory = ({
         message: `User ${username} is not part of the organization`
       });
 
-    const t = await userGroupMembershipDAL.create({
+    await userGroupMembershipDAL.create({
       userId: user.id,
       groupId: group.id
     });
 
-    return t;
+    return user;
   };
 
-  const deleteGroupUserMemberships = async ({
+  const removeUserFromGroup = async ({
     groupSlug,
     username,
     actor,
@@ -279,7 +279,6 @@ export const groupServiceFactory = ({
     if (!hasRequiredPriviledges)
       throw new ForbiddenRequestError({ message: "Failed to delete user from more privileged group" });
 
-    // get user with username
     const user = await userDAL.findOne({
       username
     });
@@ -300,20 +299,20 @@ export const groupServiceFactory = ({
         message: `User ${username} is not part of the group ${groupSlug}`
       });
 
-    const t = await userGroupMembershipDAL.delete({
+    await userGroupMembershipDAL.delete({
       groupId: group.id,
       userId: user.id
     });
 
-    return t;
+    return user;
   };
 
   return {
     createGroup,
     updateGroup,
     deleteGroup,
-    getGroupUserMemberships,
-    createGroupUserMemberships,
-    deleteGroupUserMemberships
+    listGroupUsers,
+    addUserToGroup,
+    removeUserFromGroup
   };
 };

backend/src/ee/services/group/group-types.ts

@@ -20,7 +20,7 @@ export type TDeleteGroupDTO = {
 } & TOrgPermission;
 
 export type TGetGroupUserMembershipsDTO = {
-  slug: string;
+  groupSlug: string;
 } & TOrgPermission;
 
 export type TCreateGroupUserMembershipDTO = {

backend/src/ee/services/permission/project-permission.ts

@@ -12,6 +12,7 @@ export enum ProjectPermissionActions {
 export enum ProjectPermissionSub {
   Role = "role",
   Member = "member",
+  Groups = "groups",
   Settings = "settings",
   Integrations = "integrations",
   Webhooks = "webhooks",
@@ -41,6 +42,7 @@ export type ProjectPermissionSet =
   | [ProjectPermissionActions, ProjectPermissionSub.Role]
   | [ProjectPermissionActions, ProjectPermissionSub.Tags]
   | [ProjectPermissionActions, ProjectPermissionSub.Member]
+  | [ProjectPermissionActions, ProjectPermissionSub.Groups]
   | [ProjectPermissionActions, ProjectPermissionSub.Integrations]
   | [ProjectPermissionActions, ProjectPermissionSub.Webhooks]
   | [ProjectPermissionActions, ProjectPermissionSub.AuditLogs]
@@ -82,6 +84,11 @@ const buildAdminPermissionRules = () => {
   can(ProjectPermissionActions.Edit, ProjectPermissionSub.Member);
   can(ProjectPermissionActions.Delete, ProjectPermissionSub.Member);
 
+  can(ProjectPermissionActions.Read, ProjectPermissionSub.Groups);
+  can(ProjectPermissionActions.Create, ProjectPermissionSub.Groups);
+  can(ProjectPermissionActions.Edit, ProjectPermissionSub.Groups);
+  can(ProjectPermissionActions.Delete, ProjectPermissionSub.Groups);
+
   can(ProjectPermissionActions.Read, ProjectPermissionSub.Role);
   can(ProjectPermissionActions.Create, ProjectPermissionSub.Role);
   can(ProjectPermissionActions.Edit, ProjectPermissionSub.Role);
@@ -157,6 +164,8 @@ const buildMemberPermissionRules = () => {
   can(ProjectPermissionActions.Read, ProjectPermissionSub.Member);
   can(ProjectPermissionActions.Create, ProjectPermissionSub.Member);
 
+  can(ProjectPermissionActions.Read, ProjectPermissionSub.Groups);
+
   can(ProjectPermissionActions.Read, ProjectPermissionSub.Integrations);
   can(ProjectPermissionActions.Create, ProjectPermissionSub.Integrations);
   can(ProjectPermissionActions.Edit, ProjectPermissionSub.Integrations);