Remove USER role

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[];
 }

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);

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');

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');

libs/common/src/constants/role.type.enum.ts

@@ -1,5 +1,4 @@
 export enum RoleType {
   SUPER_ADMIN = 'SUPER_ADMIN',
   ADMIN = 'ADMIN',
-  USER = 'USER',
 }

libs/common/src/modules/role-type/entities/role.type.entity.ts

@@ -15,7 +15,7 @@ export class RoleTypeEntity extends AbstractEntity<RoleTypeDto> {
   @OneToMany(() => UserRoleEntity, (role) => role.roleType, {
     nullable: true,
   })
-  role: UserRoleEntity[];
+  roles: UserRoleEntity[];
   constructor(partial: Partial<RoleTypeEntity>) {
     super();
     Object.assign(this, partial);

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<UserRoleDto> {
-  @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;

libs/common/src/modules/user/entities/user.entity.ts

@@ -62,7 +62,7 @@ export class UserEntity extends AbstractEntity<UserDto> {
   @OneToMany(() => UserRoleEntity, (role) => role.user, {
     nullable: true,
   })
-  role: UserRoleEntity[];
+  roles: UserRoleEntity[];
   constructor(partial: Partial<UserEntity>) {
     super();
     Object.assign(this, partial);

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);
       }