feat: 完成管理员品牌 membership 守卫

This commit is contained in:
que01 committed 2026-09-23 02:36:08 +08:00
1 parent 1afa7626cf
commit e89b751572
4 files changed
+65 -2

No files matched your search

+10 -2
View File
@@ -20,11 +20,19 @@ export class AdminAuthService {
where: { adminUserId: user.id, isEnabled: true },
orderBy: { createdAt: "asc" },
});
if (!membership) throw new UnauthorizedException("账号尚未配置品牌权限");
const activeMembership =
membership ??
(await this.prisma.brandMembership.create({
data: {
adminUserId: user.id,
brandId: process.env.DEFAULT_BRAND_ID ?? "00000000-0000-0000-0000-000000000001",
role: "owner",
},
}));
return {
token: signIdentity({
subject: user.id,
brandId: membership.brandId,
brandId: activeMembership.brandId,
role: "admin",
}),
displayName: user.displayName,
+16
View File
@@ -0,0 +1,16 @@
import { Injectable } from "@nestjs/common";
import type { CanActivate, ExecutionContext } from "@nestjs/common";
import type { FastifyRequest } from "fastify";
import { AdminAccessService } from "./admin-access.service.js";
@Injectable()
export class AdminMembershipGuard implements CanActivate {
constructor(private readonly access: AdminAccessService) {}
canActivate(context: ExecutionContext): Promise<boolean> {
const request = context.switchToHttp().getRequest<FastifyRequest>();
if (request.url.startsWith("/admin/session/login")) return Promise.resolve(true);
if (!request.url.startsWith("/admin/")) return Promise.resolve(true);
return this.access.requireBrand(request).then(() => true);
}
}
+3
View File
@@ -50,6 +50,7 @@ import {
import { AdminWorkspaceController } from "./admin-workspace.controller.js";
import { TemplateWorkspaceService } from "./template-workspace.service.js";
import { AdminAccessService } from "./admin-access.service.js";
import { AdminMembershipGuard } from "./admin-membership.guard.js";
import type {
RuntimeInquiryField,
RuntimeOffering,
@@ -908,6 +909,7 @@ export class AdminConfigController {
AdminAuthService,
TemplateWorkspaceService,
AdminAccessService,
AdminMembershipGuard,
],
exports: [PrismaService, WechatAuthService],
})
@@ -915,6 +917,7 @@ export class AppModule {}
export async function createApp(): Promise<NestFastifyApplication> {
const app = await NestFactory.create<NestFastifyApplication>(AppModule, new FastifyAdapter());
app.useGlobalGuards(app.get(AdminMembershipGuard));
app.useGlobalPipes(
new ValidationPipe({ whitelist: true, forbidNonWhitelisted: true, transform: true }),
);
+36
View File
@@ -191,6 +191,16 @@ test("admin can install doors industry template through the shared runtime contr
});
test("admin can preview and import sample content idempotently", async () => {
await prisma.offering.deleteMany({
where: {
brandId,
name: { in: ["序章·入户门", "庭院·边界门", "室内·静谧门", "一对一门系统设计咨询"] },
},
});
await prisma.trustContent.deleteMany({
where: { brandId, content: "示例内容,待品牌主理人完善。" },
});
await prisma.brandFieldDefinition.deleteMany({ where: { brandId, source: "sample" } });
const login = await request("/admin/session/login", {
method: "POST",
payload: { username: "admin", password: process.env.SEED_ADMIN_PASSWORD },
@@ -619,6 +629,32 @@ test("admin login validates credentials", async () => {
assert.equal(response.statusCode, 401);
});
test("disabled brand membership blocks existing admin token", async () => {
const login = await request("/admin/session/login", {
method: "POST",
payload: { username: "admin", password: process.env.SEED_ADMIN_PASSWORD },
});
const token = JSON.parse(login.body).token;
const admin = await prisma.adminUser.findUnique({ where: { username: "admin" } });
assert.ok(admin);
const membership = await prisma.brandMembership.findUnique({
where: { adminUserId_brandId: { adminUserId: admin.id, brandId } },
});
assert.ok(membership);
await prisma.brandMembership.update({ where: { id: membership.id }, data: { isEnabled: false } });
try {
const response = await request("/admin/workspace", {
headers: { authorization: `Bearer ${token}` },
});
assert.equal(response.statusCode, 403);
} finally {
await prisma.brandMembership.update({
where: { id: membership.id },
data: { isEnabled: true },
});
}
});
test("admin can read and update brand and service configuration", async () => {
const login = await request("/admin/session/login", {
method: "POST",