bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-15 07:43:54 +00:00
Code Issues Releases Wiki Activity

When deleting an archived clear the archived date so it will be restored to the vault (#6398)

Browse Source
This commit is contained in:
Nick Krantz
2025-09-30 10:04:11 -05:00
committed by GitHub
parent fc07dec3a6
commit 12303b3acf
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Core/Vault/Services/Implementations/CipherService.cs
View File

@@ -721,6 +721,13 @@ public class CipherService : ICipherService
cipherDetails.DeletedDate = cipherDetails.RevisionDate = DateTime.UtcNow; cipherDetails.DeletedDate = cipherDetails.RevisionDate = DateTime.UtcNow;
if (cipherDetails.ArchivedDate.HasValue)
{
// If the cipher was archived, clear the archived date when soft deleting
// If a user were to restore an archived cipher, it should go back to the vault not the archive vault
cipherDetails.ArchivedDate = null;
}
await _cipherRepository.UpsertAsync(cipherDetails); await _cipherRepository.UpsertAsync(cipherDetails);
await _eventService.LogCipherEventAsync(cipherDetails, EventType.Cipher_SoftDeleted); await _eventService.LogCipherEventAsync(cipherDetails, EventType.Cipher_SoftDeleted);