feat: add validFolderIds support for cipher responses and update folder handling in storage

This commit is contained in:
shuaiplus
2026-06-28 19:43:27 +08:00
parent a5ad16ac27
commit 82f968e51f
3 changed files with 26 additions and 7 deletions
+14 -4
View File
@@ -44,9 +44,14 @@ export async function clearFolderFromCiphers(
`UPDATE ciphers
SET folder_id = NULL, updated_at = ?,
data = json_remove(data, '$.folderId', '$.folder_id', '$.updatedAt', '$.revisionDate')
WHERE user_id = ? AND folder_id = ?`
WHERE user_id = ?
AND (
folder_id = ?
OR json_extract(data, '$.folderId') = ?
OR json_extract(data, '$.folder_id') = ?
)`
)
.bind(now, userId, folderId)
.bind(now, userId, folderId, folderId, folderId)
.run();
}
@@ -71,9 +76,14 @@ export async function bulkDeleteFolders(
`UPDATE ciphers
SET folder_id = NULL, updated_at = ?,
data = json_remove(data, '$.folderId', '$.folder_id', '$.updatedAt', '$.revisionDate')
WHERE user_id = ? AND folder_id IN (${placeholders})`
WHERE user_id = ?
AND (
folder_id IN (${placeholders})
OR json_extract(data, '$.folderId') IN (${placeholders})
OR json_extract(data, '$.folder_id') IN (${placeholders})
)`
)
.bind(now, userId, ...chunk)
.bind(now, userId, ...chunk, ...chunk, ...chunk)
.run();
await db