Skip to content

[PM-29650] Keep ArchiveDate on SoftDelete #6771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jingo88 merged 1 commit into from
Dec 29, 2025
Merged

[PM-29650] Keep ArchiveDate on SoftDelete #6771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/Core/Vault/Services/Implementations/CipherService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,13 +718,6 @@ public async Task SoftDeleteAsync(CipherDetails cipherDetails, Guid deletingUser

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);
Expand Down
Loading