mirror of
https://github.com/bitwarden/browser
synced 2025-12-10 21:33:27 +00:00
* Migrate callouts to the CL ones * Add folder/collection selection * Use bitTypography as page header/title * Migrate submit button to CL * Migrate fileSelector and fileContents * Add ability to import into an existing folder/collection Extended import.service and abstraction to receive importTarget on import() Pass selectedImportTarget to importService.import() Wrote unit tests * Added vault selector, folders/collections selection logic and component library to the import * Revert changes to the already migrated CL fileSelector, fileContents and header/title * Fix fileContents input and spacing to submit button * Use id's instead of name for tghe targetSelector * Remove unneeded empty line * Fix import into existing folder/collection Map ciphers with no folder/no collection to the new rootFolder when selected by the user Modified and added unit tests * Added CL to fileSelector and fileInput on vault import * Added reactive forms and new selector logic to import vault * Added new texts on Import Vault * Corrected logic on enable targetSelector * Removing target selector from being required * Fixed imports after messing up a merge conflict * Set No-Folder as default * Show icons (folder/collection) on targetSelector * Add icons to vaultSelector * Set `My Vault` as default of the vaultSelector * Updates labels based on feedback from design * Set `My Vault` as default of the vaultSelector pt2 * Improvements to reactive forms on import.component * Only disabling individual vault import on PersonalOwnership policy * Use import destination instead of import location * Add hint to folder/collection dropdown * Removed required attribute as provided by formGroup * Display no collection option same as no folder * Show error on org import with unassigned items Only admins can have unassigned items (items with no collection) If these are present in a export/backup file, they should still be imported, to not break existing behaviour. This is limited to admins. When a member of an org does not set a root collection (no collection option) and any items are unassigned an error message is shown and the import is aborted. * Removed for-attribute from bit-labels * Removed bitInput from bit-selects * Updates to messages.json after PR feedback * Removed name-attribute from bit-selects * Removed unneeded variables * Removed unneeded line break * Migrate form to use bitSubmit Rename old submit() to performImport() Create submit arrow function calling performImport() (which can be overridden/called by org-import.component) Remove #form and ngNativeValidate Add bitSubmit and bitFormButton directives Remove now unneeded loading variable * Added await to super.performImport() * Move form check into submit * AC-1558 - Enable org import with remove individual vault policy Hide the `My Vault` entry when policy is active Always check if the policy applies and disable the formGroup if no vault-target is selectable * [AC-1549] Import page design updates (#5933) * Display select folder/collection in targetSelector Filter the no-folder entry from the folderViews-observable Add labels for the targetSelector placeholders * Update importTargetHint and remove importTargetOrgHint * Update language on importUnassignedItemsError * Add help icon with link to the import documentation --------- Co-authored-by: Andre Rosado <arosado@bitwarden.com>
180 lines
6.7 KiB
TypeScript
180 lines
6.7 KiB
TypeScript
import { mock, MockProxy } from "jest-mock-extended";
|
|
|
|
import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
|
|
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
|
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 { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
|
|
import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
|
|
|
|
import { BitwardenPasswordProtectedImporter } from "../importers/bitwarden/bitwarden-password-protected-importer";
|
|
import { Importer } from "../importers/importer";
|
|
import { ImportResult } from "../models/import-result";
|
|
|
|
import { ImportApiServiceAbstraction } from "./import-api.service.abstraction";
|
|
import { ImportService } from "./import.service";
|
|
|
|
describe("ImportService", () => {
|
|
let importService: ImportService;
|
|
let cipherService: MockProxy<CipherService>;
|
|
let folderService: MockProxy<FolderService>;
|
|
let importApiService: MockProxy<ImportApiServiceAbstraction>;
|
|
let i18nService: MockProxy<I18nService>;
|
|
let collectionService: MockProxy<CollectionService>;
|
|
let cryptoService: MockProxy<CryptoService>;
|
|
|
|
beforeEach(() => {
|
|
cipherService = mock<CipherService>();
|
|
folderService = mock<FolderService>();
|
|
importApiService = mock<ImportApiServiceAbstraction>();
|
|
i18nService = mock<I18nService>();
|
|
collectionService = mock<CollectionService>();
|
|
cryptoService = mock<CryptoService>();
|
|
|
|
importService = new ImportService(
|
|
cipherService,
|
|
folderService,
|
|
importApiService,
|
|
i18nService,
|
|
collectionService,
|
|
cryptoService
|
|
);
|
|
});
|
|
|
|
describe("getImporterInstance", () => {
|
|
describe("Get bitPasswordProtected importer", () => {
|
|
let importer: Importer;
|
|
const organizationId = Utils.newGuid();
|
|
const password = Utils.newGuid();
|
|
const promptForPassword_callback = async () => {
|
|
return password;
|
|
};
|
|
|
|
beforeEach(() => {
|
|
importer = importService.getImporter(
|
|
"bitwardenpasswordprotected",
|
|
promptForPassword_callback,
|
|
organizationId
|
|
);
|
|
});
|
|
|
|
it("returns an instance of BitwardenPasswordProtectedImporter", () => {
|
|
expect(importer).toBeInstanceOf(BitwardenPasswordProtectedImporter);
|
|
});
|
|
|
|
it("has the promptForPassword_callback set", async () => {
|
|
// Cast to any to access private property. Note: assumes instance of BitwardenPasswordProtectedImporter
|
|
expect((importer as any).promptForPassword_callback).not.toBeNull();
|
|
expect(await (importer as any).promptForPassword_callback()).toEqual(password);
|
|
});
|
|
|
|
it("has the appropriate organization Id", () => {
|
|
expect(importer.organizationId).toEqual(organizationId);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("setImportTarget", () => {
|
|
const organizationId = Utils.newGuid();
|
|
|
|
let importResult: ImportResult;
|
|
|
|
beforeEach(() => {
|
|
importResult = new ImportResult();
|
|
});
|
|
|
|
it("empty importTarget does nothing", async () => {
|
|
await importService["setImportTarget"](importResult, null, "");
|
|
expect(importResult.folders.length).toBe(0);
|
|
});
|
|
|
|
const mockImportTargetFolder = new FolderView();
|
|
mockImportTargetFolder.id = "myImportTarget";
|
|
mockImportTargetFolder.name = "myImportTarget";
|
|
|
|
it("passing importTarget adds it to folders", async () => {
|
|
folderService.getAllDecryptedFromState.mockReturnValue(
|
|
Promise.resolve([mockImportTargetFolder])
|
|
);
|
|
|
|
await importService["setImportTarget"](importResult, null, "myImportTarget");
|
|
expect(importResult.folders.length).toBe(1);
|
|
expect(importResult.folders[0].name).toBe("myImportTarget");
|
|
});
|
|
|
|
const mockFolder1 = new FolderView();
|
|
mockFolder1.id = "folder1";
|
|
mockFolder1.name = "folder1";
|
|
|
|
const mockFolder2 = new FolderView();
|
|
mockFolder2.id = "folder2";
|
|
mockFolder2.name = "folder2";
|
|
|
|
it("passing importTarget sets it as new root for all existing folders", async () => {
|
|
folderService.getAllDecryptedFromState.mockResolvedValue([
|
|
mockImportTargetFolder,
|
|
mockFolder1,
|
|
mockFolder2,
|
|
]);
|
|
|
|
const myImportTarget = "myImportTarget";
|
|
|
|
importResult.folders.push(mockFolder1);
|
|
importResult.folders.push(mockFolder2);
|
|
|
|
await importService["setImportTarget"](importResult, null, myImportTarget);
|
|
expect(importResult.folders.length).toBe(3);
|
|
expect(importResult.folders[0].name).toBe(myImportTarget);
|
|
expect(importResult.folders[1].name).toBe(`${myImportTarget}/${mockFolder1.name}`);
|
|
expect(importResult.folders[2].name).toBe(`${myImportTarget}/${mockFolder2.name}`);
|
|
});
|
|
|
|
const mockImportTargetCollection = new CollectionView();
|
|
mockImportTargetCollection.id = "myImportTarget";
|
|
mockImportTargetCollection.name = "myImportTarget";
|
|
mockImportTargetCollection.organizationId = organizationId;
|
|
|
|
const mockCollection1 = new CollectionView();
|
|
mockCollection1.id = "collection1";
|
|
mockCollection1.name = "collection1";
|
|
mockCollection1.organizationId = organizationId;
|
|
|
|
const mockCollection2 = new CollectionView();
|
|
mockCollection1.id = "collection2";
|
|
mockCollection1.name = "collection2";
|
|
mockCollection1.organizationId = organizationId;
|
|
|
|
it("passing importTarget adds it to collections", async () => {
|
|
collectionService.getAllDecrypted.mockResolvedValue([
|
|
mockImportTargetCollection,
|
|
mockCollection1,
|
|
]);
|
|
|
|
await importService["setImportTarget"](importResult, organizationId, "myImportTarget");
|
|
expect(importResult.collections.length).toBe(1);
|
|
expect(importResult.collections[0].name).toBe("myImportTarget");
|
|
});
|
|
|
|
it("passing importTarget sets it as new root for all existing collections", async () => {
|
|
collectionService.getAllDecrypted.mockResolvedValue([
|
|
mockImportTargetCollection,
|
|
mockCollection1,
|
|
mockCollection2,
|
|
]);
|
|
|
|
const myImportTarget = "myImportTarget";
|
|
|
|
importResult.collections.push(mockCollection1);
|
|
importResult.collections.push(mockCollection2);
|
|
|
|
await importService["setImportTarget"](importResult, organizationId, myImportTarget);
|
|
expect(importResult.collections.length).toBe(3);
|
|
expect(importResult.collections[0].name).toBe(myImportTarget);
|
|
expect(importResult.collections[1].name).toBe(`${myImportTarget}/${mockCollection1.name}`);
|
|
expect(importResult.collections[2].name).toBe(`${myImportTarget}/${mockCollection2.name}`);
|
|
});
|
|
});
|
|
});
|