TalexDreamSoul/teatea-pension
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: scope workspace routes by organization slug

Browse Source
This commit is contained in:
admin
2026-07-02 20:11:57 -07:00
parent fae97a7046
commit 3ab0e3e034
48 changed files with 565 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/api/organizations/[id]/route.ts
View File

@@ -6,6 +6,7 @@ import { requirePermission } from "@/modules/core/server/auth";
import { getDatabase } from "@/modules/core/server/db";
import { organizations } from "@/modules/core/server/schema";
import type { OrganizationStatus } from "@/modules/core/types";
import { RESERVED_WORKSPACE_SLUGS } from "@/modules/shared/lib/workspace-routing";
type RouteContext = {
params: Promise<{
@@ -38,7 +39,7 @@ function readStatus(value: unknown): OrganizationStatus | null {
}
function isValidSlug(value: string): boolean {
return /^[a-z0-9][a-z0-9-]{1,47}$/.test(value) && !value.endsWith("-");
return /^[a-z0-9][a-z0-9-]{1,47}$/.test(value) && !value.endsWith("-") && !RESERVED_WORKSPACE_SLUGS.has(value);
}
export async function PATCH(request: Request, context: RouteContext): Promise<Response> {
@@ -74,7 +75,7 @@ export async function PATCH(request: Request, context: RouteContext): Promise<Re
return jsonFailure("机构标识不能为空");
}
if (slug && !isValidSlug(slug)) {
return jsonFailure("机构标识仅支持小写字母、数字和连字符，长度 2-48 位，且不能以连字符结尾");
return jsonFailure("机构标识仅支持小写字母、数字和连字符，长度 2-48 位，不能以连字符结尾，且不能使用系统路径保留字");
}
const registrationEnabled = "registrationEnabled" in body ? readBoolean(body, "registrationEnabled") : null;
const oidcEnabled = "oidcEnabled" in body ? readBoolean(body, "oidcEnabled") : null;

5
app/api/organizations/route.ts
View File

@@ -7,6 +7,7 @@ import { getDatabase } from "@/modules/core/server/db";
import { seedOrganizationRoles } from "@/modules/core/server/permissions";
import { organizations } from "@/modules/core/server/schema";
import { getSystemSettings } from "@/modules/core/server/system-settings";
import { RESERVED_WORKSPACE_SLUGS } from "@/modules/shared/lib/workspace-routing";
function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -18,7 +19,7 @@ function readString(source: Record<string, unknown>, key: string): string {
}
function isValidSlug(value: string): boolean {
return /^[a-z0-9][a-z0-9-]{1,47}$/.test(value) && !value.endsWith("-");
return /^[a-z0-9][a-z0-9-]{1,47}$/.test(value) && !value.endsWith("-") && !RESERVED_WORKSPACE_SLUGS.has(value);
}
export async function GET(): Promise<Response> {
@@ -75,7 +76,7 @@ export async function POST(request: Request): Promise<Response> {
return jsonFailure("机构标识不能为空");
}
if (!isValidSlug(slug)) {
return jsonFailure("机构标识仅支持小写字母、数字和连字符，长度 2-48 位，且不能以连字符结尾");
return jsonFailure("机构标识仅支持小写字母、数字和连字符，长度 2-48 位，不能以连字符结尾，且不能使用系统路径保留字");
}
const database = getDatabase();