Merge remote-tracking branch 'origin/dev' into dev

2026-07-21 19:55:51 +02:00
parent 5585bd7012 37d08ee984
commit 430ab74522
8 changed files with 249 additions and 64 deletions
--- a/backend/src/routes/auth/me.ts
+++ b/backend/src/routes/auth/me.ts
@@ -69,7 +69,9 @@ export default async function meRoutes(server: FastifyInstance) {
                .innerJoin(tenants, eq(authTenantUsers.tenant_id, tenants.id))
                .where(eq(authTenantUsers.user_id, userId))

-            const tenantList = tenantRows ?? []
+            const tenantList = Array.from(
+                new Map((tenantRows ?? []).map((tenant) => [tenant.id, tenant])).values()
+            )

            // ----------------------------------------------------
            // 3) ACTIVE TENANT