From 7879d8a76000c014533a97a22bc276afe3ae3e54 Mon Sep 17 00:00:00 2001 From: Midhun G S Date: Thu, 29 Sep 2022 15:43:14 +0530 Subject: [PATCH] Hide user data in group permissions get user API (#4141) * Hide user data from group permission user API * test case fix * fix --- server/src/services/group_permissions.service.ts | 5 +++-- server/test/controllers/group_permissions.e2e-spec.ts | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/src/services/group_permissions.service.ts b/server/src/services/group_permissions.service.ts index f33fd95ba6..99a3751d01 100644 --- a/server/src/services/group_permissions.service.ts +++ b/server/src/services/group_permissions.service.ts @@ -303,8 +303,9 @@ export class GroupPermissionsService { async findUsers(user: User, groupPermissionId: string): Promise { return createQueryBuilder(User, 'users') - .innerJoinAndSelect('users.groupPermissions', 'group_permissions') - .innerJoinAndSelect('users.userGroupPermissions', 'user_group_permissions') + .select(['users.id', 'users.firstName', 'users.lastName', 'users.email']) + .innerJoin('users.groupPermissions', 'group_permissions') + .innerJoin('users.userGroupPermissions', 'user_group_permissions') .where('group_permissions.id = :groupPermissionId', { groupPermissionId, }) diff --git a/server/test/controllers/group_permissions.e2e-spec.ts b/server/test/controllers/group_permissions.e2e-spec.ts index 2b55483991..7627c03bb1 100644 --- a/server/test/controllers/group_permissions.e2e-spec.ts +++ b/server/test/controllers/group_permissions.e2e-spec.ts @@ -628,8 +628,10 @@ describe('group permissions controller', () => { const user = users[0]; expect(users).toHaveLength(1); - expect(user.default_organization_id).toBe(organization.id); + expect(Object.keys(user).sort()).toEqual(['id', 'email', 'first_name', 'last_name'].sort()); expect(user.email).toBe('admin@tooljet.io'); + expect(user.first_name).toBe('test'); + expect(user.last_name).toBe('test'); }); });