mirror of
https://github.com/bitwarden/browser.git
synced 2024-11-28 12:45:45 +01:00
use jslib import service
This commit is contained in:
Kyle Spearrin
parent
d2d89c252a
commit
c37359cdfd
2
jslib
2
jslib
@ -1 +1 @@
|
||||
Subproject commit 49d3f227042bc090dec48f83bbbf7da3029828a5
|
||||
Subproject commit 3429b57db42a3e1e9948b870bf24fcc02ebc8a99
|
||||
@ -7,20 +7,8 @@ import {
|
||||
import { ToasterService } from 'angular2-toaster';
|
||||
import { Angulartics2 } from 'angulartics2';
|
||||
|
||||
import { ApiService } from 'jslib/abstractions/api.service';
|
||||
import { CipherService } from 'jslib/abstractions/cipher.service';
|
||||
import { CollectionService } from 'jslib/abstractions/collection.service';
|
||||
import { FolderService } from 'jslib/abstractions/folder.service';
|
||||
import { I18nService } from 'jslib/abstractions/i18n.service';
|
||||
|
||||
import { Importer } from 'jslib/importers/importer';
|
||||
|
||||
import { CipherRequest } from 'jslib/models/request/cipherRequest';
|
||||
import { CollectionRequest } from 'jslib/models/request/collectionRequest';
|
||||
import { ImportOrganizationCiphersRequest } from 'jslib/models/request/importOrganizationCiphersRequest';
|
||||
import { KvpRequest } from 'jslib/models/request/kvpRequest';
|
||||
|
||||
import { ImportResult } from 'jslib/models/domain/importResult';
|
||||
import { ImportService } from 'jslib/abstractions/import.service';
|
||||
|
||||
import { ImportComponent as BaseImportComponent } from '../../tools/import.component';
|
||||
|
||||
@ -29,14 +17,10 @@ import { ImportComponent as BaseImportComponent } from '../../tools/import.compo
|
||||
templateUrl: '../../tools/import.component.html',
|
||||
})
|
||||
export class ImportComponent extends BaseImportComponent {
|
||||
organizationId: string;
|
||||
|
||||
constructor(i18nService: I18nService, analytics: Angulartics2,
|
||||
toasterService: ToasterService, cipherService: CipherService,
|
||||
folderService: FolderService, apiService: ApiService,
|
||||
router: Router, private collectionService: CollectionService,
|
||||
private route: ActivatedRoute) {
|
||||
super(i18nService, analytics, toasterService, cipherService, folderService, apiService, router);
|
||||
toasterService: ToasterService, importService: ImportService,
|
||||
router: Router, private route: ActivatedRoute) {
|
||||
super(i18nService, analytics, toasterService, importService, router);
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
@ -46,33 +30,4 @@ export class ImportComponent extends BaseImportComponent {
|
||||
super.ngOnInit();
|
||||
});
|
||||
}
|
||||
|
||||
protected async postImport(importResult: ImportResult) {
|
||||
const request = new ImportOrganizationCiphersRequest();
|
||||
for (let i = 0; i < importResult.ciphers.length; i++) {
|
||||
importResult.ciphers[i].organizationId = this.organizationId;
|
||||
const c = await this.cipherService.encrypt(importResult.ciphers[i]);
|
||||
request.ciphers.push(new CipherRequest(c));
|
||||
}
|
||||
if (importResult.collections != null) {
|
||||
for (let i = 0; i < importResult.collections.length; i++) {
|
||||
importResult.collections[i].organizationId = this.organizationId;
|
||||
const c = await this.collectionService.encrypt(importResult.collections[i]);
|
||||
request.collections.push(new CollectionRequest(c));
|
||||
}
|
||||
}
|
||||
if (importResult.collectionRelationships != null) {
|
||||
importResult.collectionRelationships.forEach((r) =>
|
||||
request.collectionRelationships.push(new KvpRequest(r[0], r[1])));
|
||||
}
|
||||
return await this.apiService.postImportOrganizationCiphers(this.organizationId, request);
|
||||
}
|
||||
|
||||
protected getImporter(): Importer {
|
||||
const importer = super.getImporter();
|
||||
if (importer != null) {
|
||||
importer.organization = true;
|
||||
}
|
||||
return importer;
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,6 +36,7 @@ import { CryptoService } from 'jslib/services/crypto.service';
|
||||
import { EnvironmentService } from 'jslib/services/environment.service';
|
||||
import { ExportService } from 'jslib/services/export.service';
|
||||
import { FolderService } from 'jslib/services/folder.service';
|
||||
import { ImportService } from 'jslib/services/import.service';
|
||||
import { LockService } from 'jslib/services/lock.service';
|
||||
import { PasswordGenerationService } from 'jslib/services/passwordGeneration.service';
|
||||
import { SettingsService } from 'jslib/services/settings.service';
|
||||
@ -58,6 +59,7 @@ import { EnvironmentService as EnvironmentServiceAbstraction } from 'jslib/abstr
|
||||
import { ExportService as ExportServiceAbstraction } from 'jslib/abstractions/export.service';
|
||||
import { FolderService as FolderServiceAbstraction } from 'jslib/abstractions/folder.service';
|
||||
import { I18nService as I18nServiceAbstraction } from 'jslib/abstractions/i18n.service';
|
||||
import { ImportService as ImportServiceAbstraction } from 'jslib/abstractions/import.service';
|
||||
import { LockService as LockServiceAbstraction } from 'jslib/abstractions/lock.service';
|
||||
import { LogService as LogServiceAbstraction } from 'jslib/abstractions/log.service';
|
||||
import { MessagingService as MessagingServiceAbstraction } from 'jslib/abstractions/messaging.service';
|
||||
@ -107,6 +109,7 @@ const containerService = new ContainerService(cryptoService, platformUtilsServic
|
||||
const authService = new AuthService(cryptoService, apiService,
|
||||
userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService);
|
||||
const exportService = new ExportService(folderService, cipherService, apiService);
|
||||
const importService = new ImportService(cipherService, folderService, apiService, i18nService, collectionService);
|
||||
const auditService = new AuditService(cryptoFunctionService, apiService);
|
||||
|
||||
const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(),
|
||||
@ -185,6 +188,7 @@ export function initFactory(): Function {
|
||||
{ provide: StorageServiceAbstraction, useValue: storageService },
|
||||
{ provide: StateServiceAbstraction, useValue: stateService },
|
||||
{ provide: ExportServiceAbstraction, useValue: exportService },
|
||||
{ provide: ImportServiceAbstraction, useValue: importService },
|
||||
{ provide: CryptoFunctionServiceAbstraction, useValue: cryptoFunctionService },
|
||||
{
|
||||
provide: APP_INITIALIZER,
|
||||
|
||||
@ -7,72 +7,26 @@ import { Router } from '@angular/router';
|
||||
import { ToasterService } from 'angular2-toaster';
|
||||
import { Angulartics2 } from 'angulartics2';
|
||||
|
||||
import { ApiService } from 'jslib/abstractions/api.service';
|
||||
import { CipherService } from 'jslib/abstractions/cipher.service';
|
||||
import { FolderService } from 'jslib/abstractions/folder.service';
|
||||
import { I18nService } from 'jslib/abstractions/i18n.service';
|
||||
|
||||
import { ImportResult } from 'jslib/models/domain/importResult';
|
||||
|
||||
import { CipherRequest } from 'jslib/models/request/cipherRequest';
|
||||
import { FolderRequest } from 'jslib/models/request/folderRequest';
|
||||
import { ImportCiphersRequest } from 'jslib/models/request/importCiphersRequest';
|
||||
import { KvpRequest } from 'jslib/models/request/kvpRequest';
|
||||
|
||||
import { CipherView } from 'jslib/models/view/cipherView';
|
||||
|
||||
import { AscendoCsvImporter } from 'jslib/importers/ascendoCsvImporter';
|
||||
import { AviraCsvImporter } from 'jslib/importers/aviraCsvImporter';
|
||||
import { BitwardenCsvImporter } from 'jslib/importers/bitwardenCsvImporter';
|
||||
import { BlurCsvImporter } from 'jslib/importers/blurCsvImporter';
|
||||
import { ChromeCsvImporter } from 'jslib/importers/chromeCsvImporter';
|
||||
import { ClipperzHtmlImporter } from 'jslib/importers/clipperzHtmlImporter';
|
||||
import { DashlaneCsvImporter } from 'jslib/importers/dashlaneCsvImporter';
|
||||
import { EnpassCsvImporter } from 'jslib/importers/enpassCsvImporter';
|
||||
import { FirefoxCsvImporter } from 'jslib/importers/firefoxCsvImporter';
|
||||
import { GnomeJsonImporter } from 'jslib/importers/gnomeJsonImporter';
|
||||
import { Importer } from 'jslib/importers/importer';
|
||||
import { KeePass2XmlImporter } from 'jslib/importers/keepass2XmlImporter';
|
||||
import { KeePassXCsvImporter } from 'jslib/importers/keepassxCsvImporter';
|
||||
import { KeeperCsvImporter } from 'jslib/importers/keeperCsvImporter';
|
||||
import { LastPassCsvImporter } from 'jslib/importers/lastpassCsvImporter';
|
||||
import { MeldiumCsvImporter } from 'jslib/importers/meldiumCsvImporter';
|
||||
import { MSecureCsvImporter } from 'jslib/importers/msecureCsvImporter';
|
||||
import { OnePassword1PifImporter } from 'jslib/importers/onepassword1PifImporter';
|
||||
import { OnePasswordWinCsvImporter } from 'jslib/importers/onepasswordWinCsvImporter';
|
||||
import { PadlockCsvImporter } from 'jslib/importers/padlockCsvImporter';
|
||||
import { PassKeepCsvImporter } from 'jslib/importers/passkeepCsvImporter';
|
||||
import { PasswordAgentCsvImporter } from 'jslib/importers/passwordAgentCsvImporter';
|
||||
import { PasswordBossJsonImporter } from 'jslib/importers/passwordBossJsonImporter';
|
||||
import { PasswordDragonXmlImporter } from 'jslib/importers/passwordDragonXmlImporter';
|
||||
import { PasswordSafeXmlImporter } from 'jslib/importers/passwordSafeXmlImporter';
|
||||
import { RoboFormCsvImporter } from 'jslib/importers/roboformCsvImporter';
|
||||
import { SafeInCloudXmlImporter } from 'jslib/importers/safeInCloudXmlImporter';
|
||||
import { SaferPassCsvImporter } from 'jslib/importers/saferpassCsvImport';
|
||||
import { SplashIdCsvImporter } from 'jslib/importers/splashIdCsvImporter';
|
||||
import { StickyPasswordXmlImporter } from 'jslib/importers/stickyPasswordXmlImporter';
|
||||
import { TrueKeyCsvImporter } from 'jslib/importers/truekeyCsvImporter';
|
||||
import { UpmCsvImporter } from 'jslib/importers/upmCsvImporter';
|
||||
import { ZohoVaultCsvImporter } from 'jslib/importers/zohoVaultCsvImporter';
|
||||
import { ImportOption, ImportService } from 'jslib/abstractions/import.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-import',
|
||||
templateUrl: 'import.component.html',
|
||||
})
|
||||
export class ImportComponent implements OnInit {
|
||||
featuredImportOptions: any[];
|
||||
importOptions: any[];
|
||||
featuredImportOptions: ImportOption[];
|
||||
importOptions: ImportOption[];
|
||||
format: string = null;
|
||||
fileContents: string;
|
||||
formPromise: Promise<any>;
|
||||
formPromise: Promise<Error>;
|
||||
|
||||
protected organizationId: string = null;
|
||||
protected successNavigate: any[] = ['vault'];
|
||||
|
||||
constructor(protected i18nService: I18nService, protected analytics: Angulartics2,
|
||||
protected toasterService: ToasterService, protected cipherService: CipherService,
|
||||
protected folderService: FolderService, protected apiService: ApiService,
|
||||
protected router: Router) {
|
||||
}
|
||||
protected toasterService: ToasterService, protected importService: ImportService,
|
||||
protected router: Router) { }
|
||||
|
||||
ngOnInit() {
|
||||
this.setImportOptions();
|
||||
@ -93,7 +47,7 @@ export class ImportComponent implements OnInit {
|
||||
}
|
||||
|
||||
async submit() {
|
||||
const importer = this.getImporter();
|
||||
const importer = this.importService.getImporter(this.format, this.organizationId != null);
|
||||
if (importer === null) {
|
||||
this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'),
|
||||
this.i18nService.t('selectFormat'));
|
||||
@ -124,24 +78,13 @@ export class ImportComponent implements OnInit {
|
||||
return;
|
||||
}
|
||||
|
||||
const importResult = await importer.parse(fileContents);
|
||||
if (importResult.success) {
|
||||
if (importResult.folders.length === 0 && importResult.ciphers.length === 0) {
|
||||
this.error(this.i18nService.t('importNothingError'));
|
||||
return;
|
||||
} else if (importResult.ciphers.length > 0) {
|
||||
const halfway = Math.floor(importResult.ciphers.length / 2);
|
||||
const last = importResult.ciphers.length - 1;
|
||||
if (this.badData(importResult.ciphers[0]) && this.badData(importResult.ciphers[halfway]) &&
|
||||
this.badData(importResult.ciphers[last])) {
|
||||
this.error(this.i18nService.t('importFormatError'));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
this.formPromise = this.postImport(importResult);
|
||||
await this.formPromise;
|
||||
this.formPromise = this.importService.import(importer, fileContents, this.organizationId);
|
||||
const error = await this.formPromise;
|
||||
if (error != null) {
|
||||
this.error(error);
|
||||
return;
|
||||
}
|
||||
this.analytics.eventTrack.next({
|
||||
action: 'Imported Data',
|
||||
properties: { label: this.format },
|
||||
@ -149,9 +92,6 @@ export class ImportComponent implements OnInit {
|
||||
this.toasterService.popAsync('success', null, this.i18nService.t('importSuccess'));
|
||||
this.router.navigate(this.successNavigate);
|
||||
} catch { }
|
||||
} else {
|
||||
this.error(this.i18nService.t('importFormatError'));
|
||||
}
|
||||
}
|
||||
|
||||
getFormatInstructionTitle() {
|
||||
@ -166,153 +106,20 @@ export class ImportComponent implements OnInit {
|
||||
return null;
|
||||
}
|
||||
|
||||
protected async postImport(importResult: ImportResult) {
|
||||
const request = new ImportCiphersRequest();
|
||||
for (let i = 0; i < importResult.ciphers.length; i++) {
|
||||
const c = await this.cipherService.encrypt(importResult.ciphers[i]);
|
||||
request.ciphers.push(new CipherRequest(c));
|
||||
}
|
||||
if (importResult.folders != null) {
|
||||
for (let i = 0; i < importResult.folders.length; i++) {
|
||||
const f = await this.folderService.encrypt(importResult.folders[i]);
|
||||
request.folders.push(new FolderRequest(f));
|
||||
}
|
||||
}
|
||||
if (importResult.folderRelationships != null) {
|
||||
importResult.folderRelationships.forEach((r) =>
|
||||
request.folderRelationships.push(new KvpRequest(r[0], r[1])));
|
||||
}
|
||||
return await this.apiService.postImportCiphers(request);
|
||||
}
|
||||
|
||||
protected setImportOptions() {
|
||||
this.featuredImportOptions = [
|
||||
{ id: null, name: '-- ' + this.i18nService.t('select') + ' --' },
|
||||
{ id: 'bitwardencsv', name: 'Bitwarden (csv)' },
|
||||
{ id: 'lastpasscsv', name: 'LastPass (csv)' },
|
||||
{ id: 'chromecsv', name: 'Chrome (csv)' },
|
||||
{ id: 'firefoxcsv', name: 'Firefox (csv)' },
|
||||
{ id: 'keepass2xml', name: 'KeePass 2 (xml)' },
|
||||
{ id: '1password1pif', name: '1Password (1pif)' },
|
||||
{ id: 'dashlanecsv', name: 'Dashlane (csv)' },
|
||||
];
|
||||
|
||||
this.importOptions = [
|
||||
{ id: 'keepassxcsv', name: 'KeePassX (csv)' },
|
||||
{ id: '1passwordwincsv', name: '1Password 6 and 7 Windows (csv)' },
|
||||
{ id: 'roboformcsv', name: 'RoboForm (csv)' },
|
||||
{ id: 'keepercsv', name: 'Keeper (csv)' },
|
||||
{ id: 'enpasscsv', name: 'Enpass (csv)' },
|
||||
{ id: 'safeincloudxml', name: 'SafeInCloud (xml)' },
|
||||
{ id: 'pwsafexml', name: 'Password Safe (xml)' },
|
||||
{ id: 'stickypasswordxml', name: 'Sticky Password (xml)' },
|
||||
{ id: 'msecurecsv', name: 'mSecure (csv)' },
|
||||
{ id: 'truekeycsv', name: 'True Key (csv)' },
|
||||
{ id: 'passwordbossjson', name: 'Password Boss (json)' },
|
||||
{ id: 'zohovaultcsv', name: 'Zoho Vault (csv)' },
|
||||
{ id: 'splashidcsv', name: 'SplashID (csv)' },
|
||||
{ id: 'passworddragonxml', name: 'Password Dragon (xml)' },
|
||||
{ id: 'padlockcsv', name: 'Padlock (csv)' },
|
||||
{ id: 'passboltcsv', name: 'Passbolt (csv)' },
|
||||
{ id: 'clipperzhtml', name: 'Clipperz (html)' },
|
||||
{ id: 'aviracsv', name: 'Avira (csv)' },
|
||||
{ id: 'saferpasscsv', name: 'SaferPass (csv)' },
|
||||
{ id: 'upmcsv', name: 'Universal Password Manager (csv)' },
|
||||
{ id: 'ascendocsv', name: 'Ascendo DataVault (csv)' },
|
||||
{ id: 'meldiumcsv', name: 'Meldium (csv)' },
|
||||
{ id: 'passkeepcsv', name: 'PassKeep (csv)' },
|
||||
{ id: 'operacsv', name: 'Opera (csv)' },
|
||||
{ id: 'vivaldicsv', name: 'Vivaldi (csv)' },
|
||||
{ id: 'gnomejson', name: 'GNOME Passwords and Keys/Seahorse (json)' },
|
||||
{ id: 'blurcsv', name: 'Blur (csv)' },
|
||||
{ id: 'passwordagentcsv', name: 'Password Agent (csv)' },
|
||||
];
|
||||
this.featuredImportOptions = [{
|
||||
id: null,
|
||||
name: '-- ' + this.i18nService.t('select') + ' --',
|
||||
}, ...this.importService.featuredImportOptions];
|
||||
this.importOptions = this.importService.regularImportOptions;
|
||||
}
|
||||
|
||||
protected getImporter(): Importer {
|
||||
if (this.format == null || this.format === '') {
|
||||
return null;
|
||||
}
|
||||
|
||||
switch (this.format) {
|
||||
case 'bitwardencsv':
|
||||
return new BitwardenCsvImporter();
|
||||
case 'lastpasscsv':
|
||||
case 'passboltcsv':
|
||||
return new LastPassCsvImporter();
|
||||
case 'keepassxcsv':
|
||||
return new KeePassXCsvImporter();
|
||||
case 'aviracsv':
|
||||
return new AviraCsvImporter();
|
||||
case 'blurcsv':
|
||||
return new BlurCsvImporter();
|
||||
case 'safeincloudxml':
|
||||
return new SafeInCloudXmlImporter();
|
||||
case 'padlockcsv':
|
||||
return new PadlockCsvImporter();
|
||||
case 'keepass2xml':
|
||||
return new KeePass2XmlImporter();
|
||||
case 'chromecsv':
|
||||
case 'operacsv':
|
||||
case 'vivaldicsv':
|
||||
return new ChromeCsvImporter();
|
||||
case 'firefoxcsv':
|
||||
return new FirefoxCsvImporter();
|
||||
case 'upmcsv':
|
||||
return new UpmCsvImporter();
|
||||
case 'saferpasscsv':
|
||||
return new SaferPassCsvImporter();
|
||||
case 'meldiumcsv':
|
||||
return new MeldiumCsvImporter();
|
||||
case '1password1pif':
|
||||
return new OnePassword1PifImporter();
|
||||
case '1passwordwincsv':
|
||||
return new OnePasswordWinCsvImporter();
|
||||
case 'keepercsv':
|
||||
return new KeeperCsvImporter();
|
||||
case 'passworddragonxml':
|
||||
return new PasswordDragonXmlImporter();
|
||||
case 'enpasscsv':
|
||||
return new EnpassCsvImporter();
|
||||
case 'pwsafexml':
|
||||
return new PasswordSafeXmlImporter();
|
||||
case 'dashlanecsv':
|
||||
return new DashlaneCsvImporter();
|
||||
case 'msecurecsv':
|
||||
return new MSecureCsvImporter();
|
||||
case 'stickypasswordxml':
|
||||
return new StickyPasswordXmlImporter();
|
||||
case 'truekeycsv':
|
||||
return new TrueKeyCsvImporter();
|
||||
case 'clipperzhtml':
|
||||
return new ClipperzHtmlImporter();
|
||||
case 'roboformcsv':
|
||||
return new RoboFormCsvImporter();
|
||||
case 'ascendocsv':
|
||||
return new AscendoCsvImporter();
|
||||
case 'passwordbossjson':
|
||||
return new PasswordBossJsonImporter();
|
||||
case 'zohovaultcsv':
|
||||
return new ZohoVaultCsvImporter();
|
||||
case 'splashidcsv':
|
||||
return new SplashIdCsvImporter();
|
||||
case 'passkeepcsv':
|
||||
return new PassKeepCsvImporter();
|
||||
case 'gnomejson':
|
||||
return new GnomeJsonImporter();
|
||||
case 'passwordagentcsv':
|
||||
return new PasswordAgentCsvImporter();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private error(errorMessage: string) {
|
||||
private error(error: Error) {
|
||||
this.analytics.eventTrack.next({
|
||||
action: 'Import Data Failed',
|
||||
properties: { label: this.format },
|
||||
});
|
||||
this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'), errorMessage);
|
||||
this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'), error.message);
|
||||
}
|
||||
|
||||
private getFileContents(file: File): Promise<string> {
|
||||
@ -339,9 +146,4 @@ export class ImportComponent implements OnInit {
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
private badData(c: CipherView) {
|
||||
return (c.name == null || c.name === '--') &&
|
||||
(c.login != null && (c.login.password == null || c.login.password === ''));
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user