From e89b7515729a0f4b260c3ce34380a57e04d1fab8 Mon Sep 17 00:00:00 2001 From: que01 Date: Wed, 23 Sep 2026 02:36:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E5=93=81=E7=89=8C=20membership=20=E5=AE=88=E5=8D=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/api/src/admin-auth.service.ts | 12 +++++++-- apps/api/src/admin-membership.guard.ts | 16 ++++++++++++ apps/api/src/main.ts | 3 +++ apps/api/test/http.integration.test.js | 36 ++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 apps/api/src/admin-membership.guard.ts diff --git a/apps/api/src/admin-auth.service.ts b/apps/api/src/admin-auth.service.ts index c247411..3fdc3f3 100644 --- a/apps/api/src/admin-auth.service.ts +++ b/apps/api/src/admin-auth.service.ts @@ -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, diff --git a/apps/api/src/admin-membership.guard.ts b/apps/api/src/admin-membership.guard.ts new file mode 100644 index 0000000..23e4d30 --- /dev/null +++ b/apps/api/src/admin-membership.guard.ts @@ -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 { + const request = context.switchToHttp().getRequest(); + 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); + } +} diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts index 72a7fb7..527424b 100644 --- a/apps/api/src/main.ts +++ b/apps/api/src/main.ts @@ -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 { const app = await NestFactory.create(AppModule, new FastifyAdapter()); + app.useGlobalGuards(app.get(AdminMembershipGuard)); app.useGlobalPipes( new ValidationPipe({ whitelist: true, forbidNonWhitelisted: true, transform: true }), ); diff --git a/apps/api/test/http.integration.test.js b/apps/api/test/http.integration.test.js index 1d00b5f..847f75b 100644 --- a/apps/api/test/http.integration.test.js +++ b/apps/api/test/http.integration.test.js @@ -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",