kgess-mirror/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2026-01-11 19:57:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

[PM-29650] retain item archive date on softdelete (#6771)
Some checks are pending
Collect code references / Check for secret access (push) Waiting to run
Details
Collect code references / Code reference collection (push) Blocked by required conditions
Details
Scan / Check PR run (push) Waiting to run
Details
Scan / Checkmarx (push) Blocked by required conditions
Details
Scan / Sonar (push) Blocked by required conditions
Details
Testing / Run tests (push) Waiting to run
Details

Browse source
This commit is contained in:
Jason Ng 2025-12-29 13:30:57 -05:00 • committed by GitHub
parent 3b5bb76800
commit 34b4dc3985
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -719,13 +719,6 @@ public class CipherService : ICipherService
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 _securityTaskRepository.MarkAsCompleteByCipherIds([cipherDetails.Id]);
await _cipherRepository.UpsertAsync(cipherDetails);
await _eventService.LogCipherEventAsync(cipherDetails, EventType.Cipher_SoftDeleted);