diff --git a/server/src/controllers/group_permissions.controller.v2.ts b/server/src/controllers/group_permissions.controller.v2.ts index 5b541cd38c..92f06a0999 100644 --- a/server/src/controllers/group_permissions.controller.v2.ts +++ b/server/src/controllers/group_permissions.controller.v2.ts @@ -188,9 +188,6 @@ export class GroupPermissionsControllerV2 { // const { groupId } = createGranularPermissionsDto; const granularPermissions = await this.granularPermissionsService.get(granularPermissionsId); - - console.log(granularPermissions); - const group = granularPermissions.group; validateGranularPermissionUpdateOperation(group); return await this.granularPermissionsService.update(granularPermissionsId, { diff --git a/server/src/modules/user_resource_permissions/services/group-permissions.utility.service.ts b/server/src/modules/user_resource_permissions/services/group-permissions.utility.service.ts index 2ab24d66c8..5e85f10898 100644 --- a/server/src/modules/user_resource_permissions/services/group-permissions.utility.service.ts +++ b/server/src/modules/user_resource_permissions/services/group-permissions.utility.service.ts @@ -48,8 +48,6 @@ export class GroupPermissionsUtilityService { async getAddableUser(user: User, groupId: string, searchInput?: string, manager?: EntityManager) { return await dbTransactionWrap(async (manager: EntityManager) => { - console.log(await addableUsersToGroupQuery(groupId, user.organizationId, manager, searchInput).getMany()); - return await addableUsersToGroupQuery(groupId, user.organizationId, manager, searchInput).getMany(); }, manager); } @@ -99,12 +97,9 @@ export class GroupPermissionsUtilityService { manager?: EntityManager ) { const { organizationId, userId, groupsToAddIds } = functionParam; - console.log('validating permissions'); - console.log(groupsToAddIds); return await dbTransactionWrap(async (manager: EntityManager) => { const userRole = await this.getUserRole(userId, organizationId, manager); - console.log(userRole); if (userRole.name === USER_ROLE.END_USER) { return await Promise.all( groupsToAddIds.map(async (id) => { diff --git a/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts b/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts index 86ddc026f8..ad89a6f590 100644 --- a/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts +++ b/server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts @@ -84,10 +84,6 @@ export function validateUpdateGroupOperation( ): void { const { name } = group; const { name: newName } = updateGroupPermissionDto; - - console.log('Printing group'); - console.log(group); - if ( newName && (Object.values(USER_ROLE).includes(newName as USER_ROLE) || group.type == GROUP_PERMISSIONS_TYPE.DEFAULT) diff --git a/server/src/services/group_permissions.service.v2.ts b/server/src/services/group_permissions.service.v2.ts index dd5b33db5e..07a5565344 100644 --- a/server/src/services/group_permissions.service.v2.ts +++ b/server/src/services/group_permissions.service.v2.ts @@ -16,7 +16,6 @@ import { GetUsersResponse, } from '@module/user_resource_permissions/interface/group-permissions.interface'; import { GroupUsers } from 'src/entities/group_users.entity'; -import { GranularPermissionsService } from './granular_permissions.service'; import { getAllUserGroupsQuery, getUserDetailQuery, @@ -28,10 +27,7 @@ import { GroupPermissionsUtilityService } from '@module/user_resource_permission @Injectable() export class GroupPermissionsServiceV2 { - constructor( - private granularPermissionsService: GranularPermissionsService, - private groupPermissionsUtilityService: GroupPermissionsUtilityService - ) {} + constructor(private groupPermissionsUtilityService: GroupPermissionsUtilityService) {} /** * Creates a new group permission for a specified organization. @@ -84,8 +80,6 @@ export class GroupPermissionsServiceV2 { } async updateGroup(id: string, updateGroupPermissionDto: UpdateGroupPermissionDto, manager?: EntityManager) { - //License level validation at controller level - return await dbTransactionWrap(async (manager: EntityManager) => { const { group } = await this.getGroup(id); if (!group) throw new BadRequestException(ERROR_HANDLER.GROUP_NOT_EXIST); @@ -147,19 +141,9 @@ export class GroupPermissionsServiceV2 { } private async createGroupUser(user: User, group: GroupPermissions, manager?: EntityManager): Promise { - console.log(group); - console.log('logging group'); - const createObjec = { - userId: user.id, - groupId: group.id, - }; - console.log(createObjec); - return await dbTransactionWrap(async (manager: EntityManager) => { return await catchDbException(async () => { - const groupUser = manager.create(GroupUsers, createObjec); - console.log(groupUser); - + const groupUser = manager.create(GroupUsers, { groupId: group.id, userId: user.id }); return await manager.save(groupUser); }, [DATA_BASE_CONSTRAINTS.GROUP_USER_UNIQUE]); }, manager); diff --git a/server/src/services/organization_users.service.ts b/server/src/services/organization_users.service.ts index c782dee533..f3035a7107 100644 --- a/server/src/services/organization_users.service.ts +++ b/server/src/services/organization_users.service.ts @@ -100,9 +100,6 @@ export class OrganizationUsersService { } async updateOrgUser(organizationUserId: string, updateUserDto) { - console.log(updateUserDto); - console.log('logging this'); - const organizationUser = await this.organizationUsersRepository.findOne({ where: { id: organizationUserId } }); return await this.usersService.update( organizationUser.userId, diff --git a/server/src/services/organizations.service.ts b/server/src/services/organizations.service.ts index fe89e803d2..4d8ceca736 100644 --- a/server/src/services/organizations.service.ts +++ b/server/src/services/organizations.service.ts @@ -121,8 +121,6 @@ export class OrganizationsService { if (user) { await this.organizationUserService.create(user, organization, false, manager); - console.log('yes this is running'); - await this.userRoleService.addUserRole({ role: USER_ROLE.ADMIN, userId: user.id }, organization.id, manager); } }, manager); @@ -572,17 +570,11 @@ export class OrganizationsService { email: inviteNewUserDto.email, ...getUserStatusAndSource(lifecycleEvents.USER_INVITE), }; - //TODO: Need to add single role as option and same need to be changed on frontend - console.log('invite user'); - console.log(inviteNewUserDto); - const groups = inviteNewUserDto?.groups; const role = inviteNewUserDto.role; return await dbTransactionWrap(async (manager: EntityManager) => { let user = await this.usersService.findByEmail(userParams.email, undefined, undefined, manager); - console.log(user); - if (user?.status === USER_STATUS.ARCHIVED) { throw new BadRequestException(getUserErrorMessages(user.status)); } @@ -612,8 +604,6 @@ export class OrganizationsService { // User not setup shouldSendWelcomeMail = true; } - console.log('default organization'); - console.log(defaultOrganization); user = await this.usersService.create( userParams, @@ -624,9 +614,6 @@ export class OrganizationsService { defaultOrganization?.id, manager ); - - console.log('loggin users'); - if (defaultOrganization) { // Setting up default organization await this.organizationUserService.create(user, defaultOrganization, true, manager); diff --git a/server/src/services/permissions-ability.service.ts b/server/src/services/permissions-ability.service.ts index 4bc0b68d8b..65487bf088 100644 --- a/server/src/services/permissions-ability.service.ts +++ b/server/src/services/permissions-ability.service.ts @@ -35,9 +35,6 @@ export class AbilityService { user: User, resourcePermissionsObject: ResourcePermissionQueryObject ): Promise { - console.log('logging resource object'); - console.log(resourcePermissionsObject); - const permissions = await this.getResourcePermission(user, resourcePermissionsObject); const adminGroup = permissions.find((group) => group.name === USER_ROLE.ADMIN); const appsGranularPermissions = permissions.flatMap((item) => item.groupGranularPermissions); @@ -55,9 +52,6 @@ export class AbilityService { if (resources && resources.some((item) => item.resource === TOOLJET_RESOURCE.APP)) { userPermissions[TOOLJET_RESOURCE.APP] = this.createUserAppsPermissions(appsGranularPermissions); } - console.log('printing user permissions'); - console.log(userPermissions); - return userPermissions; } @@ -65,11 +59,6 @@ export class AbilityService { const userAppsPermissions: UserAppsPermissions = appsGranularPermissions.reduce((acc, permission) => { const appsPermission = permission?.appsGroupPermissions; const groupApps = appsPermission?.groupApps ? appsPermission.groupApps.map((item) => item.appId) : []; - console.log('logging'); - console.log(appsPermission); - console.log(groupApps); - console.log(acc); - return { isAllEditable: acc.isAllEditable || (permission.isAll && appsPermission?.canEdit), editableAppsId: Array.from(new Set([...acc.editableAppsId, ...(appsPermission?.canEdit ? groupApps : [])])), diff --git a/server/src/services/user-role.service.ts b/server/src/services/user-role.service.ts index 5effd8fe30..8f5c7b243a 100644 --- a/server/src/services/user-role.service.ts +++ b/server/src/services/user-role.service.ts @@ -81,8 +81,6 @@ export class UserRoleService { manager?: EntityManager ): Promise { const { newRole, userId } = editRoleDto; - console.log('Edit role update'); - return await dbTransactionWrap(async (manager: EntityManager) => { const userRole = await this.groupPermissionsUtilityService.getUserRole(userId, organizationId); if (!userRole) throw new BadRequestException(ERROR_HANDLER.ADD_GROUP_USER_NON_EXISTING_USER); @@ -126,13 +124,11 @@ export class UserRoleService { const userGroups = await this.groupPermissionsService.getAllUserGroups(userId, organizationId); for (const customUserGroup of userGroups) { - const editPermissionsPresent = Object.values(customUserGroup).some( - (value) => typeof value === 'boolean' && value === true + const editPermissionsPresent = await this.groupPermissionsUtilityService.isEditableGroup( + customUserGroup, + manager ); const groupUsers = customUserGroup.groupUsers; - console.log(groupUsers); - - //NEED TO CHECK FOR ALL GRANULAR PERMISSIONS AS WELL FOR THAT GROUP if (editPermissionsPresent) await this.groupPermissionsService.deleteGroupUser(groupUsers[0].id, manager); } } diff --git a/server/src/services/users.service.ts b/server/src/services/users.service.ts index b28ad49b84..1f60ef21b4 100644 --- a/server/src/services/users.service.ts +++ b/server/src/services/users.service.ts @@ -108,8 +108,6 @@ export class UsersService { await dbTransactionWrap(async (manager: EntityManager) => { if (!existingUser) { - console.log('creating exisitng user'); - user = manager.create(User, { email, firstName, @@ -147,8 +145,6 @@ export class UsersService { manager?: EntityManager ): Promise { if (!groups) return; - console.log('Adding groups'); - console.log(groups); await dbTransactionWrap(async (manager: EntityManager) => { if (groups?.length) await this.groupPermissionsUtilityService.validateEditUserGroupPermissionsAddition( @@ -189,8 +185,6 @@ export class UsersService { await this.removeUserGroupPermissionsIfExists(manager, user, removeGroups, organizationId); if (role) await this.userRoleService.editDefaultGroupUserRole({ userId, newRole: role }, organizationId, manager); - console.log('working till here'); - await this.attachUserGroup(addGroups, organizationId, userId, manager); return user; }, manager);