From dc3d0026a43bcdd59d6ff0896e4105a3a28bfb44 Mon Sep 17 00:00:00 2001 From: xEsiah Date: Thu, 22 Oct 2026 12:38:40 +0200 Subject: [PATCH] fix(files): allow uploading to root when another user has same name Root is a personal namespace per user, so duplicate checks must scope to the current owner when uploading at root level. Subfolders keep their existing uniqueness rules. Also fixed folder creation at root with the same owner scope. --- backend/src/routes/files.ts | 11 +++++++++-- backend/src/routes/folders.ts | 9 +++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/backend/src/routes/files.ts b/backend/src/routes/files.ts index f12cf47..170b461 100644 --- a/backend/src/routes/files.ts +++ b/backend/src/routes/files.ts @@ -267,10 +267,17 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { throw AppError.payloadTooLarge("Votre quota de stockage est depasse."); } + // Un nom est unique dans un dossier, mais la racine est un espace + // personnel : chaque utilisateur y depose ses propres fichiers, et la + // liste n'en montre que les siens. Le controle de doublon doit donc + // suivre la meme regle, sinon le fichier d'un autre compte a la racine + // bloquerait un depot qui n'a rien a voir avec lui. const duplicate = await db.one( `SELECT 1 AS taken FROM files - WHERE folder_id <=> ? AND active_name = ? AND deleted_at IS NULL LIMIT 1`, - [folderId, name], + WHERE folder_id <=> ? AND active_name = ? AND deleted_at IS NULL + AND ( folder_id IS NOT NULL OR owner_id = ? ) + LIMIT 1`, + [folderId, name, user.id], ); if (duplicate) throw AppError.conflict("Ce nom existe deja ici."); diff --git a/backend/src/routes/folders.ts b/backend/src/routes/folders.ts index 24165fe..17ae818 100644 --- a/backend/src/routes/folders.ts +++ b/backend/src/routes/folders.ts @@ -159,10 +159,15 @@ export const registerFolderRoutes = (app: App, db: Db, config: Config): void => } } + // La racine est l'espace personnel de chaque compte : un dossier du meme + // nom cree par quelqu'un d'autre ne doit pas bloquer celui-ci. Dans un + // dossier, le nom reste unique pour tous ses participants. const duplicate = await db.one( `SELECT 1 AS taken FROM folders - WHERE parent_id <=> ? AND active_name = ? AND deleted_at IS NULL LIMIT 1`, - [parentId ?? null, name], + WHERE parent_id <=> ? AND active_name = ? AND deleted_at IS NULL + AND ( parent_id IS NOT NULL OR owner_id = ? ) + LIMIT 1`, + [parentId ?? null, name, user.id], ); if (duplicate) throw AppError.conflict("Ce nom existe deja ici.");