Fix subfolders not being created (#4653)

In Bitwarden, subfolders are separated/indicated using forward-slashes
The Keeper CSV export separates folders uses backslashes
Replace backslashes with forwardslashes in processFolder
Added tests to verfiy folder/collection creation
This commit is contained in:
Daniel James Smith 2023-02-17 21:01:21 +01:00 committed by GitHub
parent 999a40e755
commit 2b9bc08c71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 0 deletions

View File

@ -1,4 +1,5 @@
import { KeeperCsvImporter as Importer } from "@bitwarden/common/importers/keeper/keeper-csv-importer"; import { KeeperCsvImporter as Importer } from "@bitwarden/common/importers/keeper/keeper-csv-importer";
import { Utils } from "@bitwarden/common/misc/utils";
import { testData as TestData } from "./test-data/keeper-csv/testdata.csv"; import { testData as TestData } from "./test-data/keeper-csv/testdata.csv";
@ -74,4 +75,49 @@ describe("Keeper CSV Importer", () => {
expect(cipher3.fields[0].name).toEqual("Account ID"); expect(cipher3.fields[0].name).toEqual("Account ID");
expect(cipher3.fields[0].value).toEqual("23456"); expect(cipher3.fields[0].value).toEqual("23456");
}); });
it("should create folders, with subfolders and relationships", async () => {
const result = await importer.parse(TestData);
expect(result != null).toBe(true);
const folders = result.folders;
expect(folders).not.toBeNull();
expect(folders.length).toBe(2);
const folder1 = folders.shift();
expect(folder1.name).toBe("Foo");
//With subfolders
const folder2 = folders.shift();
expect(folder2.name).toBe("Foo/Baz");
// [Cipher, Folder]
expect(result.folderRelationships.length).toBe(3);
expect(result.folderRelationships[0]).toEqual([0, 0]);
expect(result.folderRelationships[1]).toEqual([1, 0]);
expect(result.folderRelationships[2]).toEqual([2, 1]);
});
it("should create collections, with subcollections and relationships", async () => {
importer.organizationId = Utils.newGuid();
const result = await importer.parse(TestData);
expect(result != null).toBe(true);
const collections = result.collections;
expect(collections).not.toBeNull();
expect(collections.length).toBe(2);
const collections1 = collections.shift();
expect(collections1.name).toBe("Foo");
//With subCollection
const collections2 = collections.shift();
expect(collections2.name).toBe("Foo/Baz");
// [Cipher, Folder]
expect(result.collectionRelationships.length).toBe(3);
expect(result.collectionRelationships[0]).toEqual([0, 0]);
expect(result.collectionRelationships[1]).toEqual([1, 0]);
expect(result.collectionRelationships[2]).toEqual([2, 1]);
});
}); });

View File

@ -418,6 +418,8 @@ export abstract class BaseImporter {
protected processFolder(result: ImportResult, folderName: string) { protected processFolder(result: ImportResult, folderName: string) {
let folderIndex = result.folders.length; let folderIndex = result.folders.length;
const hasFolder = !this.isNullOrWhitespace(folderName); const hasFolder = !this.isNullOrWhitespace(folderName);
// Replace backslashes with forward slashes, ensuring we create sub-folders
folderName = folderName.replace("\\", "/");
let addFolder = hasFolder; let addFolder = hasFolder;
if (hasFolder) { if (hasFolder) {