ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-07-16 18:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update guard usage in controllers

Browse Source
This commit is contained in:
faris Aljohari
2024-05-07 00:33:04 +03:00
parent 85424554cb
commit 4058449f4b
11 changed files with 72 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/auth/controllers/user-auth.controller.ts
View File

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

17
src/building/controllers/building.controller.ts
View File

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

15
src/community/controllers/community.controller.ts
View File

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

18
src/device/controllers/device.controller.ts
View File

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

17
src/floor/controllers/floor.controller.ts
View File

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

14
src/group/controllers/group.controller.ts
View File

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

6
src/role/controllers/role.controller.ts
View File

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

15
src/room/controllers/room.controller.ts
View File

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

17
src/unit/controllers/unit.controller.ts
View File

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

10
src/user-device-permission/controllers/user-device-permission.controller.ts
View File

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

4
src/users/controllers/user.controller.ts
View File

@ -2,7 +2,7 @@ import { Controller, Get, Query, UseGuards } from '@nestjs/common';
import { UserService } from '../services/user.service'; import { UserService } from '../services/user.service';
import { UserListDto } from '../dtos/user.list.dto'; import { UserListDto } from '../dtos/user.list.dto';
import { ApiTags, ApiBearerAuth } from '@nestjs/swagger'; 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') @ApiTags('User Module')
@Controller({ @Controller({
@ -13,7 +13,7 @@ export class UserController {
constructor(private readonly userService: UserService) {} constructor(private readonly userService: UserService) {}
@ApiBearerAuth() @ApiBearerAuth()
@UseGuards(JwtAuthGuard) @UseGuards(AdminRoleGuard)
@Get('list') @Get('list')
async userList(@Query() userListDto: UserListDto) { async userList(@Query() userListDto: UserListDto) {
try { try {