tone/tonePage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后端移除所有权限模块

Browse Source
This commit is contained in:
tone
2025-06-18 15:54:13 +08:00
parent aed1b422ee
commit e4ba655552
16 changed files with 8 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tone-page-server/src/common/guard/permission.guard.ts
View File

@@ -1,47 +0,0 @@
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),
);
}
}

19
tone-page-server/src/common/guard/roles.guard.ts
View File

@@ -1,15 +1,11 @@
import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
import { CanActivate, ExecutionContext, Injectable, RequestTimeoutException } 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', [
@@ -24,14 +20,9 @@ export class RolesGuard implements CanActivate {
if (!userId) return false;
// 查询用户拥有的有效角色Id
const userRoleIds =
await this.userRoleService.findValidRoleIdsByUserId(userId);
// 查询用户拥有的有效角色Id TODO
// 查询用户角色Id对应的角色名
const userRoleNames =
await this.roleService.findRoleNamesByRoleIds(userRoleIds);
return requiredRoles.some((role) => userRoleNames.includes(role));
// return requiredRoles.some((role) => userRoleNames.includes(role));
return false;
}
}