Merge pull request #215 from SyncrowIOT/fix-issue-related-to-roles-and-invitaion

Fix issue related to roles and invitaion
This commit is contained in:
faris Aljohari
2025-01-14 00:02:36 -06:00
committed by GitHub
3 changed files with 13 additions and 4 deletions

View File

@ -1,8 +1,9 @@
import { Controller, Get, Param } from '@nestjs/common';
import { ApiTags, ApiOperation } from '@nestjs/swagger';
import { Controller, Get, Param, UseGuards } from '@nestjs/common';
import { ApiTags, ApiOperation, ApiBearerAuth } from '@nestjs/swagger';
import { ControllerRoute } from '@app/common/constants/controller-route';
import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
import { PermissionService } from '../services';
import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
@ApiTags('Permission Module')
@Controller({
@ -11,7 +12,8 @@ import { PermissionService } from '../services';
})
export class PermissionController {
constructor(private readonly permissionService: PermissionService) {}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@Get(':roleUuid')
@ApiOperation({
summary: ControllerRoute.PERMISSION.ACTIONS.GET_PERMISSION_BY_ROLE_SUMMARY,

View File

@ -37,7 +37,7 @@ export class PermissionService {
title,
subOptions: Object.entries(subOptions).map(
([subTitle, permissions]) => ({
title: subTitle,
title: `MANAGE_${subTitle}`, // Prepend "MANAGE_" to subTitle
subOptions: permissions.map((permission) => ({
title: permission,
isChecked: rolePermissions.includes(`${subTitle}_${permission}`), // Check if the role has the permission

View File

@ -171,6 +171,13 @@ export class UserSpaceService {
space: { uuid: spaceUuid },
});
await this.inviteUserSpaceRepository.save(inviteUserSpace);
} else {
const inviteUserSpace = this.inviteUserSpaceRepository.create({
inviteUser: { uuid: invitedUserData.uuid },
space: { uuid: spaceUuid },
});
await this.inviteUserSpaceRepository.save(inviteUserSpace);
}
} catch (err) {