fix(files): allow uploading to root when another user has same name
PR — Ouverture automatique / create-pr (push) Successful in 4s
PR — Ouverture automatique / create-pr (push) Successful in 4s
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.
This commit is contained in:
@@ -267,10 +267,17 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => {
|
|||||||
throw AppError.payloadTooLarge("Votre quota de stockage est depasse.");
|
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(
|
const duplicate = await db.one(
|
||||||
`SELECT 1 AS taken FROM files
|
`SELECT 1 AS taken FROM files
|
||||||
WHERE folder_id <=> ? AND active_name = ? AND deleted_at IS NULL LIMIT 1`,
|
WHERE folder_id <=> ? AND active_name = ? AND deleted_at IS NULL
|
||||||
[folderId, name],
|
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.");
|
if (duplicate) throw AppError.conflict("Ce nom existe deja ici.");
|
||||||
|
|
||||||
|
|||||||
@@ -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(
|
const duplicate = await db.one(
|
||||||
`SELECT 1 AS taken FROM folders
|
`SELECT 1 AS taken FROM folders
|
||||||
WHERE parent_id <=> ? AND active_name = ? AND deleted_at IS NULL LIMIT 1`,
|
WHERE parent_id <=> ? AND active_name = ? AND deleted_at IS NULL
|
||||||
[parentId ?? null, name],
|
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.");
|
if (duplicate) throw AppError.conflict("Ce nom existe deja ici.");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user