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

[PS-2390] Passing folder and collection id on import (#4802)

Browse Source 
* PS-2390 - Passing folder and collection id on import
Reading groupingid from lastpass csv as collection or folder id

* PS-2390 - Added toDomain and toModel on FolderWithIdExport model and created CollectionWithIdExport model

* PS-2390 - renamed groupingid into bwcollectionid on lastpass importer

* PS-2390 - Updated collection/folder-with-id export to reuse parent toDomain and toView

* PS-2390 Undo the lastpass importer groupingId rename

* PS-2390 Undo lastpass importer changes

* PS-2390 - Removed externalId set. Cleaning collection-with-id-request to user parent properties

* Lint prettier
This commit is contained in:
aj-rosado
2023-04-05 19:15:33 +01:00
committed by GitHub
parent 043f3c54e3
commit c6bc97cf5c
8 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/common/src/models/export/collection-with-id.export.ts
View File

@@ -6,6 +6,16 @@ import { CollectionExport } from "./collection.export";
export class CollectionWithIdExport extends CollectionExport {
id: string;
static toView(req: CollectionWithIdExport, view = new CollectionView()) {
view.id = req.id;
return super.toView(req, view);
}
static toDomain(req: CollectionWithIdExport, domain = new CollectionDomain()) {
domain.id = req.id;
return super.toDomain(req, domain);
}
// Use build method instead of ctor so that we can control order of JSON stringify for pretty print
build(o: CollectionView | CollectionDomain) {
this.id = o.id;

10
libs/common/src/models/export/folder-with-id.export.ts
View File

@@ -6,6 +6,16 @@ import { FolderExport } from "./folder.export";
export class FolderWithIdExport extends FolderExport {
id: string;
static toView(req: FolderWithIdExport, view = new FolderView()) {
view.id = req.id;
return super.toView(req, view);
}
static toDomain(req: FolderWithIdExport, domain = new FolderDomain()) {
domain.id = req.id;
return super.toDomain(req, domain);
}
// Use build method instead of ctor so that we can control order of JSON stringify for pretty print
build(o: FolderView | FolderDomain) {
this.id = o.id;

4
libs/common/src/models/request/import-ciphers.request.ts
View File

@@ -1,10 +1,10 @@
import { CipherRequest } from "../../vault/models/request/cipher.request";
import { FolderRequest } from "../../vault/models/request/folder.request";
import { FolderWithIdRequest } from "../../vault/models/request/folder-with-id.request";
import { KvpRequest } from "./kvp.request";
export class ImportCiphersRequest {
ciphers: CipherRequest[] = [];
folders: FolderRequest[] = [];
folders: FolderWithIdRequest[] = [];
folderRelationships: KvpRequest<number, number>[] = [];
}

4
libs/common/src/models/request/import-organization-ciphers.request.ts
View File

@@ -1,10 +1,10 @@
import { CollectionRequest } from "../../admin-console/models/request/collection.request";
import { CollectionWithIdRequest } from "../../admin-console/models/request/collection-with-id.request";
import { CipherRequest } from "../../vault/models/request/cipher.request";
import { KvpRequest } from "./kvp.request";
export class ImportOrganizationCiphersRequest {
ciphers: CipherRequest[] = [];
collections: CollectionRequest[] = [];
collections: CollectionWithIdRequest[] = [];
collectionRelationships: KvpRequest<number, number>[] = [];
}