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

change permission system on client side

Browse source
This commit is contained in:
kriks7iitk 2024-06-13 18:31:29 +05:30
parent ef1d0eb9a3
commit 35769ceff9
2 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/HomePage/HomePage.jsx
View file

@ -299,11 +299,11 @@ class HomePageComponent extends React.Component {
const userPermissions = currentSession.user_permissions;
const appPermission = currentSession.app_group_permissions;
const canUpdateApp =
appPermission && (appPermission.is_all_editable || appPermission.editable_apps_id.include(app?.id));
appPermission && (appPermission.is_all_editable || appPermission.editable_apps_id.includes(app?.id));
const canReadApp =
(appPermission && canUpdateApp) ||
appPermission.is_all_viewable ||
appPermission.viewable_apps_id.include(app?.id);
appPermission.viewable_apps_id.includes(app?.id);
let permissionGrant;
switch (action) {

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

@ -85,41 +85,40 @@ export class UserRoleService {
): Promise<void> {
const { newRole, userId } = editRoleDto;
console.log('Edit role update');
const userRole = await this.groupPermissionsUtilityService.getUserRole(userId, organizationId);
if (!userRole) throw new BadRequestException(ERROR_HANDLER.ADD_GROUP_USER_NON_EXISTING_USER);
const userGroup = userRole.groupUsers[0];
if (userRole.name == newRole)
throw new BadRequestException(ERROR_HANDLER.DEFAULT_GROUP_ADD_USER_ROLE_EXIST(newRole));
if (userRole.name == USER_ROLE.ADMIN) {
const groupUsers = await this.groupPermissionsService.getAllGroupUsers(userRole.id);
console.log(groupUsers);
if (groupUsers.length < 2) throw new BadRequestException(ERROR_HANDLER.EDITING_LAST_ADMIN_ROLE_NOT_ALLOWED);
}
if (newRole == USER_ROLE.END_USER) {
const userCreatedApps = await manager.find(App, {
where: {
userId: userId,
},
});
if (userCreatedApps.length > 0) {
const user = await manager.findOne(User, userGroup.userId);
throw new BadRequestException({
message: {
error: ERROR_HANDLER.USER_IS_OWNER_OF_APPS(user.email),
data: userCreatedApps.map((app) => app.name),
title: 'Can not change user role',
},
});
}
}
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);
const userGroup = userRole.groupUsers[0];
if (userRole.name == newRole)
throw new BadRequestException(ERROR_HANDLER.DEFAULT_GROUP_ADD_USER_ROLE_EXIST(newRole));
if (userRole.name == USER_ROLE.ADMIN) {
const groupUsers = await this.groupPermissionsService.getAllGroupUsers(userRole.id, null, manager);
console.log(groupUsers);
if (groupUsers.length < 2) throw new BadRequestException(ERROR_HANDLER.EDITING_LAST_ADMIN_ROLE_NOT_ALLOWED);
}
if (newRole == USER_ROLE.END_USER) {
const userCreatedApps = await manager.find(App, {
where: {
userId: userId,
},
});
if (userCreatedApps.length > 0) {
const user = await manager.findOne(User, userGroup.userId);
throw new BadRequestException({
message: {
error: ERROR_HANDLER.USER_IS_OWNER_OF_APPS(user.email),
data: userCreatedApps.map((app) => app.name),
title: 'Can not change user role',
},
});
}
}
await this.groupPermissionsService.deleteGroupUser(userGroup.id, manager);
if (newRole == USER_ROLE.END_USER) {
const userGroups = await this.groupPermissionsService.getAllUserGroups(userId, organizationId);
console.log(userGroups);
for (const customUserGroup of userGroups) {
const editPermissionsPresent = Object.values(customUserGroup).some(