bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-11 13:53:17 +00:00
Code Issues Releases Wiki Activity

add padlock importer, move from maps to arrays

Browse Source
This commit is contained in:
Kyle Spearrin
2018-07-10 16:39:04 -04:00
parent 57e13c25b5
commit bd0d321dba
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: a6a0673af8...4004449aa8

4
src/app/organizations/tools/import.component.ts
View File

@@ -62,8 +62,8 @@ export class ImportComponent extends BaseImportComponent {
} }
} }
if (importResult.collectionRelationships != null) { if (importResult.collectionRelationships != null) {
importResult.collectionRelationships.forEach((v: number, k: number) => importResult.collectionRelationships.forEach((r) =>
request.collectionRelationships.push(new KvpRequest(k, v))); request.collectionRelationships.push(new KvpRequest(r[0], r[1])));
} }
return await this.apiService.postImportOrganizationCiphers(this.organizationId, request); return await this.apiService.postImportOrganizationCiphers(this.organizationId, request);
} }

7
src/app/tools/import.component.ts
View File

@@ -27,6 +27,7 @@ import { BlurCsvImporter } from 'jslib/importers/blurCsvImporter';
import { Importer } from 'jslib/importers/importer'; import { Importer } from 'jslib/importers/importer';
import { KeePassXCsvImporter } from 'jslib/importers/keepassxCsvImporter'; import { KeePassXCsvImporter } from 'jslib/importers/keepassxCsvImporter';
import { LastPassCsvImporter } from 'jslib/importers/lastpassCsvImporter'; import { LastPassCsvImporter } from 'jslib/importers/lastpassCsvImporter';
import { PadlockCsvImporter } from 'jslib/importers/padlockCsvImporter';
import { SafeInCloudXmlImporter } from 'jslib/importers/safeInCloudXmlImporter'; import { SafeInCloudXmlImporter } from 'jslib/importers/safeInCloudXmlImporter';
@Component({ @Component({
@@ -153,8 +154,8 @@ export class ImportComponent implements OnInit {
} }
} }
if (importResult.folderRelationships != null) { if (importResult.folderRelationships != null) {
importResult.folderRelationships.forEach((v: number, k: number) => importResult.folderRelationships.forEach((r) =>
request.folderRelationships.push(new KvpRequest(k, v))); request.folderRelationships.push(new KvpRequest(r[0], r[1])));
} }
return await this.apiService.postImportCiphers(request); return await this.apiService.postImportCiphers(request);
} }
@@ -219,6 +220,8 @@ export class ImportComponent implements OnInit {
return new BlurCsvImporter(); return new BlurCsvImporter();
case 'safeincloudxml': case 'safeincloudxml':
return new SafeInCloudXmlImporter(); return new SafeInCloudXmlImporter();
case 'padlockcsv':
return new PadlockCsvImporter();
default: default:
return null; return null;
} }