[PR #20] [MERGED] Improve Folder::delete() to handle FolderCipher #2576

New issue

Closed

opened 2026-03-03 02:19:50 +03:00 by kerem · 0 comments

kerem commented

2026-03-03 02:19:50 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/20
Author: @mprasil
Created: 5/16/2018
Status: ✅ Merged
Merged: 5/16/2018
Merged by: @dani-garcia

Base: master ← Head: folder_delete

📝 Commits (1)

e54b52f Improve Folder::delete() to handle FolderCipher

📊 Changes

4 files changed (+30 additions, -15 deletions)

View changed files

📝 src/api/core/accounts.rs (+6 -1)
📝 src/api/core/ciphers.rs (+6 -1)
📝 src/api/core/folders.rs (+4 -6)
📝 src/db/models/folder.rs (+14 -7)

📄 Description

This moves the FolderCipher deletion into Folder.delete() so we do also remove the FolderCipher mapping no matter where we call the delete(). Also improvements were added to handle failures better as per #6.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/dani-garcia/vaultwarden/pull/20 **Author:** [@mprasil](https://github.com/mprasil) **Created:** 5/16/2018 **Status:** ✅ Merged **Merged:** 5/16/2018 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `master` ← **Head:** `folder_delete` --- ### 📝 Commits (1) - [`e54b52f`](https://github.com/dani-garcia/vaultwarden/commit/e54b52f10970b2f258224ea8dfa92267654a1e47) Improve Folder::delete() to handle FolderCipher ### 📊 Changes **4 files changed** (+30 additions, -15 deletions) <details> <summary>View changed files</summary> 📝 `src/api/core/accounts.rs` (+6 -1) 📝 `src/api/core/ciphers.rs` (+6 -1) 📝 `src/api/core/folders.rs` (+4 -6) 📝 `src/db/models/folder.rs` (+14 -7) </details> ### 📄 Description This moves the `FolderCipher` deletion into `Folder.delete()` so we do also remove the `FolderCipher` mapping no matter where we call the `delete()`. Also improvements were added to handle failures better as per #6. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>