Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

removed log from server

Browse source
This commit is contained in:
kriks7iitk 2024-06-18 12:15:51 +05:30
parent 88e02bdfd3
commit 540bf31f80
9 changed files with 5 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/src/controllers/group_permissions.controller.v2.ts
View file

@ -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, {

5
server/src/modules/user_resource_permissions/services/group-permissions.utility.service.ts
View file

@ -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) => {

4
server/src/modules/user_resource_permissions/utility/group-permissions.utility.ts
View file

@ -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)

20
server/src/services/group_permissions.service.v2.ts
View file

@ -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<GroupUsers> {
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);

3
server/src/services/organization_users.service.ts
View file

@ -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,

13
server/src/services/organizations.service.ts
View file

@ -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);

11
server/src/services/permissions-ability.service.ts
View file

@ -35,9 +35,6 @@ export class AbilityService {
user: User,
resourcePermissionsObject: ResourcePermissionQueryObject
): Promise<UserPermissions> {
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 : [])])),

10
server/src/services/user-role.service.ts
View file

@ -81,8 +81,6 @@ export class UserRoleService {
manager?: EntityManager
): Promise<void> {
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);
}
}

6
server/src/services/users.service.ts
View file

@ -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<void> {
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);