Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-16 20:21:31 +01:00
Code Issues Projects Releases Wiki Activity

fix org getter on import and export warning dialog (#238)

Browse Source
This commit is contained in:
Kyle Spearrin 2020-12-22 16:14:22 -05:00 committed by GitHub
parent 573eea66ee
commit 91c61aea58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/angular/components/export.component.ts
View File

@ -35,6 +35,15 @@ export class ExportComponent {
return; return;
} }
const acceptedWarning = await this.platformUtilsService.showDialog(
this.i18nService.t(this.encryptedFormat ? 'encExportWarningDesc' : 'exportWarningDesc'),
this.i18nService.t('confirmVaultExport'), this.i18nService.t('exportVault'),
this.i18nService.t('cancel'), 'warning');
if (!acceptedWarning) {
return;
}
const keyHash = await this.cryptoService.hashPassword(this.masterPassword, null); const keyHash = await this.cryptoService.hashPassword(this.masterPassword, null);
const storedKeyHash = await this.cryptoService.getKeyHash(); const storedKeyHash = await this.cryptoService.getKeyHash();
if (storedKeyHash != null && keyHash != null && storedKeyHash === keyHash) { if (storedKeyHash != null && keyHash != null && storedKeyHash === keyHash) {

2
src/importers/baseImporter.ts
View File

@ -76,7 +76,7 @@ export abstract class BaseImporter {
skipEmptyLines: false, skipEmptyLines: false,
}; };
protected organization() { protected get organization() {
return this.organizationId != null; return this.organizationId != null;
} }