bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 15:53:27 +00:00
Code Issues Releases Wiki Activity

[AC-1383] Move collections to Vault (#5424)

Browse Source 
* Move CollectionDialog to Vault

* Fix CollectionDialogModule imports

* Move CollectionAdminService and View to Vault

* Move CollectionService to Vault

* Split GroupService into internal and public facing classes

* Move collection models to vault

* lint spacing fix

* Move collection spec file

* Fix spec import

* Update apps/web/src/app/core/core.module.ts

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

* Remove CoreOrganizationModule from CollectionDialogModule

---------

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
This commit is contained in:
Robyn MacCallum
2023-06-14 08:38:24 -04:00
committed by GitHub
parent 37010a6414
commit 2b65b3f0f7
110 changed files with 229 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/importer/src/importers/base-importer.ts
View File

@@ -1,12 +1,12 @@
import * as papa from "papaparse";
import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
import { FieldType, SecureNoteType } from "@bitwarden/common/enums";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";

2
libs/importer/src/importers/bitwarden/bitwarden-csv-importer.ts
View File

@@ -1,8 +1,8 @@
import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
import { FieldType, SecureNoteType } from "@bitwarden/common/enums";
import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.view";

2
libs/importer/src/importers/padlock-csv-importer.ts
View File

@@ -1,4 +1,4 @@
import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
import { ImportResult } from "../models/import-result";

2
libs/importer/src/importers/passpack-csv-importer.ts
View File

@@ -1,4 +1,4 @@
import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
import { ImportResult } from "../models/import-result";

2
libs/importer/src/models/import-result.ts
View File

@@ -1,5 +1,5 @@
import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
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";
export class ImportResult {

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

@@ -1,10 +1,10 @@
import { mock, MockProxy } from "jest-mock-extended";
import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
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 { BitwardenPasswordProtectedImporter } from "../importers/bitwarden/bitwarden-password-protected-importer";

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

@@ -1,5 +1,3 @@
import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
import { CollectionWithIdRequest } from "@bitwarden/common/admin-console/models/request/collection-with-id.request";
import { ImportCiphersRequest } from "@bitwarden/common/models/request/import-ciphers.request";
import { ImportOrganizationCiphersRequest } from "@bitwarden/common/models/request/import-organization-ciphers.request";
import { KvpRequest } from "@bitwarden/common/models/request/kvp.request";
@@ -8,9 +6,11 @@ import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.se
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 { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { CipherRequest } from "@bitwarden/common/vault/models/request/cipher.request";
import { CollectionWithIdRequest } from "@bitwarden/common/vault/models/request/collection-with-id.request";
import { FolderWithIdRequest } from "@bitwarden/common/vault/models/request/folder-with-id.request";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";