diff --git a/src/permission/controllers/permission.controller.ts b/src/permission/controllers/permission.controller.ts index 9b07db2..dfa0c6b 100644 --- a/src/permission/controllers/permission.controller.ts +++ b/src/permission/controllers/permission.controller.ts @@ -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, diff --git a/src/permission/services/permission.service.ts b/src/permission/services/permission.service.ts index 33c5f18..bd43da9 100644 --- a/src/permission/services/permission.service.ts +++ b/src/permission/services/permission.service.ts @@ -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 diff --git a/src/users/services/user-space.service.ts b/src/users/services/user-space.service.ts index 0f905b0..fc15c3d 100644 --- a/src/users/services/user-space.service.ts +++ b/src/users/services/user-space.service.ts @@ -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) {