Update guard usage in controllers

src/auth/controllers/user-auth.controller.ts

@@ -14,9 +14,9 @@ import { UserSignUpDto } from '../dtos/user-auth.dto';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { ResponseMessage } from '../../../libs/common/src/response/response.decorator';
 import { UserLoginDto } from '../dtos/user-login.dto';
-import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard';
 import { ForgetPasswordDto, UserOtpDto, VerifyOtpDto } from '../dtos';
 import { RefreshTokenGuard } from '@app/common/guards/jwt-refresh.auth.guard';
+import { AdminRoleGuard } from 'src/guards/admin.role.guard';
 
 @Controller({
   version: '1',
@@ -52,7 +52,7 @@ export class UserAuthController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AdminRoleGuard)
   @Delete('user/delete/:id')
   async userDelete(@Param('id') id: string) {
     await this.userAuthService.deleteUser(id);
@@ -98,7 +98,7 @@ export class UserAuthController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AdminRoleGuard)
   @Get('user/list')
   async userList() {
     const userList = await this.userAuthService.userList();

src/building/controllers/building.controller.ts

@@ -12,12 +12,13 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { ApiTags, ApiBearerAuth } from '@nestjs/swagger';
-import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard';
 import { AddBuildingDto, AddUserBuildingDto } from '../dtos/add.building.dto';
 import { GetBuildingChildDto } from '../dtos/get.building.dto';
 import { UpdateBuildingNameDto } from '../dtos/update.building.dto';
 import { CheckCommunityTypeGuard } from 'src/guards/community.type.guard';
 import { CheckUserBuildingGuard } from 'src/guards/user.building.guard';
+import { AdminRoleGuard } from 'src/guards/admin.role.guard';
+import { UserRoleGuard } from 'src/guards/user.role.guard';
 
 @ApiTags('Building Module')
 @Controller({
@@ -28,7 +29,7 @@ export class BuildingController {
   constructor(private readonly buildingService: BuildingService) {}
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckCommunityTypeGuard)
+  @UseGuards(AdminRoleGuard, CheckCommunityTypeGuard)
   @Post()
   async addBuilding(@Body() addBuildingDto: AddBuildingDto) {
     try {
@@ -43,7 +44,7 @@ export class BuildingController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get(':buildingUuid')
   async getBuildingByUuid(@Param('buildingUuid') buildingUuid: string) {
     try {
@@ -59,7 +60,7 @@ export class BuildingController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('child/:buildingUuid')
   async getBuildingChildByUuid(
     @Param('buildingUuid') buildingUuid: string,
@@ -79,7 +80,7 @@ export class BuildingController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('parent/:buildingUuid')
   async getBuildingParentByUuid(@Param('buildingUuid') buildingUuid: string) {
     try {
@@ -94,7 +95,7 @@ export class BuildingController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckUserBuildingGuard)
+  @UseGuards(AdminRoleGuard, CheckUserBuildingGuard)
   @Post('user')
   async addUserBuilding(@Body() addUserBuildingDto: AddUserBuildingDto) {
     try {
@@ -108,7 +109,7 @@ export class BuildingController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('user/:userUuid')
   async getBuildingsByUserId(@Param('userUuid') userUuid: string) {
     try {
@@ -122,7 +123,7 @@ export class BuildingController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Put('rename/:buildingUuid')
   async renameBuildingByUuid(
     @Param('buildingUuid') buildingUuid: string,

src/community/controllers/community.controller.ts

@@ -12,7 +12,6 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { ApiTags, ApiBearerAuth } from '@nestjs/swagger';
-import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard';
 import {
   AddCommunityDto,
   AddUserCommunityDto,
@@ -20,6 +19,8 @@ import {
 import { GetCommunityChildDto } from '../dtos/get.community.dto';
 import { UpdateCommunityNameDto } from '../dtos/update.community.dto';
 import { CheckUserCommunityGuard } from 'src/guards/user.community.guard';
+import { AdminRoleGuard } from 'src/guards/admin.role.guard';
+import { UserRoleGuard } from 'src/guards/user.role.guard';
 
 @ApiTags('Community Module')
 @Controller({
@@ -30,7 +31,7 @@ export class CommunityController {
   constructor(private readonly communityService: CommunityService) {}
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AdminRoleGuard)
   @Post()
   async addCommunity(@Body() addCommunityDto: AddCommunityDto) {
     try {
@@ -46,7 +47,7 @@ export class CommunityController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get(':communityUuid')
   async getCommunityByUuid(@Param('communityUuid') communityUuid: string) {
     try {
@@ -62,7 +63,7 @@ export class CommunityController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('child/:communityUuid')
   async getCommunityChildByUuid(
     @Param('communityUuid') communityUuid: string,
@@ -83,7 +84,7 @@ export class CommunityController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('user/:userUuid')
   async getCommunitiesByUserId(@Param('userUuid') userUuid: string) {
     try {
@@ -96,7 +97,7 @@ export class CommunityController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckUserCommunityGuard)
+  @UseGuards(AdminRoleGuard, CheckUserCommunityGuard)
   @Post('user')
   async addUserCommunity(@Body() addUserCommunityDto: AddUserCommunityDto) {
     try {
@@ -110,7 +111,7 @@ export class CommunityController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Put('rename/:communityUuid')
   async renameCommunityByUuid(
     @Param('communityUuid') communityUuid: string,

src/device/controllers/device.controller.ts

@@ -23,9 +23,9 @@ import {
 import { ControlDeviceDto } from '../dtos/control.device.dto';
 import { CheckRoomGuard } from 'src/guards/room.guard';
 import { CheckGroupGuard } from 'src/guards/group.guard';
-import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
 import { CheckUserHavePermission } from 'src/guards/user.device.permission.guard';
 import { CheckUserHaveControllablePermission } from 'src/guards/user.device.controllable.permission.guard';
+import { UserRoleGuard } from 'src/guards/user.role.guard';
 
 @ApiTags('Device Module')
 @Controller({
@@ -36,7 +36,7 @@ export class DeviceController {
   constructor(private readonly deviceService: DeviceService) {}
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckRoomGuard)
+  @UseGuards(UserRoleGuard, CheckRoomGuard)
   @Get('room')
   async getDevicesByRoomId(
     @Query() getDeviceByRoomUuidDto: GetDeviceByRoomUuidDto,
@@ -57,7 +57,7 @@ export class DeviceController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckRoomGuard)
+  @UseGuards(UserRoleGuard, CheckRoomGuard)
   @Post('room')
   async addDeviceInRoom(@Body() addDeviceInRoomDto: AddDeviceInRoomDto) {
     try {
@@ -70,7 +70,7 @@ export class DeviceController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckGroupGuard)
+  @UseGuards(UserRoleGuard, CheckGroupGuard)
   @Get('group')
   async getDevicesByGroupId(
     @Query() getDeviceByGroupIdDto: GetDeviceByGroupIdDto,
@@ -90,7 +90,7 @@ export class DeviceController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckGroupGuard)
+  @UseGuards(UserRoleGuard, CheckGroupGuard)
   @Post('group')
   async addDeviceInGroup(@Body() addDeviceInGroupDto: AddDeviceInGroupDto) {
     try {
@@ -103,7 +103,7 @@ export class DeviceController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckUserHavePermission)
+  @UseGuards(UserRoleGuard, CheckUserHavePermission)
   @Get(':deviceUuid')
   async getDeviceDetailsByDeviceId(
     @Param('deviceUuid') deviceUuid: string,
@@ -123,7 +123,7 @@ export class DeviceController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckUserHavePermission)
+  @UseGuards(UserRoleGuard, CheckUserHavePermission)
   @Get(':deviceUuid/functions')
   async getDeviceInstructionByDeviceId(
     @Param('deviceUuid') deviceUuid: string,
@@ -140,7 +140,7 @@ export class DeviceController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckUserHavePermission)
+  @UseGuards(UserRoleGuard, CheckUserHavePermission)
   @Get(':deviceUuid/functions/status')
   async getDevicesInstructionStatus(@Param('deviceUuid') deviceUuid: string) {
     try {
@@ -154,7 +154,7 @@ export class DeviceController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckUserHaveControllablePermission)
+  @UseGuards(UserRoleGuard, CheckUserHaveControllablePermission)
   @Post(':deviceUuid/control')
   async controlDevice(
     @Body() controlDeviceDto: ControlDeviceDto,

src/floor/controllers/floor.controller.ts

@@ -12,12 +12,13 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { ApiTags, ApiBearerAuth } from '@nestjs/swagger';
-import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard';
 import { AddFloorDto, AddUserFloorDto } from '../dtos/add.floor.dto';
 import { GetFloorChildDto } from '../dtos/get.floor.dto';
 import { UpdateFloorNameDto } from '../dtos/update.floor.dto';
 import { CheckBuildingTypeGuard } from 'src/guards/building.type.guard';
 import { CheckUserFloorGuard } from 'src/guards/user.floor.guard';
+import { UserRoleGuard } from 'src/guards/user.role.guard';
+import { AdminRoleGuard } from 'src/guards/admin.role.guard';
 
 @ApiTags('Floor Module')
 @Controller({
@@ -28,7 +29,7 @@ export class FloorController {
   constructor(private readonly floorService: FloorService) {}
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckBuildingTypeGuard)
+  @UseGuards(AdminRoleGuard, CheckBuildingTypeGuard)
   @Post()
   async addFloor(@Body() addFloorDto: AddFloorDto) {
     try {
@@ -43,7 +44,7 @@ export class FloorController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get(':floorUuid')
   async getFloorByUuid(@Param('floorUuid') floorUuid: string) {
     try {
@@ -58,7 +59,7 @@ export class FloorController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('child/:floorUuid')
   async getFloorChildByUuid(
     @Param('floorUuid') floorUuid: string,
@@ -78,7 +79,7 @@ export class FloorController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('parent/:floorUuid')
   async getFloorParentByUuid(@Param('floorUuid') floorUuid: string) {
     try {
@@ -93,7 +94,7 @@ export class FloorController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckUserFloorGuard)
+  @UseGuards(AdminRoleGuard, CheckUserFloorGuard)
   @Post('user')
   async addUserFloor(@Body() addUserFloorDto: AddUserFloorDto) {
     try {
@@ -108,7 +109,7 @@ export class FloorController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('user/:userUuid')
   async getFloorsByUserId(@Param('userUuid') userUuid: string) {
     try {
@@ -122,7 +123,7 @@ export class FloorController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Put('rename/:floorUuid')
   async renameFloorByUuid(
     @Param('floorUuid') floorUuid: string,

src/group/controllers/group.controller.ts

@@ -12,11 +12,11 @@ import {
   HttpStatus,
 } from '@nestjs/common';
 import { ApiTags, ApiBearerAuth } from '@nestjs/swagger';
-import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard';
 import { AddGroupDto } from '../dtos/add.group.dto';
 import { ControlGroupDto } from '../dtos/control.group.dto';
 import { RenameGroupDto } from '../dtos/rename.group.dto copy';
 import { CheckProductUuidForAllDevicesGuard } from 'src/guards/device.product.guard';
+import { UserRoleGuard } from 'src/guards/user.role.guard';
 
 @ApiTags('Group Module')
 @Controller({
@@ -27,7 +27,7 @@ export class GroupController {
   constructor(private readonly groupService: GroupService) {}
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('space/:spaceUuid')
   async getGroupsBySpaceUuid(@Param('spaceUuid') spaceUuid: string) {
     try {
@@ -40,7 +40,7 @@ export class GroupController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get(':groupUuid')
   async getGroupsByGroupId(@Param('groupUuid') groupUuid: string) {
     try {
@@ -53,7 +53,7 @@ export class GroupController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckProductUuidForAllDevicesGuard)
+  @UseGuards(UserRoleGuard, CheckProductUuidForAllDevicesGuard)
   @Post()
   async addGroup(@Body() addGroupDto: AddGroupDto) {
     try {
@@ -67,7 +67,7 @@ export class GroupController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Post('control')
   async controlGroup(@Body() controlGroupDto: ControlGroupDto) {
     try {
@@ -81,7 +81,7 @@ export class GroupController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Put('rename/:groupUuid')
   async renameGroupByUuid(
     @Param('groupUuid') groupUuid: string,
@@ -101,7 +101,7 @@ export class GroupController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Delete(':groupUuid')
   async deleteGroup(@Param('groupUuid') groupUuid: string) {
     try {

src/role/controllers/role.controller.ts

@@ -10,8 +10,8 @@ import {
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { RoleService } from '../services/role.service';
-import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
 import { UserRoleEditDto } from '../dtos';
+import { AdminRoleGuard } from 'src/guards/admin.role.guard';
 
 @ApiTags('Role Module')
 @Controller({
@@ -21,7 +21,7 @@ import { UserRoleEditDto } from '../dtos';
 export class RoleController {
   constructor(private readonly roleService: RoleService) {}
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AdminRoleGuard)
   @Get('types')
   async fetchRoleTypes() {
     try {
@@ -36,7 +36,7 @@ export class RoleController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AdminRoleGuard)
   @Put('edit/user/:userUuid')
   async editUserRoleType(
     @Param('userUuid') userUuid: string,

src/room/controllers/room.controller.ts

@@ -11,11 +11,12 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { ApiTags, ApiBearerAuth } from '@nestjs/swagger';
-import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard';
 import { AddRoomDto, AddUserRoomDto } from '../dtos/add.room.dto';
 import { UpdateRoomNameDto } from '../dtos/update.room.dto';
 import { CheckUnitTypeGuard } from 'src/guards/unit.type.guard';
 import { CheckUserRoomGuard } from 'src/guards/user.room.guard';
+import { AdminRoleGuard } from 'src/guards/admin.role.guard';
+import { UserRoleGuard } from 'src/guards/user.role.guard';
 
 @ApiTags('Room Module')
 @Controller({
@@ -26,7 +27,7 @@ export class RoomController {
   constructor(private readonly roomService: RoomService) {}
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckUnitTypeGuard)
+  @UseGuards(AdminRoleGuard, CheckUnitTypeGuard)
   @Post()
   async addRoom(@Body() addRoomDto: AddRoomDto) {
     try {
@@ -41,7 +42,7 @@ export class RoomController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get(':roomUuid')
   async getRoomByUuid(@Param('roomUuid') roomUuid: string) {
     try {
@@ -56,7 +57,7 @@ export class RoomController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('parent/:roomUuid')
   async getRoomParentByUuid(@Param('roomUuid') roomUuid: string) {
     try {
@@ -70,7 +71,7 @@ export class RoomController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckUserRoomGuard)
+  @UseGuards(AdminRoleGuard, CheckUserRoomGuard)
   @Post('user')
   async addUserRoom(@Body() addUserRoomDto: AddUserRoomDto) {
     try {
@@ -84,7 +85,7 @@ export class RoomController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('user/:userUuid')
   async getRoomsByUserId(@Param('userUuid') userUuid: string) {
     try {
@@ -98,7 +99,7 @@ export class RoomController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Put('rename/:roomUuid')
   async renameRoomByUuid(
     @Param('roomUuid') roomUuid: string,

src/unit/controllers/unit.controller.ts

@@ -12,12 +12,13 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { ApiTags, ApiBearerAuth } from '@nestjs/swagger';
-import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard';
 import { AddUnitDto, AddUserUnitDto } from '../dtos/add.unit.dto';
 import { GetUnitChildDto } from '../dtos/get.unit.dto';
 import { UpdateUnitNameDto } from '../dtos/update.unit.dto';
 import { CheckFloorTypeGuard } from 'src/guards/floor.type.guard';
 import { CheckUserUnitGuard } from 'src/guards/user.unit.guard';
+import { AdminRoleGuard } from 'src/guards/admin.role.guard';
+import { UserRoleGuard } from 'src/guards/user.role.guard';
 
 @ApiTags('Unit Module')
 @Controller({
@@ -28,7 +29,7 @@ export class UnitController {
   constructor(private readonly unitService: UnitService) {}
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckFloorTypeGuard)
+  @UseGuards(AdminRoleGuard, CheckFloorTypeGuard)
   @Post()
   async addUnit(@Body() addUnitDto: AddUnitDto) {
     try {
@@ -43,7 +44,7 @@ export class UnitController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get(':unitUuid')
   async getUnitByUuid(@Param('unitUuid') unitUuid: string) {
     try {
@@ -58,7 +59,7 @@ export class UnitController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('child/:unitUuid')
   async getUnitChildByUuid(
     @Param('unitUuid') unitUuid: string,
@@ -75,7 +76,7 @@ export class UnitController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('parent/:unitUuid')
   async getUnitParentByUuid(@Param('unitUuid') unitUuid: string) {
     try {
@@ -89,7 +90,7 @@ export class UnitController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard, CheckUserUnitGuard)
+  @UseGuards(AdminRoleGuard, CheckUserUnitGuard)
   @Post('user')
   async addUserUnit(@Body() addUserUnitDto: AddUserUnitDto) {
     try {
@@ -103,7 +104,7 @@ export class UnitController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Get('user/:userUuid')
   async getUnitsByUserId(@Param('userUuid') userUuid: string) {
     try {
@@ -117,7 +118,7 @@ export class UnitController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(UserRoleGuard)
   @Put('rename/:unitUuid')
   async renameUnitByUuid(
     @Param('unitUuid') unitUuid: string,

src/user-device-permission/controllers/user-device-permission.controller.ts

@@ -13,8 +13,8 @@ import {
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { UserDevicePermissionService } from '../services/user-device-permission.service';
 import { UserDevicePermissionAddDto } from '../dtos/user-device-permission.add.dto';
-import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
 import { UserDevicePermissionEditDto } from '../dtos/user-device-permission.edit.dto';
+import { AdminRoleGuard } from 'src/guards/admin.role.guard';
 
 @ApiTags('Device Permission Module')
 @Controller({
@@ -27,7 +27,7 @@ export class UserDevicePermissionController {
   ) {}
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AdminRoleGuard)
   @Post('add')
   async addDevicePermission(
     @Body() userDevicePermissionDto: UserDevicePermissionAddDto,
@@ -51,7 +51,7 @@ export class UserDevicePermissionController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AdminRoleGuard)
   @Put('edit/:devicePermissionUuid')
   async editDevicePermission(
     @Param('devicePermissionUuid') devicePermissionUuid: string,
@@ -75,7 +75,7 @@ export class UserDevicePermissionController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AdminRoleGuard)
   @Get(':deviceUuid/list')
   async fetchDevicePermission(@Param('deviceUuid') deviceUuid: string) {
     try {
@@ -91,7 +91,7 @@ export class UserDevicePermissionController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AdminRoleGuard)
   @Delete(':devicePermissionUuid')
   async deleteDevicePermission(
     @Param('devicePermissionUuid') devicePermissionUuid: string,

src/users/controllers/user.controller.ts

@@ -2,7 +2,7 @@ import { Controller, Get, Query, UseGuards } from '@nestjs/common';
 import { UserService } from '../services/user.service';
 import { UserListDto } from '../dtos/user.list.dto';
 import { ApiTags, ApiBearerAuth } from '@nestjs/swagger';
-import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard';
+import { AdminRoleGuard } from 'src/guards/admin.role.guard';
 
 @ApiTags('User Module')
 @Controller({
@@ -13,7 +13,7 @@ export class UserController {
   constructor(private readonly userService: UserService) {}
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AdminRoleGuard)
   @Get('list')
   async userList(@Query() userListDto: UserListDto) {
     try {