完成权限角色守卫
This commit is contained in:
@@ -0,0 +1,3 @@
|
|||||||
|
import { SetMetadata } from "@nestjs/common";
|
||||||
|
|
||||||
|
export const Permissions = (...permissions: string[]) => SetMetadata('permissions', permissions);
|
||||||
3
tone-page-server/src/common/decorators/role.decorator.ts
Normal file
3
tone-page-server/src/common/decorators/role.decorator.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
import { SetMetadata } from "@nestjs/common";
|
||||||
|
|
||||||
|
export const Roles = (...roles: string[]) => SetMetadata('roles', roles);
|
||||||
40
tone-page-server/src/common/guard/permission.guard.ts
Normal file
40
tone-page-server/src/common/guard/permission.guard.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
|
||||||
|
import { Reflector } from '@nestjs/core';
|
||||||
|
import { PermissionService } from "src/role/services/permission.service";
|
||||||
|
import { RolePermissionService } from "src/role/services/role-permission.service";
|
||||||
|
import { UserRoleService } from "src/role/services/user-role.service";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class PermissionGuard implements CanActivate {
|
||||||
|
constructor(
|
||||||
|
private reflector: Reflector,
|
||||||
|
private readonly userRoleService: UserRoleService,
|
||||||
|
private readonly rolePermissionService: RolePermissionService,
|
||||||
|
private readonly permissionService: PermissionService,
|
||||||
|
) { }
|
||||||
|
|
||||||
|
async canActivate(context: ExecutionContext): Promise<boolean> {
|
||||||
|
const requiredPermissions = this.reflector.getAllAndOverride<string[]>('permissions', [
|
||||||
|
context.getHandler(),
|
||||||
|
context.getClass(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (!requiredPermissions) return true;
|
||||||
|
|
||||||
|
const request = context.switchToHttp().getRequest();
|
||||||
|
const userId = request.user?.userId;
|
||||||
|
|
||||||
|
if (!userId) return false;
|
||||||
|
|
||||||
|
// 查询用户拥有的有效角色ID
|
||||||
|
const userRoleIds = await this.userRoleService.findValidRoleIdsByUserId(userId);
|
||||||
|
|
||||||
|
// 查询用户拥有的有效角色ID对应的权限ID
|
||||||
|
const userPermissionIds = await this.rolePermissionService.findPermissionIdsByRoleIds(userRoleIds);
|
||||||
|
|
||||||
|
// 查询用户拥有的权限ID对应的权限名
|
||||||
|
const userPermissionNames = await this.permissionService.findPermissionNamesByPermissionIds(userPermissionIds);
|
||||||
|
|
||||||
|
return requiredPermissions.every(permission => userPermissionNames.includes(permission))
|
||||||
|
}
|
||||||
|
}
|
||||||
36
tone-page-server/src/common/guard/roles.guard.ts
Normal file
36
tone-page-server/src/common/guard/roles.guard.ts
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
|
||||||
|
import { Reflector } from '@nestjs/core';
|
||||||
|
import { RoleService } from "src/role/services/role.service";
|
||||||
|
import { UserRoleService } from "src/role/services/user-role.service";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class RolesGuard implements CanActivate {
|
||||||
|
constructor(
|
||||||
|
private reflector: Reflector,
|
||||||
|
private readonly userRoleService: UserRoleService,
|
||||||
|
private readonly roleService: RoleService,
|
||||||
|
) { }
|
||||||
|
|
||||||
|
async canActivate(context: ExecutionContext): Promise<boolean> {
|
||||||
|
const requiredRoles = this.reflector.getAllAndOverride<string[]>('roles', [
|
||||||
|
context.getHandler(),
|
||||||
|
context.getClass(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (!requiredRoles) return true;
|
||||||
|
|
||||||
|
|
||||||
|
const request = context.switchToHttp().getRequest();
|
||||||
|
const userId = request.user?.userId;
|
||||||
|
|
||||||
|
if (!userId) return false;
|
||||||
|
|
||||||
|
// 查询用户拥有的有效角色Id
|
||||||
|
const userRoleIds = await this.userRoleService.findValidRoleIdsByUserId(userId);
|
||||||
|
|
||||||
|
// 查询用户角色Id对应的角色名
|
||||||
|
const userRoleNames = await this.roleService.findRoleNamesByRoleIds(userRoleIds);
|
||||||
|
|
||||||
|
return requiredRoles.some(role => userRoleNames.includes(role));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,8 +3,15 @@ import { TypeOrmModule } from '@nestjs/typeorm';
|
|||||||
import { Role } from './entities/role.entity';
|
import { Role } from './entities/role.entity';
|
||||||
import { Permission } from './entities/permission.entity';
|
import { Permission } from './entities/permission.entity';
|
||||||
import { RolePermission } from './entities/role-permission.entity';
|
import { RolePermission } from './entities/role-permission.entity';
|
||||||
|
import { RolePermissionService } from './services/role-permission.service';
|
||||||
|
import { RoleService } from './services/role.service';
|
||||||
|
import { UserRoleService } from './services/user-role.service';
|
||||||
|
import { UserRole } from './entities/user-role.entity';
|
||||||
|
import { PermissionService } from './services/permission.service';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [TypeOrmModule.forFeature([Role, Permission, RolePermission])]
|
imports: [TypeOrmModule.forFeature([Role, Permission, RolePermission, UserRole])],
|
||||||
|
providers: [RolePermissionService, RoleService, UserRoleService, PermissionService],
|
||||||
|
exports: [RolePermissionService, RoleService, UserRoleService, PermissionService],
|
||||||
})
|
})
|
||||||
export class RoleModule { }
|
export class RoleModule { }
|
||||||
|
|||||||
26
tone-page-server/src/role/services/permission.service.ts
Normal file
26
tone-page-server/src/role/services/permission.service.ts
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
import { Injectable } from "@nestjs/common";
|
||||||
|
import { InjectRepository } from "@nestjs/typeorm";
|
||||||
|
import { Permission } from "../entities/permission.entity";
|
||||||
|
import { In, Repository } from "typeorm";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class PermissionService {
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(Permission)
|
||||||
|
private readonly permissionRepository: Repository<Permission>,
|
||||||
|
) { }
|
||||||
|
|
||||||
|
async findPermissionNamesByPermissionIds(permissionIds: string[]): Promise<string[]> {
|
||||||
|
const permissions = await this.findPermissionsByPermissionIds(permissionIds);
|
||||||
|
return permissions.map(permission => permission.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
async findPermissionsByPermissionIds(permissionIds: string[]): Promise<Permission[]> {
|
||||||
|
return this.permissionRepository.find({
|
||||||
|
where: {
|
||||||
|
id: In(permissionIds),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { Injectable } from "@nestjs/common";
|
||||||
|
import { InjectRepository } from "@nestjs/typeorm";
|
||||||
|
import { RolePermission } from "../entities/role-permission.entity";
|
||||||
|
import { In, Repository } from "typeorm";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class RolePermissionService {
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(RolePermission)
|
||||||
|
private readonly rolePermissionRepository: Repository<RolePermission>,
|
||||||
|
) { }
|
||||||
|
|
||||||
|
async findPermissionIdsByRoleIds(roleIds: string[]): Promise<string[]> {
|
||||||
|
const rolePermissions = await this.rolePermissionRepository.find({
|
||||||
|
where: {
|
||||||
|
roleId: In(roleIds),
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return rolePermissions.map(rp => rp.permissionId);
|
||||||
|
}
|
||||||
|
}
|
||||||
26
tone-page-server/src/role/services/role.service.ts
Normal file
26
tone-page-server/src/role/services/role.service.ts
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
import { Injectable } from "@nestjs/common";
|
||||||
|
import { InjectRepository } from "@nestjs/typeorm";
|
||||||
|
import { Role } from "../entities/role.entity";
|
||||||
|
import { In, Repository } from "typeorm";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class RoleService {
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(Role)
|
||||||
|
private readonly roleRepository: Repository<Role>,
|
||||||
|
) { }
|
||||||
|
|
||||||
|
async findRoleNamesByRoleIds(roleIds: string[]): Promise<string[]> {
|
||||||
|
const roles = await this.findRolesByRoleIds(roleIds);
|
||||||
|
return roles.map(role => role.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
async findRolesByRoleIds(roleIds: string[]): Promise<Role[]> {
|
||||||
|
return this.roleRepository.find({
|
||||||
|
where: {
|
||||||
|
id: In(roleIds),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
35
tone-page-server/src/role/services/user-role.service.ts
Normal file
35
tone-page-server/src/role/services/user-role.service.ts
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
import { Injectable } from "@nestjs/common";
|
||||||
|
import { InjectRepository } from "@nestjs/typeorm";
|
||||||
|
import { UserRole } from "src/role/entities/user-role.entity";
|
||||||
|
import { IsNull, MoreThanOrEqual, Repository } from "typeorm";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class UserRoleService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(UserRole)
|
||||||
|
private readonly userRoleRepository: Repository<UserRole>,
|
||||||
|
) { }
|
||||||
|
|
||||||
|
async findValidRoleIdsByUserId(userId: string): Promise<string[]> {
|
||||||
|
return (await this.findValidRolesByUserId(userId)).map(ur => ur.roleId);
|
||||||
|
}
|
||||||
|
|
||||||
|
async findValidRolesByUserId(userId: string) {
|
||||||
|
const now = new Date();
|
||||||
|
|
||||||
|
return this.userRoleRepository.find({
|
||||||
|
where: [
|
||||||
|
{
|
||||||
|
userId,
|
||||||
|
isEnabled: true,
|
||||||
|
expiredAt: MoreThanOrEqual(now),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
userId,
|
||||||
|
isEnabled: true,
|
||||||
|
expiredAt: IsNull(),
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,11 +6,10 @@ import { UserService } from './user.service';
|
|||||||
import { UserSession } from './entities/user-session.entity';
|
import { UserSession } from './entities/user-session.entity';
|
||||||
import { AuthModule } from 'src/auth/auth.module';
|
import { AuthModule } from 'src/auth/auth.module';
|
||||||
import { UserSessionService } from './services/user-session.service';
|
import { UserSessionService } from './services/user-session.service';
|
||||||
import { UserRole } from './entities/user-role.entity';
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
TypeOrmModule.forFeature([User, UserSession, UserRole]),
|
TypeOrmModule.forFeature([User, UserSession]),
|
||||||
forwardRef(() => AuthModule),// 解决循环依赖问题
|
forwardRef(() => AuthModule),// 解决循环依赖问题
|
||||||
],
|
],
|
||||||
controllers: [UserController],
|
controllers: [UserController],
|
||||||
|
|||||||
Reference in New Issue
Block a user