From 58b58c39a26290af7ffc7d9bf8b159a23c45902e Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 3 Jul 2026 17:31:46 +0200 Subject: [PATCH] After finalise with the internationarization of web part3 --- backend/src/repositories/userRepository.ts | 15 +++++++++++---- backend/src/services/setupService.ts | 13 +++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/backend/src/repositories/userRepository.ts b/backend/src/repositories/userRepository.ts index 0035d5b6..11199f6a 100644 --- a/backend/src/repositories/userRepository.ts +++ b/backend/src/repositories/userRepository.ts @@ -782,10 +782,17 @@ export async function setEmailVerified(userId: string, verified: boolean): Promi export async function countUsersWithRole(roleName: string): Promise { const rows = await query<{ count: string }[]>( - `SELECT COUNT(*)::text AS count - FROM users u - JOIN roles r ON r.id = u.role_id - WHERE r.name = $1`, + `SELECT COUNT(DISTINCT uid)::text AS count FROM ( + SELECT ur.user_id AS uid + FROM user_roles ur + JOIN roles r ON r.id = ur.role_id + WHERE r.name = $1 + UNION + SELECT u.id AS uid + FROM users u + JOIN roles r ON r.id = u.role_id + WHERE r.name = $1 + ) t`, [roleName] ); return parseInt(rows[0]?.count ?? '0', 10); diff --git a/backend/src/services/setupService.ts b/backend/src/services/setupService.ts index 9e3f0ba2..63d59101 100644 --- a/backend/src/services/setupService.ts +++ b/backend/src/services/setupService.ts @@ -34,17 +34,22 @@ function assertSetupToken(provided: string): void { } } +/** True when at least one administrator exists (admin or super_admin in user_roles). */ +async function hasPlatformAdministrator(): Promise { + const adminCount = await roleRepository.countUsersWithRoleName('admin'); + const superAdminCount = await roleRepository.countUsersWithRoleName('super_admin'); + return adminCount > 0 || superAdminCount > 0; +} + export async function getSetupStatus(): Promise { - const adminCount = await userRepository.countUsersWithRole('admin'); return { - needsSetup: adminCount === 0, + needsSetup: !(await hasPlatformAdministrator()), setupEnabled: Boolean(config.setup.token && config.setup.token.length >= 16), }; } async function ensureNoAdminYet(): Promise { - const adminCount = await userRepository.countUsersWithRole('admin'); - if (adminCount > 0) { + if (await hasPlatformAdministrator()) { throw new Error('Platform setup is already complete. An administrator account exists.'); } }