Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-21 11:35:34 +01:00
Code Issues Projects Releases Wiki Activity

Changed logic to validate if cipher has a collection on targetSelector method (#8422)

Browse Source 
Added tests to import.service.spec.ts that test if the collectionRelationship and folderRelationship properly adapts
This commit is contained in:
aj-rosado 2024-03-25 18:10:40 +00:00 committed by GitHub
parent 2ae6fbe275
commit b180463cc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 97 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/importer/spec/test-data/bitwarden-json/cipher-with-collections.json.ts Normal file
View File

@ -0,0 +1,37 @@
export const cipherWithCollections = `{
"encrypted": false,
"collections": [
{
"id": "8e3f5ba1-3e87-4ee8-8da9-b1180099ff9f",
"organizationId": "c6181652-66eb-4cd9-a7f2-b02a00e12352",
"name": "asdf",
"externalId": null
}
],
"items": [
{
"passwordHistory": null,
"revisionDate": "2024-02-16T09:20:48.383Z",
"creationDate": "2024-02-16T09:20:48.383Z",
"deletedDate": null,
"id": "f761a968-4b0f-4090-a568-b118009a07b5",
"organizationId": "c6181652-66eb-4cd9-a7f2-b02a00e12352",
"folderId": null,
"type": 1,
"reprompt": 0,
"name": "asdf123",
"notes": null,
"favorite": false,
"login": {
"fido2Credentials": [],
"uris": [],
"username": null,
"password": null,
"totp": null
},
"collectionIds": [
"8e3f5ba1-3e87-4ee8-8da9-b1180099ff9f"
]
}
]
}`;

56
libs/importer/src/services/import.service.spec.ts
View File

@ -6,6 +6,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
@ -207,5 +208,60 @@ describe("ImportService", () => {
await expect(setImportTargetMethod).rejects.toThrow("Error assigning target folder");
});
it("passing importTarget, collectionRelationship has the expected values", async () => {
collectionService.getAllDecrypted.mockResolvedValue([
mockImportTargetCollection,
mockCollection1,
mockCollection2,
]);
importResult.ciphers.push(createCipher({ name: "cipher1" }));
importResult.ciphers.push(createCipher({ name: "cipher2" }));
importResult.collectionRelationships.push([0, 0]);
importResult.collections.push(mockCollection1);
importResult.collections.push(mockCollection2);
await importService["setImportTarget"](
importResult,
organizationId,
mockImportTargetCollection,
);
expect(importResult.collectionRelationships.length).toEqual(2);
expect(importResult.collectionRelationships[0]).toEqual([1, 0]);
expect(importResult.collectionRelationships[1]).toEqual([0, 1]);
});
it("passing importTarget, folderRelationship has the expected values", async () => {
folderService.getAllDecryptedFromState.mockResolvedValue([
mockImportTargetFolder,
mockFolder1,
mockFolder2,
]);
importResult.folders.push(mockFolder1);
importResult.folders.push(mockFolder2);
importResult.ciphers.push(createCipher({ name: "cipher1", folderId: mockFolder1.id }));
importResult.ciphers.push(createCipher({ name: "cipher2" }));
importResult.folderRelationships.push([0, 0]);
await importService["setImportTarget"](importResult, "", mockImportTargetFolder);
expect(importResult.folderRelationships.length).toEqual(2);
expect(importResult.folderRelationships[0]).toEqual([1, 0]);
expect(importResult.folderRelationships[1]).toEqual([0, 1]);
});
});
});
function createCipher(options: Partial<CipherView> = {}) {
const cipher = new CipherView();
cipher.name;
cipher.type = options.type;
cipher.folderId = options.folderId;
cipher.collectionIds = options.collectionIds;
cipher.organizationId = options.organizationId;
return cipher;
}

6
libs/importer/src/services/import.service.ts
View File

@ -437,8 +437,10 @@ export class ImportService implements ImportServiceAbstraction {
const noCollectionRelationShips: [number, number][] = [];
importResult.ciphers.forEach((c, index) => {
if (!Array.isArray(c.collectionIds) || c.collectionIds.length == 0) {
c.collectionIds = [importTarget.id];
if (
!Array.isArray(importResult.collectionRelationships) ||
!importResult.collectionRelationships.some(([cipherPos]) => cipherPos === index)
) {
noCollectionRelationShips.push([index, 0]);
}
});