fix org getter on import and export warning dialog

bitwarden · Dec 22, 2020 · aa1499f · aa1499f
1 parent 573eea6
commit aa1499f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/angular/components/export.component.ts b/src/angular/components/export.component.ts
@@ -35,6 +35,15 @@ export class ExportComponent {
             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 storedKeyHash = await this.cryptoService.getKeyHash();
         if (storedKeyHash != null && keyHash != null && storedKeyHash === keyHash) {

diff --git a/src/importers/baseImporter.ts b/src/importers/baseImporter.ts
@@ -76,7 +76,7 @@ export abstract class BaseImporter {
         skipEmptyLines: false,
     };
 
-    protected organization() {
+    protected get organization() {
         return this.organizationId != null;
     }