From 53c132e41da57ea8ce360f4ea37a7048b50f8915 Mon Sep 17 00:00:00 2001 From: yiling Date: Fri, 19 Jun 2026 00:36:23 +0800 Subject: [PATCH] feat(auth): refine demo mode support using SHUMAI_DEMO_MODE API --- bunfig.toml | 1 - packages/api/src/authn.test.ts | 6 ++++-- packages/api/src/authn.ts | 3 ++- packages/api/src/middleware/auth.test.ts | 4 ++-- packages/api/src/middleware/auth.ts | 2 +- packages/core/src/auth/auth.ts | 2 +- packages/core/src/team/team.ts | 2 ++ packages/webui/routes/login.tsx | 11 +++-------- packages/webui/routes/signup.tsx | 2 +- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/bunfig.toml b/bunfig.toml index e233d92d..6a121e8a 100644 --- a/bunfig.toml +++ b/bunfig.toml @@ -1,5 +1,4 @@ [serve.static] -env = "PUBLIC_*" plugins = ["bun-plugin-tailwind"] [install] diff --git a/packages/api/src/authn.test.ts b/packages/api/src/authn.test.ts index 6dd981f6..3ea3d3b6 100644 --- a/packages/api/src/authn.test.ts +++ b/packages/api/src/authn.test.ts @@ -17,7 +17,8 @@ describe('authn api', () => { it('GET /signup-info', async () => { mockGetSignupInfo.mockResolvedValue({ - userCount: 5, + initialized: true, + demoMode: false, }) const app = new Hono().route('/', authnRoute) @@ -25,7 +26,8 @@ describe('authn api', () => { expect(res.status).toBe(200) expect(await res.json()).toEqual({ - userCount: 5, + initialized: true, + demoMode: false, }) }) }) diff --git a/packages/api/src/authn.ts b/packages/api/src/authn.ts index 4528a166..77793b9f 100644 --- a/packages/api/src/authn.ts +++ b/packages/api/src/authn.ts @@ -17,7 +17,8 @@ const route = app .get('/signup-info', async (c) => { const info = await teamService.getSignupInfo() return c.json({ - userCount: info.userCount, + initialized: info.initialized, + demoMode: info.demoMode, }) }) .get('/me', async (c) => { diff --git a/packages/api/src/middleware/auth.test.ts b/packages/api/src/middleware/auth.test.ts index 951812e7..27367422 100644 --- a/packages/api/src/middleware/auth.test.ts +++ b/packages/api/src/middleware/auth.test.ts @@ -32,7 +32,7 @@ describe('authMiddleware', () => { beforeEach(() => { vi.resetAllMocks() - delete process.env.PUBLIC_DEMO_MODE + delete process.env.SHUMAI_DEMO_MODE }) it('allows access when authenticated', async () => { @@ -54,7 +54,7 @@ describe('authMiddleware', () => { describe('read-only mode', () => { beforeEach(() => { - process.env.PUBLIC_DEMO_MODE = '1' + process.env.SHUMAI_DEMO_MODE = '1' }) it('allows GET for reviewer', async () => { diff --git a/packages/api/src/middleware/auth.ts b/packages/api/src/middleware/auth.ts index 3cd043d9..2ed6508f 100644 --- a/packages/api/src/middleware/auth.ts +++ b/packages/api/src/middleware/auth.ts @@ -29,7 +29,7 @@ export const authMiddleware = createMiddleware<{ c.set('user', user) - if (process.env.PUBLIC_DEMO_MODE === '1') { + if (process.env.SHUMAI_DEMO_MODE === '1') { const method = c.req.method.toUpperCase() const path = c.req.path if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(method) && !path.endsWith('/search')) { diff --git a/packages/core/src/auth/auth.ts b/packages/core/src/auth/auth.ts index 5a0ceccc..36256c6e 100644 --- a/packages/core/src/auth/auth.ts +++ b/packages/core/src/auth/auth.ts @@ -34,7 +34,7 @@ export const auth = betterAuth({ const info = await teamService.getSignupInfo() - if (info.userCount > 0) { + if (info.initialized) { if (!inviteCode) { console.log('[Better Auth Hook] Public signup is disabled') return ctx.json( diff --git a/packages/core/src/team/team.ts b/packages/core/src/team/team.ts index 137b7fe5..7621b96e 100644 --- a/packages/core/src/team/team.ts +++ b/packages/core/src/team/team.ts @@ -349,7 +349,9 @@ export class TeamService { const count = await prisma.user.count() return { + initialized: count > 0, userCount: count, + demoMode: process.env.SHUMAI_DEMO_MODE === '1', } } diff --git a/packages/webui/routes/login.tsx b/packages/webui/routes/login.tsx index c7d64ec3..38ecedcb 100644 --- a/packages/webui/routes/login.tsx +++ b/packages/webui/routes/login.tsx @@ -27,13 +27,6 @@ function LoginPage() { const [error, setError] = useState(null) const [loading, setLoading] = useState(false) - let isDemoEnv - try { - isDemoEnv = process.env.PUBLIC_DEMO_MODE === '1' - } catch { - isDemoEnv = false - } - const { data: signupInfo, isLoading: isSignupInfoLoading } = useQuery({ queryKey: ['/signup-info'], queryFn: async () => { @@ -44,11 +37,13 @@ function LoginPage() { }) useEffect(() => { - if (signupInfo?.userCount === 0) { + if (signupInfo && !signupInfo.initialized) { navigate({ to: '/signup', search: { inviteCode: '' } }) } }, [signupInfo, navigate]) + const isDemoEnv = signupInfo?.demoMode === true + const form = useForm({ resolver: zodResolver(loginSchema), }) diff --git a/packages/webui/routes/signup.tsx b/packages/webui/routes/signup.tsx index 230b9a5b..1c875f3c 100644 --- a/packages/webui/routes/signup.tsx +++ b/packages/webui/routes/signup.tsx @@ -96,7 +96,7 @@ function SignupPage() { ) } - const isFirstUser = signupInfo?.userCount === 0 + const isFirstUser = !signupInfo?.initialized const isPublicSignupDisabled = !isFirstUser && !inviteCode if (isPublicSignupDisabled) {