encrypted json export option for user and orgs (#726)

* encrypted json export option for user and orgs

* move org id to base export component

src/app/organizations/tools/export.component.ts

@@ -16,8 +16,6 @@ import { EventType } from 'jslib/enums/eventType';
     templateUrl: '../../tools/export.component.html',
 })
 export class ExportComponent extends BaseExportComponent {
-    organizationId: string;
-
     constructor(cryptoService: CryptoService, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, exportService: ExportService,
         eventService: EventService, private route: ActivatedRoute) {

src/app/settings/change-password.component.ts

@@ -69,6 +69,7 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
 
             const result = await this.platformUtilsService.showDialog(
                 this.i18nService.t('updateEncryptionKeyWarning') + ' ' +
+                this.i18nService.t('updateEncryptionKeyExportWarning') + ' ' +
                 this.i18nService.t('rotateEncKeyConfirmation'), this.i18nService.t('rotateEncKeyTitle'),
                 this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
             if (!result) {

src/app/tools/export.component.html

@@ -3,13 +3,16 @@
         <h1>{{'exportVault' | i18n}}</h1>
     </div>
     <p>{{'exportMasterPassword' | i18n}}</p>
-    <app-callout type="warning">{{'exportWarningDesc' | i18n}}</app-callout>
+    <app-callout type="warning" *ngIf="!encryptedFormat">{{'exportWarningDesc' | i18n}}</app-callout>
+    <app-callout type="warning" *ngIf="encryptedFormat && !organizationId">{{'encExportWarningDesc' | i18n}}
+    </app-callout>
     <div class="row">
         <div class="form-group col-6">
             <label for="format">{{'fileFormat' | i18n}}</label>
             <select class="form-control" id="format" name="Format" [(ngModel)]="format">
                 <option value="json">.json</option>
                 <option value="csv">.csv</option>
+                <option value="encrypted_json">.json (Encrypted)</option>
             </select>
         </div>
     </div>

src/app/tools/export.component.ts

@@ -13,6 +13,8 @@ import { ExportComponent as BaseExportComponent } from 'jslib/angular/components
     templateUrl: 'export.component.html',
 })
 export class ExportComponent extends BaseExportComponent {
+    organizationId: string;
+
     constructor(cryptoService: CryptoService, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, exportService: ExportService,
         eventService: EventService) {