Skip to content

[PM-30247] Previously archived items are not archived after import #6824

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

Open
harr1424 wants to merge 3 commits into
base: main
Choose a base branch
from
+39 −0
Open

[PM-30247] Previously archived items are not archived after import #6824

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
638f400
support importing archived ciphers
harr1424 Jan 10, 2026
f839426
respond to Claude's findings
harr1424 Jan 10, 2026
d823ae5
Merge branch 'main' into PM-30247-Defect-Previously-archived-items-do…
harr1424 Jan 12, 2026
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
6 changes: 6 additions & 0 deletions src/Core/Tools/ImportFeatures/ImportCiphersCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@
{
cipher.Favorites = $"{{\"{cipher.UserId.ToString().ToUpperInvariant()}\":\"true\"}}";
}

if (cipher.ArchivedDate.HasValue)
{
cipher.Archives = $"{{\"{cipher.UserId.ToString().ToUpperInvariant()}\":\"" +
$"{cipher.ArchivedDate.Value:yyyy-MM-ddTHH:mm:ss.fffffffZ}\"}}";
}
}

var userfoldersIds = (await _folderRepository.GetManyByUserIdAsync(importingUserId)).Select(f => f.Id).ToList();
Expand Down Expand Up @@ -122,7 +128,7 @@
{
var org = collections.Count > 0 ?
await _organizationRepository.GetByIdAsync(collections[0].OrganizationId) :
await _organizationRepository.GetByIdAsync(ciphers.FirstOrDefault(c => c.OrganizationId.HasValue).OrganizationId.Value);

Check warning on line 131 in src/Core/Tools/ImportFeatures/ImportCiphersCommand.cs

View workflow job for this annotation

GitHub Actions / Sonar / Quality scan 

'ciphers.FirstOrDefault(c => c.OrganizationId.HasValue)' is null on at least one execution path. (https://rules.sonarsource.com/csharp/RSPEC-2259)
var importingOrgUser = await _organizationUserRepository.GetByOrganizationAsync(org.Id, importingUserId);

if (collections.Count > 0 && org != null && org.MaxCollections.HasValue)
Expand Down
Loading