@autional-cn/shared 0.1.0-rc → 0.1.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autional-cn/shared",
-  "version": "0.1.0-rc",
+  "version": "0.1.0-rc.2",
   "description": "Autional shared layer — API client, auth, types, hooks, utils",
   "license": "AGPL-3.0",
   "main": "./src/index.ts",
@@ -22,15 +22,15 @@
   "dependencies": {
     "@opentelemetry/api": "1.9.1",
     "@tanstack/react-query": "5.100.9",
+    "@types/lodash-es": "4.17.12",
+    "@types/node": "26.1.2",
+    "@types/react": "19.2.14",
+    "@types/react-dom": "19.2.3",
     "axios": "1.16.0",
     "lodash-es": "4.18.1",
     "zustand": "5.0.13"
   },
   "devDependencies": {
-    "@types/lodash-es": "4.17.12",
-    "@types/node": "26.1.2",
-    "@types/react": "19.2.14",
-    "@types/react-dom": "19.2.3",
     "react": "19.2.5",
     "react-dom": "19.2.5",
     "typescript": "5.8.3",

package/src/components/TenantRootRedirect.tsx

@@ -0,0 +1,45 @@
+import { useEffect, useMemo } from 'react';
+import { useCurrentTenantId } from '../hooks/useAuth';
+import { getPortalUrl } from '../config';
+import { usePublicTenantSlugs } from './TenantIndexGuard';
+
+/**
+ * 裸根 `/` 漏斗：门户入口必须带租户段（/:tenantSlug）。
+ * - 已有会话且能解析出 slug → 整页跳 /<slug>/（不经过 brand）
+ * - 否则整页跳 brand 选品牌（brand → auth 登录 → 回本门户 /<slug>/）
+ *
+ * slug 解析**唯一权威 = 公开租户名单**（id → name，name 即 slug）。
+ * 不得用会话 store 的 tenants[].name —— 那是 identity `/auth/me/tenants` 的
+ * **展示名**（如 "Demo Tenant"），拼进 URL 会落 /Demo%20Tenant/ → 404（回归修复；
+ * 与 auth 站 8859e4d 的 pickSessionSlug 同口径）。
+ *
+ * 注：本包刻意不依赖 react-router（它只属于各 app），故不走 <Navigate>。
+ */
+export function TenantRootRedirect() {
+	const currentTenantId = useCurrentTenantId();
+	const { data: knownTenants, isSuccess: tenantsLoaded } = usePublicTenantSlugs();
+
+	const slug = useMemo(() => {
+		if (!currentTenantId || !tenantsLoaded) return undefined;
+		const match = (knownTenants ?? []).find((t) => t.id === currentTenantId);
+		return match?.name || match?.slug || undefined;
+	}, [currentTenantId, knownTenants, tenantsLoaded]);
+
+	useEffect(() => {
+		if (typeof window === 'undefined') return;
+		if (slug) {
+			const base = window.location.pathname.replace(/\/+$/, '');
+			window.location.replace(`${base}/${slug}/`);
+			return;
+		}
+		// 有会话但公开名单尚未返回：等待（名单是 slug 唯一权威，不得抢跑漏斗 brand）。
+		// 无会话（currentTenantId 空）不受此闸，立即漏斗。
+		if (currentTenantId && !tenantsLoaded) return;
+		const target = `${getPortalUrl('brand')}/?redirect=${encodeURIComponent(
+			window.location.origin + window.location.pathname,
+		)}`;
+		window.location.replace(target);
+	}, [slug, currentTenantId, tenantsLoaded]);
+
+	return null;
+}

package/src/components/__tests__/TenantRootRedirect.test.tsx

@@ -0,0 +1,158 @@
+// @vitest-environment jsdom
+import '@testing-library/jest-dom/vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { render, cleanup, waitFor } from '@testing-library/react';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import type { ReactNode } from 'react';
+
+// ============================================================
+// F-W7-a：TenantRootRedirect 的裸根 slug 解析
+//  - slug 解析**唯一权威 = 公开租户名单**（id → name，name 即 slug）
+//  - 会话 store 的 tenants[].name 是**展示名**（"Demo Tenant"），拼进 URL 会落
+//    /Demo%20Tenant/ → 404（回归修复；与 auth 站 8859e4d pickSessionSlug 同口径）
+//  - 有会话但公开名单未返回：等待，不抢跑漏斗 brand
+// ============================================================
+
+const { mockState } = vi.hoisted(() => ({
+	mockState: {
+		currentTenantId: null as string | null,
+		// 会话 store 的租户（展示名口径）——回归锁：组件若回退用它，断言必红
+		storeTenants: [] as Array<{ id: string; name: string; role: string }>,
+		replace: vi.fn(),
+	},
+}));
+
+vi.mock('../../hooks/useAuth', async (importOriginal) => ({
+	...(await importOriginal<typeof import('../../hooks/useAuth')>()),
+	useCurrentTenantId: () => mockState.currentTenantId,
+	useTenants: () => mockState.storeTenants,
+}));
+
+import { TenantRootRedirect } from '../TenantRootRedirect';
+import { getPortalUrl } from '../../config';
+
+function wrapper(children: ReactNode) {
+	return (
+		<QueryClientProvider
+			client={new QueryClient({ defaultOptions: { queries: { retry: false, gcTime: Infinity } } })}
+		>
+			{children}
+		</QueryClientProvider>
+	);
+}
+
+function stubTenantList(items: unknown[]) {
+	vi.stubGlobal(
+		'fetch',
+		vi.fn().mockResolvedValue({
+			ok: true,
+			status: 200,
+			json: async () => ({ code: 0, message: 'success', items, total: items.length }),
+		}),
+	);
+}
+
+function expectedBrandFunnel() {
+	return `${getPortalUrl('brand')}/?redirect=${encodeURIComponent(
+		window.location.origin + window.location.pathname,
+	)}`;
+}
+
+const originalWindowLocation = window.location;
+
+beforeEach(() => {
+	vi.clearAllMocks();
+	mockState.currentTenantId = null;
+	mockState.storeTenants = [];
+	window.history.pushState({}, '', '/');
+	delete (window as any).__APP_CONFIG__;
+
+	// replace 拦截 + 关键读取面委托真身（pushState 后仍反映当前值）
+	delete (window as any).location;
+	(window as any).location = Object.defineProperties(
+		{},
+		{
+			...Object.getOwnPropertyDescriptors(originalWindowLocation),
+			protocol: { get: () => originalWindowLocation.protocol, configurable: true },
+			hostname: { get: () => originalWindowLocation.hostname, configurable: true },
+			origin: { get: () => originalWindowLocation.origin, configurable: true },
+			href: { get: () => originalWindowLocation.href, configurable: true },
+			pathname: { get: () => originalWindowLocation.pathname, configurable: true },
+			replace: { get: () => mockState.replace, configurable: true },
+		},
+	);
+});
+
+afterEach(() => {
+	if (window.location !== originalWindowLocation) {
+		Object.defineProperty(window, 'location', { value: originalWindowLocation, writable: true });
+	}
+	cleanup();
+	vi.unstubAllGlobals();
+});
+
+describe('TenantRootRedirect 裸根漏斗', () => {
+	it('有会话 + 名单命中 → 跳 /<slug>/，且 slug 取自公开名单（非展示名）', async () => {
+		mockState.currentTenantId = 't1';
+		// 会话 store 里是展示名（老缺陷来源）——组件不得使用
+		mockState.storeTenants = [{ id: 't1', name: 'Demo Tenant', role: 'owner' }];
+		stubTenantList([{ id: 't1', name: 'demo', display_name: 'Demo Tenant' }]);
+
+		render(wrapper(<TenantRootRedirect />));
+
+		await waitFor(() => expect(mockState.replace).toHaveBeenCalled());
+		const url = String(mockState.replace.mock.calls[0][0]);
+		expect(url).toBe('/demo/');
+		expect(url).not.toContain('Demo%20Tenant');
+		expect(url).not.toContain('Demo');
+	});
+
+	it('名单项只有 slug 字段（无 name）→ 回退 slug', async () => {
+		mockState.currentTenantId = 't1';
+		stubTenantList([{ id: 't1', slug: 'demo-fallback' }]);
+
+		render(wrapper(<TenantRootRedirect />));
+
+		await waitFor(() => expect(mockState.replace).toHaveBeenCalled());
+		expect(String(mockState.replace.mock.calls[0][0])).toBe('/demo-fallback/');
+	});
+
+	it('有会话但名单未返回（加载中）→ 等待，不抢跑 brand 漏斗', async () => {
+		mockState.currentTenantId = 't1';
+		vi.stubGlobal('fetch', vi.fn().mockReturnValue(new Promise(() => {})));
+
+		render(wrapper(<TenantRootRedirect />));
+
+		await new Promise((r) => setTimeout(r, 60));
+		expect(mockState.replace).not.toHaveBeenCalled();
+	});
+
+	it('无会话 → 漏斗 brand（带 redirect=当前 origin+pathname）', async () => {
+		stubTenantList([{ id: 't1', name: 'demo' }]);
+
+		render(wrapper(<TenantRootRedirect />));
+
+		await waitFor(() => expect(mockState.replace).toHaveBeenCalled());
+		expect(String(mockState.replace.mock.calls[0][0])).toBe(expectedBrandFunnel());
+	});
+
+	it('有会话但名单无匹配（陈旧会话）→ 漏斗 brand', async () => {
+		mockState.currentTenantId = 't-unknown';
+		stubTenantList([{ id: 't1', name: 'demo' }]);
+
+		render(wrapper(<TenantRootRedirect />));
+
+		await waitFor(() => expect(mockState.replace).toHaveBeenCalled());
+		expect(String(mockState.replace.mock.calls[0][0])).toBe(expectedBrandFunnel());
+	});
+
+	it('名单接口失败（返回空数组）→ 有会话按无匹配处理，漏斗 brand（不卡死）', async () => {
+		mockState.currentTenantId = 't1';
+		vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new Error('network down')));
+
+		render(wrapper(<TenantRootRedirect />));
+
+		await waitFor(() => expect(mockState.replace).toHaveBeenCalled());
+		expect(String(mockState.replace.mock.calls[0][0])).toBe(expectedBrandFunnel());
+	});
+});

