From b65bef982d60d052bfbb7a14ef4769b5cbcb86a9 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Mon, 6 May 2024 10:30:29 +0300 Subject: [PATCH 01/16] Add role type enum, dto, entity, repository, and module --- libs/common/src/constants/role.type.enum.ts | 4 ++++ .../common/src/modules/role-type/dtos/index.ts | 1 + .../modules/role-type/dtos/role.type.dto.ts | 11 +++++++++++ .../src/modules/role-type/entities/index.ts | 1 + .../role-type/entities/role.type.entity.ts | 18 ++++++++++++++++++ .../modules/role-type/repositories/index.ts | 1 + .../repositories/role.type.repository.ts | 10 ++++++++++ .../role-type/role.type.repository.module.ts | 11 +++++++++++ 8 files changed, 57 insertions(+) create mode 100644 libs/common/src/constants/role.type.enum.ts create mode 100644 libs/common/src/modules/role-type/dtos/index.ts create mode 100644 libs/common/src/modules/role-type/dtos/role.type.dto.ts create mode 100644 libs/common/src/modules/role-type/entities/index.ts create mode 100644 libs/common/src/modules/role-type/entities/role.type.entity.ts create mode 100644 libs/common/src/modules/role-type/repositories/index.ts create mode 100644 libs/common/src/modules/role-type/repositories/role.type.repository.ts create mode 100644 libs/common/src/modules/role-type/role.type.repository.module.ts diff --git a/libs/common/src/constants/role.type.enum.ts b/libs/common/src/constants/role.type.enum.ts new file mode 100644 index 0000000..34b3929 --- /dev/null +++ b/libs/common/src/constants/role.type.enum.ts @@ -0,0 +1,4 @@ +export enum RoleType { + USER = 'USER', + ADMIN = 'ADMIN', +} diff --git a/libs/common/src/modules/role-type/dtos/index.ts b/libs/common/src/modules/role-type/dtos/index.ts new file mode 100644 index 0000000..6452280 --- /dev/null +++ b/libs/common/src/modules/role-type/dtos/index.ts @@ -0,0 +1 @@ +export * from './role.type.dto'; diff --git a/libs/common/src/modules/role-type/dtos/role.type.dto.ts b/libs/common/src/modules/role-type/dtos/role.type.dto.ts new file mode 100644 index 0000000..77c9c46 --- /dev/null +++ b/libs/common/src/modules/role-type/dtos/role.type.dto.ts @@ -0,0 +1,11 @@ +import { RoleType } from '@app/common/constants/role.type.enum'; +import { IsEnum, IsNotEmpty, IsString } from 'class-validator'; + +export class RoleTypeDto { + @IsString() + @IsNotEmpty() + public uuid: string; + + @IsEnum(RoleType) + public type: RoleType; +} diff --git a/libs/common/src/modules/role-type/entities/index.ts b/libs/common/src/modules/role-type/entities/index.ts new file mode 100644 index 0000000..a6c063c --- /dev/null +++ b/libs/common/src/modules/role-type/entities/index.ts @@ -0,0 +1 @@ +export * from './role.type.entity'; diff --git a/libs/common/src/modules/role-type/entities/role.type.entity.ts b/libs/common/src/modules/role-type/entities/role.type.entity.ts new file mode 100644 index 0000000..974365c --- /dev/null +++ b/libs/common/src/modules/role-type/entities/role.type.entity.ts @@ -0,0 +1,18 @@ +import { Column, Entity } from 'typeorm'; +import { AbstractEntity } from '../../abstract/entities/abstract.entity'; +import { RoleTypeDto } from '../dtos/role.type.dto'; +import { RoleType } from '@app/common/constants/role.type.enum'; + +@Entity({ name: 'role-type' }) +export class RoleTypeEntity extends AbstractEntity { + @Column({ + nullable: false, + enum: Object.values(RoleType), + }) + type: string; + + constructor(partial: Partial) { + super(); + Object.assign(this, partial); + } +} diff --git a/libs/common/src/modules/role-type/repositories/index.ts b/libs/common/src/modules/role-type/repositories/index.ts new file mode 100644 index 0000000..e2581bc --- /dev/null +++ b/libs/common/src/modules/role-type/repositories/index.ts @@ -0,0 +1 @@ +export * from './role.type.repository'; diff --git a/libs/common/src/modules/role-type/repositories/role.type.repository.ts b/libs/common/src/modules/role-type/repositories/role.type.repository.ts new file mode 100644 index 0000000..d21469f --- /dev/null +++ b/libs/common/src/modules/role-type/repositories/role.type.repository.ts @@ -0,0 +1,10 @@ +import { DataSource, Repository } from 'typeorm'; +import { Injectable } from '@nestjs/common'; +import { RoleTypeEntity } from '../entities/role.type.entity'; + +@Injectable() +export class RoleTypeRepository extends Repository { + constructor(private dataSource: DataSource) { + super(RoleTypeEntity, dataSource.createEntityManager()); + } +} diff --git a/libs/common/src/modules/role-type/role.type.repository.module.ts b/libs/common/src/modules/role-type/role.type.repository.module.ts new file mode 100644 index 0000000..85ecc41 --- /dev/null +++ b/libs/common/src/modules/role-type/role.type.repository.module.ts @@ -0,0 +1,11 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { RoleTypeEntity } from './entities/role.type.entity'; + +@Module({ + providers: [], + exports: [], + controllers: [], + imports: [TypeOrmModule.forFeature([RoleTypeEntity])], +}) +export class RoleTypeRepositoryModule {} From 7d6964208cedc7f79c2ad7080eeae0ea6c1af03b Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Mon, 6 May 2024 18:33:49 +0300 Subject: [PATCH 02/16] Add UserRoleEntity and related modules for user role management --- .../role-type/entities/role.type.entity.ts | 10 ++++++-- .../src/modules/user-role/dtos/index.ts | 1 + .../modules/user-role/dtos/user.role.dto.ts | 15 ++++++++++++ .../src/modules/user-role/entities/index.ts | 1 + .../user-role/entities/user.role.entity.ts | 23 +++++++++++++++++++ .../modules/user-role/repositories/index.ts | 1 + .../repositories/user.role.repository.ts | 10 ++++++++ .../user-role/user.role.repository.module.ts | 10 ++++++++ .../src/modules/user/entities/user.entity.ts | 8 +++++++ 9 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 libs/common/src/modules/user-role/dtos/index.ts create mode 100644 libs/common/src/modules/user-role/dtos/user.role.dto.ts create mode 100644 libs/common/src/modules/user-role/entities/index.ts create mode 100644 libs/common/src/modules/user-role/entities/user.role.entity.ts create mode 100644 libs/common/src/modules/user-role/repositories/index.ts create mode 100644 libs/common/src/modules/user-role/repositories/user.role.repository.ts create mode 100644 libs/common/src/modules/user-role/user.role.repository.module.ts diff --git a/libs/common/src/modules/role-type/entities/role.type.entity.ts b/libs/common/src/modules/role-type/entities/role.type.entity.ts index 974365c..c65db72 100644 --- a/libs/common/src/modules/role-type/entities/role.type.entity.ts +++ b/libs/common/src/modules/role-type/entities/role.type.entity.ts @@ -1,7 +1,8 @@ -import { Column, Entity } from 'typeorm'; +import { Column, Entity, OneToMany } from 'typeorm'; import { AbstractEntity } from '../../abstract/entities/abstract.entity'; import { RoleTypeDto } from '../dtos/role.type.dto'; import { RoleType } from '@app/common/constants/role.type.enum'; +import { UserRoleEntity } from '../../user-role/entities'; @Entity({ name: 'role-type' }) export class RoleTypeEntity extends AbstractEntity { @@ -10,7 +11,12 @@ export class RoleTypeEntity extends AbstractEntity { enum: Object.values(RoleType), }) type: string; - + @OneToMany(() => UserRoleEntity, (role) => role.roleType, { + nullable: true, + onDelete: 'CASCADE', + onUpdate: 'CASCADE', + }) + role: UserRoleEntity[]; constructor(partial: Partial) { super(); Object.assign(this, partial); diff --git a/libs/common/src/modules/user-role/dtos/index.ts b/libs/common/src/modules/user-role/dtos/index.ts new file mode 100644 index 0000000..7879674 --- /dev/null +++ b/libs/common/src/modules/user-role/dtos/index.ts @@ -0,0 +1 @@ +export * from './user.role.dto'; diff --git a/libs/common/src/modules/user-role/dtos/user.role.dto.ts b/libs/common/src/modules/user-role/dtos/user.role.dto.ts new file mode 100644 index 0000000..3ff4dab --- /dev/null +++ b/libs/common/src/modules/user-role/dtos/user.role.dto.ts @@ -0,0 +1,15 @@ +import { IsNotEmpty, IsString } from 'class-validator'; + +export class UserRoleDto { + @IsString() + @IsNotEmpty() + public uuid: string; + + @IsString() + @IsNotEmpty() + public userUuid: string; + + @IsString() + @IsNotEmpty() + public roleTypeUuid: string; +} diff --git a/libs/common/src/modules/user-role/entities/index.ts b/libs/common/src/modules/user-role/entities/index.ts new file mode 100644 index 0000000..b6f3bd9 --- /dev/null +++ b/libs/common/src/modules/user-role/entities/index.ts @@ -0,0 +1 @@ +export * from './user.role.entity'; diff --git a/libs/common/src/modules/user-role/entities/user.role.entity.ts b/libs/common/src/modules/user-role/entities/user.role.entity.ts new file mode 100644 index 0000000..e375723 --- /dev/null +++ b/libs/common/src/modules/user-role/entities/user.role.entity.ts @@ -0,0 +1,23 @@ +import { Entity, ManyToOne } from 'typeorm'; +import { AbstractEntity } from '../../abstract/entities/abstract.entity'; +import { UserRoleDto } from '../dtos'; +import { UserEntity } from '../../user/entities'; +import { RoleTypeEntity } from '../../role-type/entities'; + +@Entity({ name: 'user-role' }) +export class UserRoleEntity extends AbstractEntity { + @ManyToOne(() => UserEntity, (user) => user.role, { + nullable: false, + }) + user: UserEntity; + + @ManyToOne(() => RoleTypeEntity, (roleType) => roleType.role, { + nullable: false, + }) + roleType: RoleTypeEntity; + + constructor(partial: Partial) { + super(); + Object.assign(this, partial); + } +} diff --git a/libs/common/src/modules/user-role/repositories/index.ts b/libs/common/src/modules/user-role/repositories/index.ts new file mode 100644 index 0000000..abf7247 --- /dev/null +++ b/libs/common/src/modules/user-role/repositories/index.ts @@ -0,0 +1 @@ +export * from './user.role.repository'; diff --git a/libs/common/src/modules/user-role/repositories/user.role.repository.ts b/libs/common/src/modules/user-role/repositories/user.role.repository.ts new file mode 100644 index 0000000..9bc9a24 --- /dev/null +++ b/libs/common/src/modules/user-role/repositories/user.role.repository.ts @@ -0,0 +1,10 @@ +import { DataSource, Repository } from 'typeorm'; +import { Injectable } from '@nestjs/common'; +import { UserRoleEntity } from '../entities'; + +@Injectable() +export class UserRoleRepository extends Repository { + constructor(private dataSource: DataSource) { + super(UserRoleEntity, dataSource.createEntityManager()); + } +} diff --git a/libs/common/src/modules/user-role/user.role.repository.module.ts b/libs/common/src/modules/user-role/user.role.repository.module.ts new file mode 100644 index 0000000..540787e --- /dev/null +++ b/libs/common/src/modules/user-role/user.role.repository.module.ts @@ -0,0 +1,10 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { UserRoleEntity } from './entities'; +@Module({ + providers: [], + exports: [], + controllers: [], + imports: [TypeOrmModule.forFeature([UserRoleEntity])], +}) +export class UserRoleRepositoryModule {} diff --git a/libs/common/src/modules/user/entities/user.entity.ts b/libs/common/src/modules/user/entities/user.entity.ts index 4268ae8..ffe402c 100644 --- a/libs/common/src/modules/user/entities/user.entity.ts +++ b/libs/common/src/modules/user/entities/user.entity.ts @@ -3,6 +3,7 @@ import { Column, Entity, OneToMany } from 'typeorm'; import { UserDto } from '../dtos'; import { AbstractEntity } from '../../abstract/entities/abstract.entity'; import { UserSpaceEntity } from '../../user-space/entities'; +import { UserRoleEntity } from '../../user-role/entities'; @Entity({ name: 'user' }) export class UserEntity extends AbstractEntity { @@ -57,6 +58,13 @@ export class UserEntity extends AbstractEntity { (userPermission) => userPermission.user, ) userPermission: DeviceUserPermissionEntity[]; + + @OneToMany(() => UserRoleEntity, (role) => role.user, { + nullable: true, + onDelete: 'CASCADE', + onUpdate: 'CASCADE', + }) + role: UserRoleEntity[]; constructor(partial: Partial) { super(); Object.assign(this, partial); From 6bd827fe57bb912c94ee0630ee792ffd2f0fec38 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Mon, 6 May 2024 18:34:03 +0300 Subject: [PATCH 03/16] Add UserRoleEntity and RoleTypeEntity imports to database module --- libs/common/src/database/database.module.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/common/src/database/database.module.ts b/libs/common/src/database/database.module.ts index 146b5ba..ce51bae 100644 --- a/libs/common/src/database/database.module.ts +++ b/libs/common/src/database/database.module.ts @@ -14,6 +14,8 @@ import { UserSpaceEntity } from '../modules/user-space/entities'; import { GroupEntity } from '../modules/group/entities'; import { GroupDeviceEntity } from '../modules/group-device/entities'; import { DeviceUserPermissionEntity } from '../modules/device-user-permission/entities'; +import { UserRoleEntity } from '../modules/user-role/entities'; +import { RoleTypeEntity } from '../modules/role-type/entities'; @Module({ imports: [ @@ -42,6 +44,8 @@ import { DeviceUserPermissionEntity } from '../modules/device-user-permission/en GroupEntity, GroupDeviceEntity, DeviceUserPermissionEntity, + UserRoleEntity, + RoleTypeEntity, ], namingStrategy: new SnakeNamingStrategy(), synchronize: Boolean(JSON.parse(configService.get('DB_SYNC'))), From 1dcb0a3052f099fc6d1b93a453845ae6c5c6dd46 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Mon, 6 May 2024 19:10:24 +0300 Subject: [PATCH 04/16] Add UserRoleRepository and RoleTypeRepository imports --- libs/common/src/auth/services/auth.service.ts | 4 ++ src/auth/auth.module.ts | 4 ++ src/auth/controllers/user-auth.controller.ts | 2 +- src/auth/services/user-auth.service.ts | 41 +++++++++++++++++-- 4 files changed, 47 insertions(+), 4 deletions(-) diff --git a/libs/common/src/auth/services/auth.service.ts b/libs/common/src/auth/services/auth.service.ts index 5e57550..45b19fa 100644 --- a/libs/common/src/auth/services/auth.service.ts +++ b/libs/common/src/auth/services/auth.service.ts @@ -22,7 +22,9 @@ export class AuthService { where: { email, }, + relations: ['role.roleType'], }); + if (!user.isUserVerified) { throw new BadRequestException('User is not verified'); } @@ -68,7 +70,9 @@ export class AuthService { uuid: user.uuid, type: user.type, sessionId: user.sessionId, + roles: user.roles, }; + const tokens = await this.getTokens(payload); await this.updateRefreshToken(user.uuid, tokens.refreshToken); return tokens; diff --git a/src/auth/auth.module.ts b/src/auth/auth.module.ts index 2165d5e..10515e7 100644 --- a/src/auth/auth.module.ts +++ b/src/auth/auth.module.ts @@ -9,6 +9,8 @@ import { UserAuthService } from './services'; import { UserRepository } from '../../libs/common/src/modules/user/repositories'; import { UserSessionRepository } from '../../libs/common/src/modules/session/repositories/session.repository'; import { UserOtpRepository } from '../../libs/common/src/modules/user-otp/repositories/user-otp.repository'; +import { UserRoleRepository } from '@app/common/modules/user-role/repositories'; +import { RoleTypeRepository } from '@app/common/modules/role-type/repositories'; @Module({ imports: [ConfigModule, UserRepositoryModule, CommonModule], @@ -19,6 +21,8 @@ import { UserOtpRepository } from '../../libs/common/src/modules/user-otp/reposi UserRepository, UserSessionRepository, UserOtpRepository, + UserRoleRepository, + RoleTypeRepository, ], exports: [AuthenticationService, UserAuthService], }) diff --git a/src/auth/controllers/user-auth.controller.ts b/src/auth/controllers/user-auth.controller.ts index f8c45f9..3796649 100644 --- a/src/auth/controllers/user-auth.controller.ts +++ b/src/auth/controllers/user-auth.controller.ts @@ -47,7 +47,7 @@ export class UserAuthController { return { statusCode: HttpStatus.CREATED, data: accessToken, - message: 'User Loggedin Successfully', + message: 'User Logged in Successfully', }; } diff --git a/src/auth/services/user-auth.service.ts b/src/auth/services/user-auth.service.ts index 7b278b2..705ba9e 100644 --- a/src/auth/services/user-auth.service.ts +++ b/src/auth/services/user-auth.service.ts @@ -1,3 +1,5 @@ +import { RoleTypeRepository } from './../../../libs/common/src/modules/role-type/repositories/role.type.repository'; +import { UserRoleRepository } from './../../../libs/common/src/modules/user-role/repositories/user.role.repository'; import { UserRepository } from '../../../libs/common/src/modules/user/repositories'; import { BadRequestException, @@ -16,6 +18,7 @@ import { EmailService } from '../../../libs/common/src/util/email.service'; import { OtpType } from '../../../libs/common/src/constants/otp-type.enum'; import { UserEntity } from '../../../libs/common/src/modules/user/entities/user.entity'; import * as argon2 from 'argon2'; +import { RoleType } from '@app/common/constants/role.type.enum'; @Injectable() export class UserAuthService { @@ -26,6 +29,8 @@ export class UserAuthService { private readonly helperHashService: HelperHashService, private readonly authService: AuthService, private readonly emailService: EmailService, + private readonly userRoleRepository: UserRoleRepository, + private readonly roleTypeRepository: RoleTypeRepository, ) {} async signUp(userSignUpDto: UserSignUpDto): Promise { @@ -33,12 +38,31 @@ export class UserAuthService { if (findUser) { throw new BadRequestException('User already registered with given email'); } - const salt = this.helperHashService.randomSalt(10); - const password = this.helperHashService.bcrypt( + const salt = this.helperHashService.randomSalt(10); // Hash the password using bcrypt + const hashedPassword = await this.helperHashService.bcrypt( userSignUpDto.password, salt, ); - return await this.userRepository.save({ ...userSignUpDto, password }); + + try { + const user = await this.userRepository.save({ + ...userSignUpDto, + password: hashedPassword, + }); + + const defaultUserRoleUuid = await this.getRoleUuidByRoleType( + RoleType.USER, + ); + + await this.userRoleRepository.save({ + user: { uuid: user.uuid }, + roleType: { uuid: defaultUserRoleUuid }, + }); + + return user; + } catch (error) { + throw new BadRequestException('Failed to register user'); + } } async findUser(email: string) { @@ -67,6 +91,7 @@ export class UserAuthService { async userLogin(data: UserLoginDto) { const user = await this.authService.validateUser(data.email, data.password); + if (!user) { throw new UnauthorizedException('Invalid login credentials.'); } @@ -89,6 +114,9 @@ export class UserAuthService { email: user.email, userId: user.uuid, uuid: user.uuid, + roles: user.role.map((role) => { + return { uuid: role.uuid, type: role.roleType.type }; + }), sessionId: session[1].uuid, }); } @@ -186,4 +214,11 @@ export class UserAuthService { await this.authService.updateRefreshToken(user.uuid, tokens.refreshToken); return tokens; } + private async getRoleUuidByRoleType(roleType: string) { + const role = await this.roleTypeRepository.findOne({ + where: { type: roleType }, + }); + + return role.uuid; + } } From a093fd3f72176d2615d3c7027d86e44f3935fcad Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Mon, 6 May 2024 23:49:09 +0300 Subject: [PATCH 05/16] Add Role Module with Role Controller, Service, and DTOs --- src/app.module.ts | 2 + src/role/controllers/index.ts | 1 + src/role/controllers/role.controller.ts | 58 +++++++++++++++++++++++++ src/role/dtos/index.ts | 1 + src/role/dtos/role.edit.dto.ts | 13 ++++++ src/role/role.module.ts | 25 +++++++++++ src/role/services/index.ts | 1 + src/role/services/role.service.ts | 44 +++++++++++++++++++ 8 files changed, 145 insertions(+) create mode 100644 src/role/controllers/index.ts create mode 100644 src/role/controllers/role.controller.ts create mode 100644 src/role/dtos/index.ts create mode 100644 src/role/dtos/role.edit.dto.ts create mode 100644 src/role/role.module.ts create mode 100644 src/role/services/index.ts create mode 100644 src/role/services/role.service.ts diff --git a/src/app.module.ts b/src/app.module.ts index 4243057..c9f7275 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -12,6 +12,7 @@ import { CommunityModule } from './community/community.module'; import { BuildingModule } from './building/building.module'; import { FloorModule } from './floor/floor.module'; import { UnitModule } from './unit/unit.module'; +import { RoleModule } from './role/role.module'; @Module({ imports: [ ConfigModule.forRoot({ @@ -19,6 +20,7 @@ import { UnitModule } from './unit/unit.module'; }), AuthenticationModule, UserModule, + RoleModule, CommunityModule, BuildingModule, FloorModule, diff --git a/src/role/controllers/index.ts b/src/role/controllers/index.ts new file mode 100644 index 0000000..fa5a3e4 --- /dev/null +++ b/src/role/controllers/index.ts @@ -0,0 +1 @@ +export * from './role.controller'; diff --git a/src/role/controllers/role.controller.ts b/src/role/controllers/role.controller.ts new file mode 100644 index 0000000..1bc87ce --- /dev/null +++ b/src/role/controllers/role.controller.ts @@ -0,0 +1,58 @@ +import { + Body, + Controller, + Get, + HttpException, + HttpStatus, + Param, + Put, + UseGuards, +} 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'; + +@ApiTags('Role Module') +@Controller({ + version: '1', + path: 'role', +}) +export class RoleController { + constructor(private readonly roleService: RoleService) {} + @ApiBearerAuth() + @UseGuards(JwtAuthGuard) + @Get('types') + async fetchRoleTypes() { + try { + const roleTypes = await this.roleService.fetchRoleTypes(); + return { + statusCode: HttpStatus.OK, + message: 'Role Types fetched Successfully', + data: roleTypes, + }; + } catch (err) { + throw new Error(err); + } + } + @ApiBearerAuth() + @UseGuards(JwtAuthGuard) + @Put('edit/user/:userUuid') + async editUserRoleType( + @Param('userUuid') userUuid: string, + @Body() userRoleEditDto: UserRoleEditDto, + ) { + try { + await this.roleService.editUserRoleType(userUuid, userRoleEditDto); + return { + statusCode: HttpStatus.OK, + message: 'User Role Updated Successfully', + }; + } catch (error) { + throw new HttpException( + error.message || 'Internal server error', + error.status || HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } +} diff --git a/src/role/dtos/index.ts b/src/role/dtos/index.ts new file mode 100644 index 0000000..8fc5216 --- /dev/null +++ b/src/role/dtos/index.ts @@ -0,0 +1 @@ +export * from './role.edit.dto'; diff --git a/src/role/dtos/role.edit.dto.ts b/src/role/dtos/role.edit.dto.ts new file mode 100644 index 0000000..5cd0aac --- /dev/null +++ b/src/role/dtos/role.edit.dto.ts @@ -0,0 +1,13 @@ +import { RoleType } from '@app/common/constants/role.type.enum'; +import { ApiProperty } from '@nestjs/swagger'; +import { IsEnum } from 'class-validator'; + +export class UserRoleEditDto { + @ApiProperty({ + description: 'role type', + enum: RoleType, + required: true, + }) + @IsEnum(RoleType) + roleType: RoleType; +} diff --git a/src/role/role.module.ts b/src/role/role.module.ts new file mode 100644 index 0000000..a487979 --- /dev/null +++ b/src/role/role.module.ts @@ -0,0 +1,25 @@ +import { DeviceRepositoryModule } from '@app/common/modules/device'; +import { DeviceRepository } from '@app/common/modules/device/repositories'; +import { Module } from '@nestjs/common'; +import { ConfigModule } from '@nestjs/config'; +import { RoleService } from './services/role.service'; +import { RoleController } from './controllers/role.controller'; +import { DeviceUserPermissionRepository } from '@app/common/modules/device-user-permission/repositories'; +import { PermissionTypeRepository } from '@app/common/modules/permission/repositories'; +import { RoleTypeRepository } from '@app/common/modules/role-type/repositories'; +import { UserRoleRepository } from '@app/common/modules/user-role/repositories'; + +@Module({ + imports: [ConfigModule, DeviceRepositoryModule], + controllers: [RoleController], + providers: [ + DeviceUserPermissionRepository, + PermissionTypeRepository, + DeviceRepository, + RoleService, + RoleTypeRepository, + UserRoleRepository, + ], + exports: [RoleService], +}) +export class RoleModule {} diff --git a/src/role/services/index.ts b/src/role/services/index.ts new file mode 100644 index 0000000..1adbb54 --- /dev/null +++ b/src/role/services/index.ts @@ -0,0 +1 @@ +export * from './role.service'; diff --git a/src/role/services/role.service.ts b/src/role/services/role.service.ts new file mode 100644 index 0000000..b8db739 --- /dev/null +++ b/src/role/services/role.service.ts @@ -0,0 +1,44 @@ +import { RoleTypeRepository } from './../../../libs/common/src/modules/role-type/repositories/role.type.repository'; +import { HttpException, HttpStatus, Injectable } from '@nestjs/common'; +import { UserRoleEditDto } from '../dtos/role.edit.dto'; +import { UserRoleRepository } from '@app/common/modules/user-role/repositories'; + +@Injectable() +export class RoleService { + constructor( + private readonly roleTypeRepository: RoleTypeRepository, + private readonly userRoleRepository: UserRoleRepository, + ) {} + + async editUserRoleType(userUuid: string, userRoleEditDto: UserRoleEditDto) { + try { + const roleType = await this.fetchRoleByType(userRoleEditDto.roleType); + return await this.userRoleRepository.update( + { user: { uuid: userUuid } }, + { + roleType: { + uuid: roleType.uuid, + }, + }, + ); + } catch (error) { + throw new HttpException( + error.message || 'Internal Server Error', + HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } + + async fetchRoleTypes() { + const roleTypes = await this.roleTypeRepository.find(); + + return roleTypes; + } + private async fetchRoleByType(roleType: string) { + return await this.roleTypeRepository.findOne({ + where: { + type: roleType, + }, + }); + } +} From 85424554cb93baf1a977dc3d85fa1510c46f0c01 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Tue, 7 May 2024 00:32:53 +0300 Subject: [PATCH 06/16] Add roles to user payload in JWT and refresh token strategies --- .../src/auth/interfaces/auth.interface.ts | 1 + .../src/auth/strategies/jwt.strategy.ts | 3 ++- .../auth/strategies/refresh-token.strategy.ts | 3 ++- src/guards/admin.role.guard.ts | 17 +++++++++++++++ src/guards/user.role.guard.ts | 21 +++++++++++++++++++ 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 src/guards/admin.role.guard.ts create mode 100644 src/guards/user.role.guard.ts diff --git a/libs/common/src/auth/interfaces/auth.interface.ts b/libs/common/src/auth/interfaces/auth.interface.ts index ae85fe1..8e57cd6 100644 --- a/libs/common/src/auth/interfaces/auth.interface.ts +++ b/libs/common/src/auth/interfaces/auth.interface.ts @@ -4,4 +4,5 @@ export class AuthInterface { uuid: string; sessionId: string; id: number; + roles: string[]; } diff --git a/libs/common/src/auth/strategies/jwt.strategy.ts b/libs/common/src/auth/strategies/jwt.strategy.ts index 67faecf..ed29a3a 100644 --- a/libs/common/src/auth/strategies/jwt.strategy.ts +++ b/libs/common/src/auth/strategies/jwt.strategy.ts @@ -28,9 +28,10 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') { if (validateUser) { return { email: payload.email, - userId: payload.id, + userUuid: payload.uuid, uuid: payload.uuid, sessionId: payload.sessionId, + roles: payload.roles, }; } else { throw new BadRequestException('Unauthorized'); diff --git a/libs/common/src/auth/strategies/refresh-token.strategy.ts b/libs/common/src/auth/strategies/refresh-token.strategy.ts index 9b21010..ee36eac 100644 --- a/libs/common/src/auth/strategies/refresh-token.strategy.ts +++ b/libs/common/src/auth/strategies/refresh-token.strategy.ts @@ -31,9 +31,10 @@ export class RefreshTokenStrategy extends PassportStrategy( if (validateUser) { return { email: payload.email, - userId: payload.id, + userUuid: payload.uuid, uuid: payload.uuid, sessionId: payload.sessionId, + roles: payload.roles, }; } else { throw new BadRequestException('Unauthorized'); diff --git a/src/guards/admin.role.guard.ts b/src/guards/admin.role.guard.ts new file mode 100644 index 0000000..0c3b259 --- /dev/null +++ b/src/guards/admin.role.guard.ts @@ -0,0 +1,17 @@ +import { RoleType } from '@app/common/constants/role.type.enum'; +import { BadRequestException, UnauthorizedException } from '@nestjs/common'; +import { AuthGuard } from '@nestjs/passport'; + +export class AdminRoleGuard extends AuthGuard('jwt') { + handleRequest(err, user) { + const isAdmin = user.roles.some((role) => role.type === RoleType.ADMIN); + if (err || !user) { + throw err || new UnauthorizedException(); + } else { + if (!isAdmin) { + throw new BadRequestException('Only admin role can access this route'); + } + } + return user; + } +} diff --git a/src/guards/user.role.guard.ts b/src/guards/user.role.guard.ts new file mode 100644 index 0000000..b21632a --- /dev/null +++ b/src/guards/user.role.guard.ts @@ -0,0 +1,21 @@ +import { RoleType } from '@app/common/constants/role.type.enum'; +import { BadRequestException, UnauthorizedException } from '@nestjs/common'; +import { AuthGuard } from '@nestjs/passport'; + +export class UserRoleGuard extends AuthGuard('jwt') { + handleRequest(err, user) { + const isUserOrAdmin = user.roles.some( + (role) => role.type === RoleType.ADMIN || role.type === RoleType.USER, + ); + if (err || !user) { + throw err || new UnauthorizedException(); + } else { + if (!isUserOrAdmin) { + throw new BadRequestException( + 'Only admin or user role can access this route', + ); + } + } + return user; + } +} From 4058449f4b591d860faf057135aaec3546f0a8af Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Tue, 7 May 2024 00:33:04 +0300 Subject: [PATCH 07/16] Update guard usage in controllers --- src/auth/controllers/user-auth.controller.ts | 6 +++--- .../controllers/building.controller.ts | 17 +++++++++-------- .../controllers/community.controller.ts | 15 ++++++++------- src/device/controllers/device.controller.ts | 18 +++++++++--------- src/floor/controllers/floor.controller.ts | 17 +++++++++-------- src/group/controllers/group.controller.ts | 14 +++++++------- src/role/controllers/role.controller.ts | 6 +++--- src/room/controllers/room.controller.ts | 15 ++++++++------- src/unit/controllers/unit.controller.ts | 17 +++++++++-------- .../user-device-permission.controller.ts | 10 +++++----- src/users/controllers/user.controller.ts | 4 ++-- 11 files changed, 72 insertions(+), 67 deletions(-) diff --git a/src/auth/controllers/user-auth.controller.ts b/src/auth/controllers/user-auth.controller.ts index 3796649..fd139f9 100644 --- a/src/auth/controllers/user-auth.controller.ts +++ b/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(); diff --git a/src/building/controllers/building.controller.ts b/src/building/controllers/building.controller.ts index dc4dbd7..b561ff9 100644 --- a/src/building/controllers/building.controller.ts +++ b/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, diff --git a/src/community/controllers/community.controller.ts b/src/community/controllers/community.controller.ts index 3fd2233..144041d 100644 --- a/src/community/controllers/community.controller.ts +++ b/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, diff --git a/src/device/controllers/device.controller.ts b/src/device/controllers/device.controller.ts index d8149a7..7ebf1ca 100644 --- a/src/device/controllers/device.controller.ts +++ b/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, diff --git a/src/floor/controllers/floor.controller.ts b/src/floor/controllers/floor.controller.ts index a42db7b..2fd9dfc 100644 --- a/src/floor/controllers/floor.controller.ts +++ b/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, diff --git a/src/group/controllers/group.controller.ts b/src/group/controllers/group.controller.ts index 0f74ff6..c00ff92 100644 --- a/src/group/controllers/group.controller.ts +++ b/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 { diff --git a/src/role/controllers/role.controller.ts b/src/role/controllers/role.controller.ts index 1bc87ce..ebabe93 100644 --- a/src/role/controllers/role.controller.ts +++ b/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, diff --git a/src/room/controllers/room.controller.ts b/src/room/controllers/room.controller.ts index 221fb39..d39b584 100644 --- a/src/room/controllers/room.controller.ts +++ b/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, diff --git a/src/unit/controllers/unit.controller.ts b/src/unit/controllers/unit.controller.ts index f0f3775..c42793c 100644 --- a/src/unit/controllers/unit.controller.ts +++ b/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, diff --git a/src/user-device-permission/controllers/user-device-permission.controller.ts b/src/user-device-permission/controllers/user-device-permission.controller.ts index fef4cc7..2f68708 100644 --- a/src/user-device-permission/controllers/user-device-permission.controller.ts +++ b/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, diff --git a/src/users/controllers/user.controller.ts b/src/users/controllers/user.controller.ts index 4620cd0..09518e8 100644 --- a/src/users/controllers/user.controller.ts +++ b/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 { From c30a21b04f5d81042e6952a01774f4b10721e864 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Tue, 7 May 2024 09:48:16 +0300 Subject: [PATCH 08/16] Add Unique constraint to user and roleType fields in UserRoleEntity --- libs/common/src/modules/user-role/entities/user.role.entity.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/common/src/modules/user-role/entities/user.role.entity.ts b/libs/common/src/modules/user-role/entities/user.role.entity.ts index e375723..34b49c4 100644 --- a/libs/common/src/modules/user-role/entities/user.role.entity.ts +++ b/libs/common/src/modules/user-role/entities/user.role.entity.ts @@ -1,10 +1,11 @@ -import { Entity, ManyToOne } from 'typeorm'; +import { Entity, ManyToOne, Unique } from 'typeorm'; import { AbstractEntity } from '../../abstract/entities/abstract.entity'; import { UserRoleDto } from '../dtos'; import { UserEntity } from '../../user/entities'; import { RoleTypeEntity } from '../../role-type/entities'; @Entity({ name: 'user-role' }) +@Unique(['user', 'roleType']) export class UserRoleEntity extends AbstractEntity { @ManyToOne(() => UserEntity, (user) => user.role, { nullable: false, From d1fa15cff1cfbd6716799fc60f6578353abae2ec Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Sat, 11 May 2024 21:01:39 +0300 Subject: [PATCH 09/16] Update role types in enums and role guards --- libs/common/src/constants/role.type.enum.ts | 3 ++- src/guards/admin.role.guard.ts | 5 ++++- src/guards/user.role.guard.ts | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libs/common/src/constants/role.type.enum.ts b/libs/common/src/constants/role.type.enum.ts index 34b3929..72bf14e 100644 --- a/libs/common/src/constants/role.type.enum.ts +++ b/libs/common/src/constants/role.type.enum.ts @@ -1,4 +1,5 @@ export enum RoleType { - USER = 'USER', + SUPER_ADMIN = 'SUPER_ADMIN', ADMIN = 'ADMIN', + USER = 'USER', } diff --git a/src/guards/admin.role.guard.ts b/src/guards/admin.role.guard.ts index 0c3b259..fc26067 100644 --- a/src/guards/admin.role.guard.ts +++ b/src/guards/admin.role.guard.ts @@ -4,7 +4,10 @@ import { AuthGuard } from '@nestjs/passport'; export class AdminRoleGuard extends AuthGuard('jwt') { handleRequest(err, user) { - const isAdmin = user.roles.some((role) => role.type === RoleType.ADMIN); + const isAdmin = user.roles.some( + (role) => + role.type === RoleType.SUPER_ADMIN || role.type === RoleType.ADMIN, + ); if (err || !user) { throw err || new UnauthorizedException(); } else { diff --git a/src/guards/user.role.guard.ts b/src/guards/user.role.guard.ts index b21632a..4864fe0 100644 --- a/src/guards/user.role.guard.ts +++ b/src/guards/user.role.guard.ts @@ -5,7 +5,10 @@ import { AuthGuard } from '@nestjs/passport'; export class UserRoleGuard extends AuthGuard('jwt') { handleRequest(err, user) { const isUserOrAdmin = user.roles.some( - (role) => role.type === RoleType.ADMIN || role.type === RoleType.USER, + (role) => + role.type === RoleType.SUPER_ADMIN || + role.type === RoleType.ADMIN || + role.type === RoleType.USER, ); if (err || !user) { throw err || new UnauthorizedException(); From 3e9fff3822e44f8d855b0f9a8efdf7072283436b Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Sat, 11 May 2024 21:02:25 +0300 Subject: [PATCH 10/16] Add super admin configuration and service --- libs/common/src/config/index.ts | 3 +- libs/common/src/config/super.admin.config.ts | 9 +++ libs/common/src/helper/helper.module.ts | 25 ++++++- .../helper/services/super.admin.sarvice.ts | 72 +++++++++++++++++++ src/main.ts | 4 ++ 5 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 libs/common/src/config/super.admin.config.ts create mode 100644 libs/common/src/helper/services/super.admin.sarvice.ts diff --git a/libs/common/src/config/index.ts b/libs/common/src/config/index.ts index 94380ce..d4cbbdb 100644 --- a/libs/common/src/config/index.ts +++ b/libs/common/src/config/index.ts @@ -1,2 +1,3 @@ import emailConfig from './email.config'; -export default [emailConfig]; +import superAdminConfig from './super.admin.config'; +export default [emailConfig, superAdminConfig]; diff --git a/libs/common/src/config/super.admin.config.ts b/libs/common/src/config/super.admin.config.ts new file mode 100644 index 0000000..90a156e --- /dev/null +++ b/libs/common/src/config/super.admin.config.ts @@ -0,0 +1,9 @@ +import { registerAs } from '@nestjs/config'; + +export default registerAs( + 'super-admin', + (): Record => ({ + SUPER_ADMIN_EMAIL: process.env.SUPER_ADMIN_EMAIL, + SUPER_ADMIN_PASSWORD: process.env.SUPER_ADMIN_PASSWORD, + }), +); diff --git a/libs/common/src/helper/helper.module.ts b/libs/common/src/helper/helper.module.ts index 826883a..f5fc400 100644 --- a/libs/common/src/helper/helper.module.ts +++ b/libs/common/src/helper/helper.module.ts @@ -1,11 +1,30 @@ import { Global, Module } from '@nestjs/common'; import { HelperHashService } from './services'; +import { UserRepository } from '../modules/user/repositories'; +import { UserRepositoryModule } from '../modules/user/user.repository.module'; +import { UserRoleRepository } from '../modules/user-role/repositories'; +import { UserRoleRepositoryModule } from '../modules/user-role/user.role.repository.module'; +import { RoleTypeRepository } from '../modules/role-type/repositories'; +import { RoleTypeRepositoryModule } from '../modules/role-type/role.type.repository.module'; +import { ConfigModule } from '@nestjs/config'; +import { SuperAdminService } from './services/super.admin.sarvice'; @Global() @Module({ - providers: [HelperHashService], - exports: [HelperHashService], + providers: [ + HelperHashService, + SuperAdminService, + UserRepository, + UserRoleRepository, + RoleTypeRepository, + ], + exports: [HelperHashService, SuperAdminService], controllers: [], - imports: [], + imports: [ + ConfigModule.forRoot(), + UserRepositoryModule, + UserRoleRepositoryModule, + RoleTypeRepositoryModule, + ], }) export class HelperModule {} diff --git a/libs/common/src/helper/services/super.admin.sarvice.ts b/libs/common/src/helper/services/super.admin.sarvice.ts new file mode 100644 index 0000000..e9efbce --- /dev/null +++ b/libs/common/src/helper/services/super.admin.sarvice.ts @@ -0,0 +1,72 @@ +import { HelperHashService } from './helper.hash.service'; +import { Injectable } from '@nestjs/common'; +import { UserRepository } from '@app/common/modules/user/repositories'; +import { RoleType } from '@app/common/constants/role.type.enum'; +import { UserRoleRepository } from '@app/common/modules/user-role/repositories'; +import { RoleTypeRepository } from '@app/common/modules/role-type/repositories'; +import { ConfigService } from '@nestjs/config'; + +@Injectable() +export class SuperAdminService { + constructor( + private readonly configService: ConfigService, + private readonly userRepository: UserRepository, + private readonly userRoleRepository: UserRoleRepository, + private readonly roleTypeRepository: RoleTypeRepository, + private readonly helperHashService: HelperHashService, + ) {} + + async createSuperAdminIfNotFound(): Promise { + try { + const superAdminData = await this.userRoleRepository.find({ + where: { roleType: { type: RoleType.SUPER_ADMIN } }, + relations: ['roleType'], + }); + + if (superAdminData.length <= 0) { + // Create the super admin user if not found + console.log('Creating super admin user...'); + + await this.createSuperAdmin(); + } + } catch (err) { + console.error('Error while checking super admin:', err); + throw err; + } + } + private async getRoleUuidByRoleType(roleType: string) { + const role = await this.roleTypeRepository.findOne({ + where: { type: roleType }, + }); + + return role.uuid; + } + private async createSuperAdmin(): Promise { + const salt = this.helperHashService.randomSalt(10); // Hash the password using bcrypt + const hashedPassword = await this.helperHashService.bcrypt( + this.configService.get('super-admin.SUPER_ADMIN_PASSWORD'), + salt, + ); + try { + const user = await this.userRepository.save({ + email: this.configService.get('super-admin.SUPER_ADMIN_EMAIL'), + password: hashedPassword, + firstName: 'Super', + lastName: 'Admin', + isUserVerified: true, + isActive: true, + }); + const defaultUserRoleUuid = await this.getRoleUuidByRoleType( + RoleType.SUPER_ADMIN, + ); + + await this.userRoleRepository.save({ + user: { uuid: user.uuid }, + roleType: { uuid: defaultUserRoleUuid }, + }); + } catch (err) { + console.error('Error while creating super admin:', err); + throw err; + } + } +} diff --git a/src/main.ts b/src/main.ts index 129f319..61dfb92 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,6 +4,7 @@ import rateLimit from 'express-rate-limit'; import helmet from 'helmet'; import { setupSwaggerAuthentication } from '../libs/common/src/util/user-auth.swagger.utils'; import { ValidationPipe } from '@nestjs/common'; +import { SuperAdminService } from '@app/common/helper/services/super.admin.sarvice'; async function bootstrap() { const app = await NestFactory.create(AuthModule); @@ -33,6 +34,9 @@ async function bootstrap() { }, }), ); + // Create super admin user + const superAdminService = app.get(SuperAdminService); + await superAdminService.createSuperAdminIfNotFound(); await app.listen(process.env.PORT || 4000); } From e7024a5cb86fd773d904306902046b8f0adee148 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Sat, 11 May 2024 21:02:35 +0300 Subject: [PATCH 11/16] Add Unique constraint to 'type' column in RoleTypeEntity --- libs/common/src/modules/role-type/entities/role.type.entity.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/common/src/modules/role-type/entities/role.type.entity.ts b/libs/common/src/modules/role-type/entities/role.type.entity.ts index c65db72..0621b7d 100644 --- a/libs/common/src/modules/role-type/entities/role.type.entity.ts +++ b/libs/common/src/modules/role-type/entities/role.type.entity.ts @@ -1,10 +1,11 @@ -import { Column, Entity, OneToMany } from 'typeorm'; +import { Column, Entity, OneToMany, Unique } from 'typeorm'; import { AbstractEntity } from '../../abstract/entities/abstract.entity'; import { RoleTypeDto } from '../dtos/role.type.dto'; import { RoleType } from '@app/common/constants/role.type.enum'; import { UserRoleEntity } from '../../user-role/entities'; @Entity({ name: 'role-type' }) +@Unique(['type']) export class RoleTypeEntity extends AbstractEntity { @Column({ nullable: false, From ea19361a5995a0009e3c30ce37bcec18bb7ca1a1 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Sat, 11 May 2024 21:19:53 +0300 Subject: [PATCH 12/16] Update role guards to differentiate between admin and super admin roles --- src/auth/controllers/user-auth.controller.ts | 6 +++--- src/guards/admin.role.guard.ts | 8 ++++---- src/guards/super.admin.role.guard.ts | 21 ++++++++++++++++++++ src/guards/user.role.guard.ts | 12 +++++------ src/role/controllers/role.controller.ts | 6 +++--- src/role/dtos/role.edit.dto.ts | 9 ++++++--- 6 files changed, 43 insertions(+), 19 deletions(-) create mode 100644 src/guards/super.admin.role.guard.ts diff --git a/src/auth/controllers/user-auth.controller.ts b/src/auth/controllers/user-auth.controller.ts index fd139f9..86f9ce6 100644 --- a/src/auth/controllers/user-auth.controller.ts +++ b/src/auth/controllers/user-auth.controller.ts @@ -16,7 +16,7 @@ import { ResponseMessage } from '../../../libs/common/src/response/response.deco import { UserLoginDto } from '../dtos/user-login.dto'; import { ForgetPasswordDto, UserOtpDto, VerifyOtpDto } from '../dtos'; import { RefreshTokenGuard } from '@app/common/guards/jwt-refresh.auth.guard'; -import { AdminRoleGuard } from 'src/guards/admin.role.guard'; +import { SuperAdminRoleGuard } from 'src/guards/super.admin.role.guard'; @Controller({ version: '1', @@ -52,7 +52,7 @@ export class UserAuthController { } @ApiBearerAuth() - @UseGuards(AdminRoleGuard) + @UseGuards(SuperAdminRoleGuard) @Delete('user/delete/:id') async userDelete(@Param('id') id: string) { await this.userAuthService.deleteUser(id); @@ -98,7 +98,7 @@ export class UserAuthController { } @ApiBearerAuth() - @UseGuards(AdminRoleGuard) + @UseGuards(SuperAdminRoleGuard) @Get('user/list') async userList() { const userList = await this.userAuthService.userList(); diff --git a/src/guards/admin.role.guard.ts b/src/guards/admin.role.guard.ts index fc26067..f7d64a0 100644 --- a/src/guards/admin.role.guard.ts +++ b/src/guards/admin.role.guard.ts @@ -4,13 +4,13 @@ import { AuthGuard } from '@nestjs/passport'; export class AdminRoleGuard extends AuthGuard('jwt') { handleRequest(err, user) { - const isAdmin = user.roles.some( - (role) => - role.type === RoleType.SUPER_ADMIN || role.type === RoleType.ADMIN, - ); if (err || !user) { throw err || new UnauthorizedException(); } else { + const isAdmin = user.roles.some( + (role) => + role.type === RoleType.SUPER_ADMIN || role.type === RoleType.ADMIN, + ); if (!isAdmin) { throw new BadRequestException('Only admin role can access this route'); } diff --git a/src/guards/super.admin.role.guard.ts b/src/guards/super.admin.role.guard.ts new file mode 100644 index 0000000..ef93a75 --- /dev/null +++ b/src/guards/super.admin.role.guard.ts @@ -0,0 +1,21 @@ +import { RoleType } from '@app/common/constants/role.type.enum'; +import { BadRequestException, UnauthorizedException } from '@nestjs/common'; +import { AuthGuard } from '@nestjs/passport'; + +export class SuperAdminRoleGuard extends AuthGuard('jwt') { + handleRequest(err, user) { + if (err || !user) { + throw err || new UnauthorizedException(); + } else { + const isSuperAdmin = user.roles.some( + (role) => role.type === RoleType.SUPER_ADMIN, + ); + if (!isSuperAdmin) { + throw new BadRequestException( + 'Only super admin role can access this route', + ); + } + } + return user; + } +} diff --git a/src/guards/user.role.guard.ts b/src/guards/user.role.guard.ts index 4864fe0..59abad8 100644 --- a/src/guards/user.role.guard.ts +++ b/src/guards/user.role.guard.ts @@ -4,15 +4,15 @@ import { AuthGuard } from '@nestjs/passport'; export class UserRoleGuard extends AuthGuard('jwt') { handleRequest(err, user) { - const isUserOrAdmin = user.roles.some( - (role) => - role.type === RoleType.SUPER_ADMIN || - role.type === RoleType.ADMIN || - role.type === RoleType.USER, - ); if (err || !user) { throw err || new UnauthorizedException(); } else { + const isUserOrAdmin = user.roles.some( + (role) => + role.type === RoleType.SUPER_ADMIN || + role.type === RoleType.ADMIN || + role.type === RoleType.USER, + ); if (!isUserOrAdmin) { throw new BadRequestException( 'Only admin or user role can access this route', diff --git a/src/role/controllers/role.controller.ts b/src/role/controllers/role.controller.ts index ebabe93..2a6c917 100644 --- a/src/role/controllers/role.controller.ts +++ b/src/role/controllers/role.controller.ts @@ -11,7 +11,7 @@ import { import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { RoleService } from '../services/role.service'; import { UserRoleEditDto } from '../dtos'; -import { AdminRoleGuard } from 'src/guards/admin.role.guard'; +import { SuperAdminRoleGuard } from 'src/guards/super.admin.role.guard'; @ApiTags('Role Module') @Controller({ @@ -21,7 +21,7 @@ import { AdminRoleGuard } from 'src/guards/admin.role.guard'; export class RoleController { constructor(private readonly roleService: RoleService) {} @ApiBearerAuth() - @UseGuards(AdminRoleGuard) + @UseGuards(SuperAdminRoleGuard) @Get('types') async fetchRoleTypes() { try { @@ -36,7 +36,7 @@ export class RoleController { } } @ApiBearerAuth() - @UseGuards(AdminRoleGuard) + @UseGuards(SuperAdminRoleGuard) @Put('edit/user/:userUuid') async editUserRoleType( @Param('userUuid') userUuid: string, diff --git a/src/role/dtos/role.edit.dto.ts b/src/role/dtos/role.edit.dto.ts index 5cd0aac..9e9b394 100644 --- a/src/role/dtos/role.edit.dto.ts +++ b/src/role/dtos/role.edit.dto.ts @@ -1,13 +1,16 @@ import { RoleType } from '@app/common/constants/role.type.enum'; import { ApiProperty } from '@nestjs/swagger'; -import { IsEnum } from 'class-validator'; +import { IsEnum, IsIn } from 'class-validator'; export class UserRoleEditDto { @ApiProperty({ - description: 'role type', - enum: RoleType, + description: 'Role type (USER or ADMIN)', + enum: [RoleType.USER, RoleType.ADMIN], required: true, }) @IsEnum(RoleType) + @IsIn([RoleType.USER, RoleType.ADMIN], { + message: 'roleType must be one of the following values: USER, ADMIN', + }) roleType: RoleType; } From ad15164e15c8802a194adb8f462f271a3794b12d Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Sat, 18 May 2024 21:53:27 +0300 Subject: [PATCH 13/16] feat: Add seeder module and services for all lookup tables --- libs/common/src/constants/space-type.enum.ts | 7 +++ libs/common/src/helper/helper.module.ts | 25 ++------- libs/common/src/seed/seeder.module.ts | 43 +++++++++++++++ .../seed/services/permission.type.seeder.ts | 49 +++++++++++++++++ .../src/seed/services/role.type.seeder.ts | 46 ++++++++++++++++ .../src/seed/services/seeder.service.ts | 21 ++++++++ .../src/seed/services/space.type.seeder.ts | 52 +++++++++++++++++++ .../services/supper.admin.seeder.ts} | 4 +- src/app.module.ts | 2 + src/main.ts | 12 +++-- 10 files changed, 233 insertions(+), 28 deletions(-) create mode 100644 libs/common/src/constants/space-type.enum.ts create mode 100644 libs/common/src/seed/seeder.module.ts create mode 100644 libs/common/src/seed/services/permission.type.seeder.ts create mode 100644 libs/common/src/seed/services/role.type.seeder.ts create mode 100644 libs/common/src/seed/services/seeder.service.ts create mode 100644 libs/common/src/seed/services/space.type.seeder.ts rename libs/common/src/{helper/services/super.admin.sarvice.ts => seed/services/supper.admin.seeder.ts} (96%) diff --git a/libs/common/src/constants/space-type.enum.ts b/libs/common/src/constants/space-type.enum.ts new file mode 100644 index 0000000..22688e7 --- /dev/null +++ b/libs/common/src/constants/space-type.enum.ts @@ -0,0 +1,7 @@ +export enum SpaceType { + COMMUNITY = 'community', + BUILDING = 'building', + FLOOR = 'floor', + UNIT = 'unit', + ROOM = 'room', +} diff --git a/libs/common/src/helper/helper.module.ts b/libs/common/src/helper/helper.module.ts index f5fc400..826883a 100644 --- a/libs/common/src/helper/helper.module.ts +++ b/libs/common/src/helper/helper.module.ts @@ -1,30 +1,11 @@ import { Global, Module } from '@nestjs/common'; import { HelperHashService } from './services'; -import { UserRepository } from '../modules/user/repositories'; -import { UserRepositoryModule } from '../modules/user/user.repository.module'; -import { UserRoleRepository } from '../modules/user-role/repositories'; -import { UserRoleRepositoryModule } from '../modules/user-role/user.role.repository.module'; -import { RoleTypeRepository } from '../modules/role-type/repositories'; -import { RoleTypeRepositoryModule } from '../modules/role-type/role.type.repository.module'; -import { ConfigModule } from '@nestjs/config'; -import { SuperAdminService } from './services/super.admin.sarvice'; @Global() @Module({ - providers: [ - HelperHashService, - SuperAdminService, - UserRepository, - UserRoleRepository, - RoleTypeRepository, - ], - exports: [HelperHashService, SuperAdminService], + providers: [HelperHashService], + exports: [HelperHashService], controllers: [], - imports: [ - ConfigModule.forRoot(), - UserRepositoryModule, - UserRoleRepositoryModule, - RoleTypeRepositoryModule, - ], + imports: [], }) export class HelperModule {} diff --git a/libs/common/src/seed/seeder.module.ts b/libs/common/src/seed/seeder.module.ts new file mode 100644 index 0000000..a6e2585 --- /dev/null +++ b/libs/common/src/seed/seeder.module.ts @@ -0,0 +1,43 @@ +import { Global, Module } from '@nestjs/common'; +import { SeederService } from './services/seeder.service'; +import { PermissionTypeRepository } from '../modules/permission/repositories'; +import { PermissionTypeSeeder } from './services/permission.type.seeder'; +import { PermissionTypeRepositoryModule } from '../modules/permission/permission.repository.module'; +import { ConfigModule } from '@nestjs/config'; +import { RoleTypeRepositoryModule } from '../modules/role-type/role.type.repository.module'; +import { RoleTypeRepository } from '../modules/role-type/repositories'; +import { RoleTypeSeeder } from './services/role.type.seeder'; +import { SpaceTypeRepository } from '../modules/space-type/repositories'; +import { SpaceTypeSeeder } from './services/space.type.seeder'; +import { SpaceTypeRepositoryModule } from '../modules/space-type/space.type.repository.module'; +import { SuperAdminSeeder } from './services/supper.admin.seeder'; +import { UserRepository } from '../modules/user/repositories'; +import { UserRoleRepository } from '../modules/user-role/repositories'; +import { UserRoleRepositoryModule } from '../modules/user-role/user.role.repository.module'; +import { UserRepositoryModule } from '../modules/user/user.repository.module'; +@Global() +@Module({ + providers: [ + PermissionTypeSeeder, + RoleTypeSeeder, + SpaceTypeSeeder, + SeederService, + PermissionTypeRepository, + RoleTypeRepository, + SpaceTypeRepository, + SuperAdminSeeder, + UserRepository, + UserRoleRepository, + ], + exports: [SeederService], + controllers: [], + imports: [ + ConfigModule.forRoot(), + PermissionTypeRepositoryModule, + RoleTypeRepositoryModule, + UserRepositoryModule, + UserRoleRepositoryModule, + SpaceTypeRepositoryModule, + ], +}) +export class SeederModule {} diff --git a/libs/common/src/seed/services/permission.type.seeder.ts b/libs/common/src/seed/services/permission.type.seeder.ts new file mode 100644 index 0000000..537bddb --- /dev/null +++ b/libs/common/src/seed/services/permission.type.seeder.ts @@ -0,0 +1,49 @@ +import { Injectable } from '@nestjs/common'; +import { PermissionTypeRepository } from '../../modules/permission/repositories'; +import { PermissionType } from '../../constants/permission-type.enum'; + +@Injectable() +export class PermissionTypeSeeder { + constructor( + private readonly permissionTypeRepository: PermissionTypeRepository, + ) {} + + async addPermissionTypeDataIfNotFound(): Promise { + try { + const existingPermissionTypes = + await this.permissionTypeRepository.find(); + + const permissionTypeNames = existingPermissionTypes.map((pt) => pt.type); + + const missingPermissionTypes = []; + if (!permissionTypeNames.includes(PermissionType.CONTROLLABLE)) { + missingPermissionTypes.push(PermissionType.CONTROLLABLE); + } + if (!permissionTypeNames.includes(PermissionType.READ)) { + missingPermissionTypes.push(PermissionType.READ); + } + + if (missingPermissionTypes.length > 0) { + await this.addPermissionTypeData(missingPermissionTypes); + } + } catch (err) { + console.error('Error while checking permission type data:', err); + throw err; + } + } + + private async addPermissionTypeData( + permissionTypes: string[], + ): Promise { + try { + const permissionTypeEntities = permissionTypes.map((type) => ({ + type, + })); + + await this.permissionTypeRepository.save(permissionTypeEntities); + } catch (err) { + console.error('Error while adding permission type data:', err); + throw err; + } + } +} diff --git a/libs/common/src/seed/services/role.type.seeder.ts b/libs/common/src/seed/services/role.type.seeder.ts new file mode 100644 index 0000000..ea8bf15 --- /dev/null +++ b/libs/common/src/seed/services/role.type.seeder.ts @@ -0,0 +1,46 @@ +import { Injectable } from '@nestjs/common'; +import { RoleType } from '../../constants/role.type.enum'; +import { RoleTypeRepository } from '../../modules/role-type/repositories'; + +@Injectable() +export class RoleTypeSeeder { + constructor(private readonly roleTypeRepository: RoleTypeRepository) {} + + async addRoleTypeDataIfNotFound(): Promise { + try { + const existingRoleTypes = await this.roleTypeRepository.find(); + + const roleTypeNames = existingRoleTypes.map((pt) => pt.type); + + const missingRoleTypes = []; + if (!roleTypeNames.includes(RoleType.SUPER_ADMIN)) { + missingRoleTypes.push(RoleType.SUPER_ADMIN); + } + if (!roleTypeNames.includes(RoleType.ADMIN)) { + missingRoleTypes.push(RoleType.ADMIN); + } + if (!roleTypeNames.includes(RoleType.USER)) { + missingRoleTypes.push(RoleType.USER); + } + if (missingRoleTypes.length > 0) { + await this.addRoleTypeData(missingRoleTypes); + } + } catch (err) { + console.error('Error while checking role type data:', err); + throw err; + } + } + + private async addRoleTypeData(roleTypes: string[]): Promise { + try { + const roleTypeEntities = roleTypes.map((type) => ({ + type, + })); + + await this.roleTypeRepository.save(roleTypeEntities); + } catch (err) { + console.error('Error while adding role type data:', err); + throw err; + } + } +} diff --git a/libs/common/src/seed/services/seeder.service.ts b/libs/common/src/seed/services/seeder.service.ts new file mode 100644 index 0000000..92b5f51 --- /dev/null +++ b/libs/common/src/seed/services/seeder.service.ts @@ -0,0 +1,21 @@ +import { Injectable } from '@nestjs/common'; +import { PermissionTypeSeeder } from './permission.type.seeder'; +import { RoleTypeSeeder } from './role.type.seeder'; +import { SpaceTypeSeeder } from './space.type.seeder'; +import { SuperAdminSeeder } from './supper.admin.seeder'; +@Injectable() +export class SeederService { + constructor( + private readonly permissionTypeSeeder: PermissionTypeSeeder, + private readonly roleTypeSeeder: RoleTypeSeeder, + private readonly spaceTypeSeeder: SpaceTypeSeeder, + private readonly superAdminSeeder: SuperAdminSeeder, + ) {} + + async seed() { + await this.permissionTypeSeeder.addPermissionTypeDataIfNotFound(); + await this.roleTypeSeeder.addRoleTypeDataIfNotFound(); + await this.spaceTypeSeeder.addSpaceTypeDataIfNotFound(); + await this.superAdminSeeder.createSuperAdminIfNotFound(); + } +} diff --git a/libs/common/src/seed/services/space.type.seeder.ts b/libs/common/src/seed/services/space.type.seeder.ts new file mode 100644 index 0000000..3cbcb87 --- /dev/null +++ b/libs/common/src/seed/services/space.type.seeder.ts @@ -0,0 +1,52 @@ +import { Injectable } from '@nestjs/common'; +import { SpaceType } from '../../constants/space-type.enum'; +import { SpaceTypeRepository } from '../../modules/space-type/repositories'; + +@Injectable() +export class SpaceTypeSeeder { + constructor(private readonly spaceTypeRepository: SpaceTypeRepository) {} + + async addSpaceTypeDataIfNotFound(): Promise { + try { + const existingSpaceTypes = await this.spaceTypeRepository.find(); + + const spaceTypeNames = existingSpaceTypes.map((pt) => pt.type); + + const missingSpaceTypes = []; + if (!spaceTypeNames.includes(SpaceType.COMMUNITY)) { + missingSpaceTypes.push(SpaceType.COMMUNITY); + } + if (!spaceTypeNames.includes(SpaceType.BUILDING)) { + missingSpaceTypes.push(SpaceType.BUILDING); + } + if (!spaceTypeNames.includes(SpaceType.FLOOR)) { + missingSpaceTypes.push(SpaceType.FLOOR); + } + if (!spaceTypeNames.includes(SpaceType.UNIT)) { + missingSpaceTypes.push(SpaceType.UNIT); + } + if (!spaceTypeNames.includes(SpaceType.ROOM)) { + missingSpaceTypes.push(SpaceType.ROOM); + } + if (missingSpaceTypes.length > 0) { + await this.addSpaceTypeData(missingSpaceTypes); + } + } catch (err) { + console.error('Error while checking space type data:', err); + throw err; + } + } + + private async addSpaceTypeData(spaceTypes: string[]): Promise { + try { + const spaceTypeEntities = spaceTypes.map((type) => ({ + type, + })); + + await this.spaceTypeRepository.save(spaceTypeEntities); + } catch (err) { + console.error('Error while adding space type data:', err); + throw err; + } + } +} diff --git a/libs/common/src/helper/services/super.admin.sarvice.ts b/libs/common/src/seed/services/supper.admin.seeder.ts similarity index 96% rename from libs/common/src/helper/services/super.admin.sarvice.ts rename to libs/common/src/seed/services/supper.admin.seeder.ts index e9efbce..6cb5f60 100644 --- a/libs/common/src/helper/services/super.admin.sarvice.ts +++ b/libs/common/src/seed/services/supper.admin.seeder.ts @@ -1,13 +1,13 @@ -import { HelperHashService } from './helper.hash.service'; import { Injectable } from '@nestjs/common'; import { UserRepository } from '@app/common/modules/user/repositories'; import { RoleType } from '@app/common/constants/role.type.enum'; import { UserRoleRepository } from '@app/common/modules/user-role/repositories'; import { RoleTypeRepository } from '@app/common/modules/role-type/repositories'; import { ConfigService } from '@nestjs/config'; +import { HelperHashService } from '../../helper/services'; @Injectable() -export class SuperAdminService { +export class SuperAdminSeeder { constructor( private readonly configService: ConfigService, private readonly userRepository: UserRepository, diff --git a/src/app.module.ts b/src/app.module.ts index c9f7275..6add0be 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -13,6 +13,7 @@ import { BuildingModule } from './building/building.module'; import { FloorModule } from './floor/floor.module'; import { UnitModule } from './unit/unit.module'; import { RoleModule } from './role/role.module'; +import { SeederModule } from '@app/common/seed/seeder.module'; @Module({ imports: [ ConfigModule.forRoot({ @@ -30,6 +31,7 @@ import { RoleModule } from './role/role.module'; GroupModule, DeviceModule, UserDevicePermissionModule, + SeederModule, ], controllers: [AuthenticationController], }) diff --git a/src/main.ts b/src/main.ts index 61dfb92..0253ad0 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,7 +4,7 @@ import rateLimit from 'express-rate-limit'; import helmet from 'helmet'; import { setupSwaggerAuthentication } from '../libs/common/src/util/user-auth.swagger.utils'; import { ValidationPipe } from '@nestjs/common'; -import { SuperAdminService } from '@app/common/helper/services/super.admin.sarvice'; +import { SeederService } from '@app/common/seed/services/seeder.service'; async function bootstrap() { const app = await NestFactory.create(AuthModule); @@ -34,10 +34,14 @@ async function bootstrap() { }, }), ); - // Create super admin user - const superAdminService = app.get(SuperAdminService); - await superAdminService.createSuperAdminIfNotFound(); + const seederService = app.get(SeederService); + try { + await seederService.seed(); + console.log('Seeding complete!'); + } catch (error) { + console.error('Seeding failed!', error); + } await app.listen(process.env.PORT || 4000); } console.log('Starting auth at port ...', process.env.PORT || 4000); From 1bc8fee061bd161b7828723ffb2aaea054ce9e5a Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Sat, 18 May 2024 22:10:48 +0300 Subject: [PATCH 14/16] Remove onDelete and onUpdate properties from entity relationships --- libs/common/src/modules/device/entities/device.entity.ts | 2 -- libs/common/src/modules/group/entities/group.entity.ts | 1 - .../common/src/modules/permission/entities/permission.entity.ts | 2 -- libs/common/src/modules/role-type/entities/role.type.entity.ts | 2 -- libs/common/src/modules/user/entities/user.entity.ts | 2 -- 5 files changed, 9 deletions(-) diff --git a/libs/common/src/modules/device/entities/device.entity.ts b/libs/common/src/modules/device/entities/device.entity.ts index a7f5548..53dbbb3 100644 --- a/libs/common/src/modules/device/entities/device.entity.ts +++ b/libs/common/src/modules/device/entities/device.entity.ts @@ -25,8 +25,6 @@ export class DeviceEntity extends AbstractEntity { (permission) => permission.device, { nullable: true, - onDelete: 'CASCADE', - onUpdate: 'CASCADE', }, ) permission: DeviceUserPermissionEntity[]; diff --git a/libs/common/src/modules/group/entities/group.entity.ts b/libs/common/src/modules/group/entities/group.entity.ts index 7cea8e8..525f84d 100644 --- a/libs/common/src/modules/group/entities/group.entity.ts +++ b/libs/common/src/modules/group/entities/group.entity.ts @@ -19,7 +19,6 @@ export class GroupEntity extends AbstractEntity { @OneToMany(() => GroupDeviceEntity, (groupDevice) => groupDevice.group, { cascade: true, - onDelete: 'CASCADE', }) groupDevices: GroupDeviceEntity[]; diff --git a/libs/common/src/modules/permission/entities/permission.entity.ts b/libs/common/src/modules/permission/entities/permission.entity.ts index 3ee3943..d15d936 100644 --- a/libs/common/src/modules/permission/entities/permission.entity.ts +++ b/libs/common/src/modules/permission/entities/permission.entity.ts @@ -17,8 +17,6 @@ export class PermissionTypeEntity extends AbstractEntity { (permission) => permission.permissionType, { nullable: true, - onDelete: 'CASCADE', - onUpdate: 'CASCADE', }, ) permission: DeviceUserPermissionEntity[]; diff --git a/libs/common/src/modules/role-type/entities/role.type.entity.ts b/libs/common/src/modules/role-type/entities/role.type.entity.ts index 0621b7d..1697327 100644 --- a/libs/common/src/modules/role-type/entities/role.type.entity.ts +++ b/libs/common/src/modules/role-type/entities/role.type.entity.ts @@ -14,8 +14,6 @@ export class RoleTypeEntity extends AbstractEntity { type: string; @OneToMany(() => UserRoleEntity, (role) => role.roleType, { nullable: true, - onDelete: 'CASCADE', - onUpdate: 'CASCADE', }) role: UserRoleEntity[]; constructor(partial: Partial) { diff --git a/libs/common/src/modules/user/entities/user.entity.ts b/libs/common/src/modules/user/entities/user.entity.ts index ffe402c..ddf487b 100644 --- a/libs/common/src/modules/user/entities/user.entity.ts +++ b/libs/common/src/modules/user/entities/user.entity.ts @@ -61,8 +61,6 @@ export class UserEntity extends AbstractEntity { @OneToMany(() => UserRoleEntity, (role) => role.user, { nullable: true, - onDelete: 'CASCADE', - onUpdate: 'CASCADE', }) role: UserRoleEntity[]; constructor(partial: Partial) { From 6415d789923f3fb68c1be204e70e4cec71361166 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Sat, 18 May 2024 23:00:22 +0300 Subject: [PATCH 15/16] Remove USER role --- .../src/auth/interfaces/auth.interface.ts | 2 +- libs/common/src/auth/services/auth.service.ts | 4 +-- .../src/auth/strategies/jwt.strategy.ts | 2 +- .../auth/strategies/refresh-token.strategy.ts | 2 +- libs/common/src/constants/role.type.enum.ts | 1 - .../role-type/entities/role.type.entity.ts | 2 +- .../user-role/entities/user.role.entity.ts | 4 +-- .../src/modules/user/entities/user.entity.ts | 2 +- .../src/seed/services/role.type.seeder.ts | 4 +-- src/auth/services/user-auth.service.ts | 18 +---------- .../controllers/building.controller.ts | 12 +++---- .../controllers/community.controller.ts | 10 +++--- src/device/controllers/device.controller.ts | 18 +++++------ src/floor/controllers/floor.controller.ts | 12 +++---- src/group/controllers/group.controller.ts | 14 ++++---- src/guards/user.role.guard.ts | 24 -------------- src/role/controllers/role.controller.ts | 16 ++++------ src/role/dtos/index.ts | 2 +- src/role/dtos/role.add.dto.ts | 24 ++++++++++++++ src/role/dtos/role.edit.dto.ts | 16 ---------- src/role/services/role.service.ts | 32 ++++++++++++------- src/room/controllers/room.controller.ts | 10 +++--- src/unit/controllers/unit.controller.ts | 12 +++---- 23 files changed, 107 insertions(+), 136 deletions(-) delete mode 100644 src/guards/user.role.guard.ts create mode 100644 src/role/dtos/role.add.dto.ts delete mode 100644 src/role/dtos/role.edit.dto.ts diff --git a/libs/common/src/auth/interfaces/auth.interface.ts b/libs/common/src/auth/interfaces/auth.interface.ts index 8e57cd6..9b73050 100644 --- a/libs/common/src/auth/interfaces/auth.interface.ts +++ b/libs/common/src/auth/interfaces/auth.interface.ts @@ -4,5 +4,5 @@ export class AuthInterface { uuid: string; sessionId: string; id: number; - roles: string[]; + roles?: string[]; } diff --git a/libs/common/src/auth/services/auth.service.ts b/libs/common/src/auth/services/auth.service.ts index 45b19fa..f1c1c0d 100644 --- a/libs/common/src/auth/services/auth.service.ts +++ b/libs/common/src/auth/services/auth.service.ts @@ -22,7 +22,7 @@ export class AuthService { where: { email, }, - relations: ['role.roleType'], + relations: ['roles.roleType'], }); if (!user.isUserVerified) { @@ -70,7 +70,7 @@ export class AuthService { uuid: user.uuid, type: user.type, sessionId: user.sessionId, - roles: user.roles, + roles: user?.roles, }; const tokens = await this.getTokens(payload); diff --git a/libs/common/src/auth/strategies/jwt.strategy.ts b/libs/common/src/auth/strategies/jwt.strategy.ts index ed29a3a..d548dd8 100644 --- a/libs/common/src/auth/strategies/jwt.strategy.ts +++ b/libs/common/src/auth/strategies/jwt.strategy.ts @@ -31,7 +31,7 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') { userUuid: payload.uuid, uuid: payload.uuid, sessionId: payload.sessionId, - roles: payload.roles, + roles: payload?.roles, }; } else { throw new BadRequestException('Unauthorized'); diff --git a/libs/common/src/auth/strategies/refresh-token.strategy.ts b/libs/common/src/auth/strategies/refresh-token.strategy.ts index ee36eac..b6d6c2a 100644 --- a/libs/common/src/auth/strategies/refresh-token.strategy.ts +++ b/libs/common/src/auth/strategies/refresh-token.strategy.ts @@ -34,7 +34,7 @@ export class RefreshTokenStrategy extends PassportStrategy( userUuid: payload.uuid, uuid: payload.uuid, sessionId: payload.sessionId, - roles: payload.roles, + roles: payload?.roles, }; } else { throw new BadRequestException('Unauthorized'); diff --git a/libs/common/src/constants/role.type.enum.ts b/libs/common/src/constants/role.type.enum.ts index 72bf14e..3051b04 100644 --- a/libs/common/src/constants/role.type.enum.ts +++ b/libs/common/src/constants/role.type.enum.ts @@ -1,5 +1,4 @@ export enum RoleType { SUPER_ADMIN = 'SUPER_ADMIN', ADMIN = 'ADMIN', - USER = 'USER', } diff --git a/libs/common/src/modules/role-type/entities/role.type.entity.ts b/libs/common/src/modules/role-type/entities/role.type.entity.ts index 1697327..fd332fb 100644 --- a/libs/common/src/modules/role-type/entities/role.type.entity.ts +++ b/libs/common/src/modules/role-type/entities/role.type.entity.ts @@ -15,7 +15,7 @@ export class RoleTypeEntity extends AbstractEntity { @OneToMany(() => UserRoleEntity, (role) => role.roleType, { nullable: true, }) - role: UserRoleEntity[]; + roles: UserRoleEntity[]; constructor(partial: Partial) { super(); Object.assign(this, partial); diff --git a/libs/common/src/modules/user-role/entities/user.role.entity.ts b/libs/common/src/modules/user-role/entities/user.role.entity.ts index 34b49c4..c733594 100644 --- a/libs/common/src/modules/user-role/entities/user.role.entity.ts +++ b/libs/common/src/modules/user-role/entities/user.role.entity.ts @@ -7,12 +7,12 @@ import { RoleTypeEntity } from '../../role-type/entities'; @Entity({ name: 'user-role' }) @Unique(['user', 'roleType']) export class UserRoleEntity extends AbstractEntity { - @ManyToOne(() => UserEntity, (user) => user.role, { + @ManyToOne(() => UserEntity, (user) => user.roles, { nullable: false, }) user: UserEntity; - @ManyToOne(() => RoleTypeEntity, (roleType) => roleType.role, { + @ManyToOne(() => RoleTypeEntity, (roleType) => roleType.roles, { nullable: false, }) roleType: RoleTypeEntity; diff --git a/libs/common/src/modules/user/entities/user.entity.ts b/libs/common/src/modules/user/entities/user.entity.ts index ddf487b..17a9268 100644 --- a/libs/common/src/modules/user/entities/user.entity.ts +++ b/libs/common/src/modules/user/entities/user.entity.ts @@ -62,7 +62,7 @@ export class UserEntity extends AbstractEntity { @OneToMany(() => UserRoleEntity, (role) => role.user, { nullable: true, }) - role: UserRoleEntity[]; + roles: UserRoleEntity[]; constructor(partial: Partial) { super(); Object.assign(this, partial); diff --git a/libs/common/src/seed/services/role.type.seeder.ts b/libs/common/src/seed/services/role.type.seeder.ts index ea8bf15..5f7a4b2 100644 --- a/libs/common/src/seed/services/role.type.seeder.ts +++ b/libs/common/src/seed/services/role.type.seeder.ts @@ -19,9 +19,7 @@ export class RoleTypeSeeder { if (!roleTypeNames.includes(RoleType.ADMIN)) { missingRoleTypes.push(RoleType.ADMIN); } - if (!roleTypeNames.includes(RoleType.USER)) { - missingRoleTypes.push(RoleType.USER); - } + if (missingRoleTypes.length > 0) { await this.addRoleTypeData(missingRoleTypes); } diff --git a/src/auth/services/user-auth.service.ts b/src/auth/services/user-auth.service.ts index 705ba9e..e74967d 100644 --- a/src/auth/services/user-auth.service.ts +++ b/src/auth/services/user-auth.service.ts @@ -50,15 +50,6 @@ export class UserAuthService { password: hashedPassword, }); - const defaultUserRoleUuid = await this.getRoleUuidByRoleType( - RoleType.USER, - ); - - await this.userRoleRepository.save({ - user: { uuid: user.uuid }, - roleType: { uuid: defaultUserRoleUuid }, - }); - return user; } catch (error) { throw new BadRequestException('Failed to register user'); @@ -114,7 +105,7 @@ export class UserAuthService { email: user.email, userId: user.uuid, uuid: user.uuid, - roles: user.role.map((role) => { + roles: user?.roles?.map((role) => { return { uuid: role.uuid, type: role.roleType.type }; }), sessionId: session[1].uuid, @@ -214,11 +205,4 @@ export class UserAuthService { await this.authService.updateRefreshToken(user.uuid, tokens.refreshToken); return tokens; } - private async getRoleUuidByRoleType(roleType: string) { - const role = await this.roleTypeRepository.findOne({ - where: { type: roleType }, - }); - - return role.uuid; - } } diff --git a/src/building/controllers/building.controller.ts b/src/building/controllers/building.controller.ts index b561ff9..220b96e 100644 --- a/src/building/controllers/building.controller.ts +++ b/src/building/controllers/building.controller.ts @@ -18,7 +18,7 @@ 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'; +import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard'; @ApiTags('Building Module') @Controller({ @@ -44,7 +44,7 @@ export class BuildingController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get(':buildingUuid') async getBuildingByUuid(@Param('buildingUuid') buildingUuid: string) { try { @@ -60,7 +60,7 @@ export class BuildingController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('child/:buildingUuid') async getBuildingChildByUuid( @Param('buildingUuid') buildingUuid: string, @@ -80,7 +80,7 @@ export class BuildingController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('parent/:buildingUuid') async getBuildingParentByUuid(@Param('buildingUuid') buildingUuid: string) { try { @@ -109,7 +109,7 @@ export class BuildingController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('user/:userUuid') async getBuildingsByUserId(@Param('userUuid') userUuid: string) { try { @@ -123,7 +123,7 @@ export class BuildingController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Put('rename/:buildingUuid') async renameBuildingByUuid( @Param('buildingUuid') buildingUuid: string, diff --git a/src/community/controllers/community.controller.ts b/src/community/controllers/community.controller.ts index 144041d..c3d2739 100644 --- a/src/community/controllers/community.controller.ts +++ b/src/community/controllers/community.controller.ts @@ -20,7 +20,7 @@ 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'; +import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard'; @ApiTags('Community Module') @Controller({ @@ -47,7 +47,7 @@ export class CommunityController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get(':communityUuid') async getCommunityByUuid(@Param('communityUuid') communityUuid: string) { try { @@ -63,7 +63,7 @@ export class CommunityController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('child/:communityUuid') async getCommunityChildByUuid( @Param('communityUuid') communityUuid: string, @@ -84,7 +84,7 @@ export class CommunityController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('user/:userUuid') async getCommunitiesByUserId(@Param('userUuid') userUuid: string) { try { @@ -111,7 +111,7 @@ export class CommunityController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Put('rename/:communityUuid') async renameCommunityByUuid( @Param('communityUuid') communityUuid: string, diff --git a/src/device/controllers/device.controller.ts b/src/device/controllers/device.controller.ts index 7ebf1ca..e014c0c 100644 --- a/src/device/controllers/device.controller.ts +++ b/src/device/controllers/device.controller.ts @@ -25,7 +25,7 @@ import { CheckRoomGuard } from 'src/guards/room.guard'; import { CheckGroupGuard } from 'src/guards/group.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'; +import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard'; @ApiTags('Device Module') @Controller({ @@ -36,7 +36,7 @@ export class DeviceController { constructor(private readonly deviceService: DeviceService) {} @ApiBearerAuth() - @UseGuards(UserRoleGuard, CheckRoomGuard) + @UseGuards(JwtAuthGuard, CheckRoomGuard) @Get('room') async getDevicesByRoomId( @Query() getDeviceByRoomUuidDto: GetDeviceByRoomUuidDto, @@ -57,7 +57,7 @@ export class DeviceController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard, CheckRoomGuard) + @UseGuards(JwtAuthGuard, CheckRoomGuard) @Post('room') async addDeviceInRoom(@Body() addDeviceInRoomDto: AddDeviceInRoomDto) { try { @@ -70,7 +70,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard, CheckGroupGuard) + @UseGuards(JwtAuthGuard, CheckGroupGuard) @Get('group') async getDevicesByGroupId( @Query() getDeviceByGroupIdDto: GetDeviceByGroupIdDto, @@ -90,7 +90,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard, CheckGroupGuard) + @UseGuards(JwtAuthGuard, CheckGroupGuard) @Post('group') async addDeviceInGroup(@Body() addDeviceInGroupDto: AddDeviceInGroupDto) { try { @@ -103,7 +103,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard, CheckUserHavePermission) + @UseGuards(JwtAuthGuard, CheckUserHavePermission) @Get(':deviceUuid') async getDeviceDetailsByDeviceId( @Param('deviceUuid') deviceUuid: string, @@ -123,7 +123,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard, CheckUserHavePermission) + @UseGuards(JwtAuthGuard, CheckUserHavePermission) @Get(':deviceUuid/functions') async getDeviceInstructionByDeviceId( @Param('deviceUuid') deviceUuid: string, @@ -140,7 +140,7 @@ export class DeviceController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard, CheckUserHavePermission) + @UseGuards(JwtAuthGuard, CheckUserHavePermission) @Get(':deviceUuid/functions/status') async getDevicesInstructionStatus(@Param('deviceUuid') deviceUuid: string) { try { @@ -154,7 +154,7 @@ export class DeviceController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard, CheckUserHaveControllablePermission) + @UseGuards(JwtAuthGuard, CheckUserHaveControllablePermission) @Post(':deviceUuid/control') async controlDevice( @Body() controlDeviceDto: ControlDeviceDto, diff --git a/src/floor/controllers/floor.controller.ts b/src/floor/controllers/floor.controller.ts index 2fd9dfc..ea27429 100644 --- a/src/floor/controllers/floor.controller.ts +++ b/src/floor/controllers/floor.controller.ts @@ -17,7 +17,7 @@ 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 { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard'; import { AdminRoleGuard } from 'src/guards/admin.role.guard'; @ApiTags('Floor Module') @@ -44,7 +44,7 @@ export class FloorController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get(':floorUuid') async getFloorByUuid(@Param('floorUuid') floorUuid: string) { try { @@ -59,7 +59,7 @@ export class FloorController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('child/:floorUuid') async getFloorChildByUuid( @Param('floorUuid') floorUuid: string, @@ -79,7 +79,7 @@ export class FloorController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('parent/:floorUuid') async getFloorParentByUuid(@Param('floorUuid') floorUuid: string) { try { @@ -109,7 +109,7 @@ export class FloorController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('user/:userUuid') async getFloorsByUserId(@Param('userUuid') userUuid: string) { try { @@ -123,7 +123,7 @@ export class FloorController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Put('rename/:floorUuid') async renameFloorByUuid( @Param('floorUuid') floorUuid: string, diff --git a/src/group/controllers/group.controller.ts b/src/group/controllers/group.controller.ts index c00ff92..e936e06 100644 --- a/src/group/controllers/group.controller.ts +++ b/src/group/controllers/group.controller.ts @@ -16,7 +16,7 @@ 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'; +import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard'; @ApiTags('Group Module') @Controller({ @@ -27,7 +27,7 @@ export class GroupController { constructor(private readonly groupService: GroupService) {} @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('space/:spaceUuid') async getGroupsBySpaceUuid(@Param('spaceUuid') spaceUuid: string) { try { @@ -40,7 +40,7 @@ export class GroupController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get(':groupUuid') async getGroupsByGroupId(@Param('groupUuid') groupUuid: string) { try { @@ -53,7 +53,7 @@ export class GroupController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard, CheckProductUuidForAllDevicesGuard) + @UseGuards(JwtAuthGuard, CheckProductUuidForAllDevicesGuard) @Post() async addGroup(@Body() addGroupDto: AddGroupDto) { try { @@ -67,7 +67,7 @@ export class GroupController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Post('control') async controlGroup(@Body() controlGroupDto: ControlGroupDto) { try { @@ -81,7 +81,7 @@ export class GroupController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Put('rename/:groupUuid') async renameGroupByUuid( @Param('groupUuid') groupUuid: string, @@ -101,7 +101,7 @@ export class GroupController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Delete(':groupUuid') async deleteGroup(@Param('groupUuid') groupUuid: string) { try { diff --git a/src/guards/user.role.guard.ts b/src/guards/user.role.guard.ts deleted file mode 100644 index 59abad8..0000000 --- a/src/guards/user.role.guard.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { RoleType } from '@app/common/constants/role.type.enum'; -import { BadRequestException, UnauthorizedException } from '@nestjs/common'; -import { AuthGuard } from '@nestjs/passport'; - -export class UserRoleGuard extends AuthGuard('jwt') { - handleRequest(err, user) { - if (err || !user) { - throw err || new UnauthorizedException(); - } else { - const isUserOrAdmin = user.roles.some( - (role) => - role.type === RoleType.SUPER_ADMIN || - role.type === RoleType.ADMIN || - role.type === RoleType.USER, - ); - if (!isUserOrAdmin) { - throw new BadRequestException( - 'Only admin or user role can access this route', - ); - } - } - return user; - } -} diff --git a/src/role/controllers/role.controller.ts b/src/role/controllers/role.controller.ts index 2a6c917..cb2038d 100644 --- a/src/role/controllers/role.controller.ts +++ b/src/role/controllers/role.controller.ts @@ -4,13 +4,12 @@ import { Get, HttpException, HttpStatus, - Param, - Put, + Post, UseGuards, } from '@nestjs/common'; import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { RoleService } from '../services/role.service'; -import { UserRoleEditDto } from '../dtos'; +import { AddUserRoleDto } from '../dtos'; import { SuperAdminRoleGuard } from 'src/guards/super.admin.role.guard'; @ApiTags('Role Module') @@ -37,16 +36,13 @@ export class RoleController { } @ApiBearerAuth() @UseGuards(SuperAdminRoleGuard) - @Put('edit/user/:userUuid') - async editUserRoleType( - @Param('userUuid') userUuid: string, - @Body() userRoleEditDto: UserRoleEditDto, - ) { + @Post() + async addUserRoleType(@Body() addUserRoleDto: AddUserRoleDto) { try { - await this.roleService.editUserRoleType(userUuid, userRoleEditDto); + await this.roleService.addUserRoleType(addUserRoleDto); return { statusCode: HttpStatus.OK, - message: 'User Role Updated Successfully', + message: 'User Role Added Successfully', }; } catch (error) { throw new HttpException( diff --git a/src/role/dtos/index.ts b/src/role/dtos/index.ts index 8fc5216..a9b9771 100644 --- a/src/role/dtos/index.ts +++ b/src/role/dtos/index.ts @@ -1 +1 @@ -export * from './role.edit.dto'; +export * from './role.add.dto'; diff --git a/src/role/dtos/role.add.dto.ts b/src/role/dtos/role.add.dto.ts new file mode 100644 index 0000000..8f17920 --- /dev/null +++ b/src/role/dtos/role.add.dto.ts @@ -0,0 +1,24 @@ +import { RoleType } from '@app/common/constants/role.type.enum'; +import { ApiProperty } from '@nestjs/swagger'; +import { IsEnum, IsIn, IsNotEmpty, IsString } from 'class-validator'; + +export class AddUserRoleDto { + @ApiProperty({ + description: 'userUuid', + required: true, + }) + @IsString() + @IsNotEmpty() + public userUuid: string; + + @ApiProperty({ + description: 'Role type (ADMIN)', + enum: [RoleType.ADMIN], + required: true, + }) + @IsEnum(RoleType) + @IsIn([RoleType.ADMIN], { + message: 'roleType must be one of the following values: ADMIN', + }) + roleType: RoleType; +} diff --git a/src/role/dtos/role.edit.dto.ts b/src/role/dtos/role.edit.dto.ts deleted file mode 100644 index 9e9b394..0000000 --- a/src/role/dtos/role.edit.dto.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { RoleType } from '@app/common/constants/role.type.enum'; -import { ApiProperty } from '@nestjs/swagger'; -import { IsEnum, IsIn } from 'class-validator'; - -export class UserRoleEditDto { - @ApiProperty({ - description: 'Role type (USER or ADMIN)', - enum: [RoleType.USER, RoleType.ADMIN], - required: true, - }) - @IsEnum(RoleType) - @IsIn([RoleType.USER, RoleType.ADMIN], { - message: 'roleType must be one of the following values: USER, ADMIN', - }) - roleType: RoleType; -} diff --git a/src/role/services/role.service.ts b/src/role/services/role.service.ts index b8db739..ece3780 100644 --- a/src/role/services/role.service.ts +++ b/src/role/services/role.service.ts @@ -1,7 +1,8 @@ import { RoleTypeRepository } from './../../../libs/common/src/modules/role-type/repositories/role.type.repository'; import { HttpException, HttpStatus, Injectable } from '@nestjs/common'; -import { UserRoleEditDto } from '../dtos/role.edit.dto'; +import { AddUserRoleDto } from '../dtos/role.add.dto'; import { UserRoleRepository } from '@app/common/modules/user-role/repositories'; +import { QueryFailedError } from 'typeorm'; @Injectable() export class RoleService { @@ -10,18 +11,27 @@ export class RoleService { private readonly userRoleRepository: UserRoleRepository, ) {} - async editUserRoleType(userUuid: string, userRoleEditDto: UserRoleEditDto) { + async addUserRoleType(addUserRoleDto: AddUserRoleDto) { try { - const roleType = await this.fetchRoleByType(userRoleEditDto.roleType); - return await this.userRoleRepository.update( - { user: { uuid: userUuid } }, - { - roleType: { - uuid: roleType.uuid, - }, - }, - ); + const roleType = await this.fetchRoleByType(addUserRoleDto.roleType); + + if (roleType.uuid) { + return await this.userRoleRepository.save({ + user: { uuid: addUserRoleDto.userUuid }, + roleType: { uuid: roleType.uuid }, + }); + } } catch (error) { + if ( + error instanceof QueryFailedError && + error.driverError.code === '23505' + ) { + // Postgres unique constraint violation error code + throw new HttpException( + 'This role already exists for this user', + HttpStatus.CONFLICT, + ); + } throw new HttpException( error.message || 'Internal Server Error', HttpStatus.INTERNAL_SERVER_ERROR, diff --git a/src/room/controllers/room.controller.ts b/src/room/controllers/room.controller.ts index d39b584..984e8a5 100644 --- a/src/room/controllers/room.controller.ts +++ b/src/room/controllers/room.controller.ts @@ -16,7 +16,7 @@ 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'; +import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard'; @ApiTags('Room Module') @Controller({ @@ -42,7 +42,7 @@ export class RoomController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get(':roomUuid') async getRoomByUuid(@Param('roomUuid') roomUuid: string) { try { @@ -57,7 +57,7 @@ export class RoomController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('parent/:roomUuid') async getRoomParentByUuid(@Param('roomUuid') roomUuid: string) { try { @@ -85,7 +85,7 @@ export class RoomController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('user/:userUuid') async getRoomsByUserId(@Param('userUuid') userUuid: string) { try { @@ -99,7 +99,7 @@ export class RoomController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Put('rename/:roomUuid') async renameRoomByUuid( @Param('roomUuid') roomUuid: string, diff --git a/src/unit/controllers/unit.controller.ts b/src/unit/controllers/unit.controller.ts index c42793c..885b018 100644 --- a/src/unit/controllers/unit.controller.ts +++ b/src/unit/controllers/unit.controller.ts @@ -18,7 +18,7 @@ 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'; +import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard'; @ApiTags('Unit Module') @Controller({ @@ -44,7 +44,7 @@ export class UnitController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get(':unitUuid') async getUnitByUuid(@Param('unitUuid') unitUuid: string) { try { @@ -59,7 +59,7 @@ export class UnitController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('child/:unitUuid') async getUnitChildByUuid( @Param('unitUuid') unitUuid: string, @@ -76,7 +76,7 @@ export class UnitController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('parent/:unitUuid') async getUnitParentByUuid(@Param('unitUuid') unitUuid: string) { try { @@ -104,7 +104,7 @@ export class UnitController { } } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Get('user/:userUuid') async getUnitsByUserId(@Param('userUuid') userUuid: string) { try { @@ -118,7 +118,7 @@ export class UnitController { } @ApiBearerAuth() - @UseGuards(UserRoleGuard) + @UseGuards(JwtAuthGuard) @Put('rename/:unitUuid') async renameUnitByUuid( @Param('unitUuid') unitUuid: string, From cab86dbd69e7923264e84dc0d8a6a0cc6e4044f2 Mon Sep 17 00:00:00 2001 From: faris Aljohari <83524184+farisaljohari@users.noreply.github.com> Date: Sat, 18 May 2024 23:10:29 +0300 Subject: [PATCH 16/16] Remove unused import of RoleType enum in UserAuthService --- src/auth/services/user-auth.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/auth/services/user-auth.service.ts b/src/auth/services/user-auth.service.ts index e74967d..a514c1c 100644 --- a/src/auth/services/user-auth.service.ts +++ b/src/auth/services/user-auth.service.ts @@ -18,7 +18,6 @@ import { EmailService } from '../../../libs/common/src/util/email.service'; import { OtpType } from '../../../libs/common/src/constants/otp-type.enum'; import { UserEntity } from '../../../libs/common/src/modules/user/entities/user.entity'; import * as argon2 from 'argon2'; -import { RoleType } from '@app/common/constants/role.type.enum'; @Injectable() export class UserAuthService {