package/src/config/__tests__/portal-resolver.test.ts

@@ -208,10 +208,10 @@ describe('getPortalUrl', () => {
 			expect(getPortalUrl('authenticator', 'demo')).toBe(
 				'https://authenticator.autional.cn/demo',
 			);
+			expect(getPortalUrl('platform', 'demo')).toBe('https://platform.autional.cn/demo');
 		});
 
 		it('keeps domain-root portals at root even when a slug is passed', () => {
-			expect(getPortalUrl('platform', 'demo')).toBe('https://platform.autional.cn');
 			expect(getPortalUrl('status', 'demo')).toBe('https://status.autional.cn');
 			expect(getPortalUrl('trust', 'demo')).toBe('https://trust.autional.cn');
 			expect(getPortalUrl('developer', 'demo')).toBe('https://developer.autional.cn');
@@ -234,9 +234,9 @@ describe('getPortalUrl', () => {
 			});
 		});
 
-		it('legacy branch: slug appended for auth, not for platform', () => {
+		it('legacy branch: slug appended for auth and platform', () => {
 			expect(getPortalUrl('auth', 'demo')).toBe('https://auth.iam.tianv.com/demo');
-			expect(getPortalUrl('platform', 'demo')).toBe('https://platform.iam.tianv.com');
+			expect(getPortalUrl('platform', 'demo')).toBe('https://platform.iam.tianv.com/demo');
 		});
 
 		it('default-table branch: slug appended for user, not for status', () => {

package/src/config/index.ts

@@ -177,15 +177,19 @@ function resolvePortalUrl(entry: PortalEntry, hostname: string, slug?: string):
 	return url;
 }
 
-// 租户段门户白名单：仅这些门户的入口带 /<tenantSlug>（门户 URL 统一方案 —— user/security/admin/authenticator，auth 一并统一）。
-// 其余门户（platform/status/trust/developer/brand/landing）是域根应用，拼租户段会命中不存在的路由 ⇒ 空白/404
-//（F-W8：auth dashboard 磁贴曾因此断 4/8）。新增租户段门户时须同步在此登记。
+// 租户段门户白名单：仅这些门户的入口带 /<tenantSlug>（门户 URL 统一方案）。
+// platform 于 09-30 修订加入（F-W8 再修）：platform 控制台本就是租户段挂载应用
+// （legacy seed 049 requires_slug:true），且 OAuth client 按 slug 解析 —— 不拼租户段时
+// 控制台拿不到 client，裸根入口退化为登录死循环。其余门户（status/trust/developer/
+// brand/landing）是域根应用，拼租户段会命中不存在的路由 ⇒ 空白/404。
+// 新增租户段门户时须同步在此登记。
 const SLUG_PORTALS: ReadonlySet<string> = new Set([
 	'auth',
 	'admin',
 	'user',
 	'security',
 	'authenticator',
+	'platform',
 ]);
 
 export function getPortalUrl(portalId: string, slug?: string): string {

package/src/index.ts

@@ -128,6 +128,7 @@ export * from './seo';
 
 // Components
 export { RequireAuth } from './components/RequireAuth';
+export { TenantRootRedirect } from './components/TenantRootRedirect';
 export { OAuthCallbackPage } from './components/OAuthCallbackPage';
 export { TenantSlugProvider, useTenantSlug } from './auth/tenant-slug-context';
 export { useTenantSlugFromUrl, extractSlugFromPath, registerNonTenantSegments, clearNonTenantSegments } from './auth/slug-from-url';