Merge branch 'master' into patrickhlauke-issue1987

src/popup/settings/excluded-domains.component.ts

@@ -9,12 +9,11 @@ import { Router } from '@angular/router';
 
 import { ConstantsService } from 'jslib-common/services/constants.service';
 
+import { BroadcasterService } from 'jslib-common/abstractions/broadcaster.service';
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 import { StorageService } from 'jslib-common/abstractions/storage.service';
 
-import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
-
 import { BrowserApi } from '../../browser/browserApi';
 
 import { Utils } from 'jslib-common/misc/utils';

src/popup/settings/export.component.html

@@ -1,4 +1,4 @@
-<form (ngSubmit)="submit()">
+<form (ngSubmit)="submit()" [formGroup]="exportForm">
     <header>
         <div class="left">
             <a routerLink="/tabs/settings">
@@ -10,7 +10,7 @@
             <span class="title">{{'exportVault' | i18n}}</span>
         </h1>
         <div class="right">
-            <button appBlurClick type="submit" [disabled]="disabledByPolicy">{{'submit' | i18n}}</button>
+            <button appBlurClick type="submit" [disabled]="!exportForm.enabled">{{'submit' | i18n}}</button>
         </div>
     </header>
     <content>
@@ -22,30 +22,15 @@
             <div class="box-content">
                 <div class="box-content-row" appBoxRow>
                     <label for="format">{{'fileFormat' | i18n}}</label>
-                    <select id="format" name="Format" [(ngModel)]="format" [disabled]="disabledByPolicy">
-                        <option value="json">.json</option>
-                        <option value="csv">.csv</option>
-                        <option value="encrypted_json">.json (Encrypted)</option>
+                    <select id="format" name="Format" formControlName="format">
+                        <option *ngFor="let f of formatOptions" [value]="f.value">{{f.name}}</option>
                     </select>
                 </div>
-                <div class="box-content-row box-content-row-flex" appBoxRow>
-                    <div class="row-main">
-                        <label for="masterPassword">{{'masterPass' | i18n}}</label>
-                        <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword"
-                            class="monospaced" [(ngModel)]="masterPassword" required appInputVerbatim appAutofocus
-                            [disabled]="disabledByPolicy">
-                    </div>
-                    <div class="action-buttons">
-                        <button type="button" class="row-btn" appStopClick appBlurClick
-                            appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
-                            <i class="fa fa-lg" aria-hidden="true"
-                                [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
-                        </button>
-                    </div>
-                </div>
+                <app-verify-master-password ngDefaultControl formControlName="secret" name="Secret">
+                </app-verify-master-password>
             </div>
             <div class="box-footer">
-                <p>{{'exportMasterPassword' | i18n}}</p>
+                <p>{{'confirmIdentity' | i18n}}</p>
             </div>
         </div>
     </content>

src/popup/settings/export.component.ts

@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
 
 import { CryptoService } from 'jslib-common/abstractions/crypto.service';
@@ -8,6 +9,7 @@ import { I18nService } from 'jslib-common/abstractions/i18n.service';
 import { LogService } from 'jslib-common/abstractions/log.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 import { PolicyService } from 'jslib-common/abstractions/policy.service';
+import { UserVerificationService } from 'jslib-common/abstractions/userVerification.service';
 
 import { ExportComponent as BaseExportComponent } from 'jslib-angular/components/export.component';
 
@@ -19,9 +21,9 @@ export class ExportComponent extends BaseExportComponent {
     constructor(cryptoService: CryptoService, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, exportService: ExportService,
         eventService: EventService, policyService: PolicyService, private router: Router,
-        logService: LogService) {
+        logService: LogService, userVerificationService: UserVerificationService, fb: FormBuilder) {
         super(cryptoService, i18nService, platformUtilsService, exportService, eventService, policyService, window,
-            logService);
+            logService, userVerificationService, fb);
     }
 
     protected saved() {

src/popup/settings/settings.component.html

@@ -71,7 +71,7 @@
                 <span><i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i></span>
             </a>
             <button type="button" class="box-content-row box-content-row-flex text-default" appStopClick appBlurClick
-                (click)="changePassword()">
+                (click)="changePassword()" *ngIf="showChangeMasterPass">
                 <div class="row-main">{{'changeMasterPassword' | i18n}}</div>
                 <i class="fa fa-chevron-right fa-lg row-sub-icon" aria-hidden="true"></i>
             </button>

src/popup/settings/settings.component.ts

@@ -6,7 +6,6 @@ import {
 } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { Router } from '@angular/router';
-import { ToasterService } from 'angular2-toaster';
 import Swal from 'sweetalert2/src/sweetalert2.js';
 
 import { BrowserApi } from '../../browser/browserApi';
@@ -18,6 +17,7 @@ import { ConstantsService } from 'jslib-common/services/constants.service';
 import { CryptoService } from 'jslib-common/abstractions/crypto.service';
 import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
+import { KeyConnectorService } from 'jslib-common/abstractions/keyConnector.service';
 import { MessagingService } from 'jslib-common/abstractions/messaging.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 import { StorageService } from 'jslib-common/abstractions/storage.service';
@@ -58,6 +58,7 @@ export class SettingsComponent implements OnInit {
     biometric: boolean = false;
     disableAutoBiometricsPrompt = true;
     previousVaultTimeout: number = null;
+    showChangeMasterPass = true;
 
     vaultTimeout: FormControl = new FormControl(null);
 
@@ -66,7 +67,8 @@ export class SettingsComponent implements OnInit {
         public messagingService: MessagingService, private router: Router,
         private environmentService: EnvironmentService, private cryptoService: CryptoService,
         private userService: UserService, private popupUtilsService: PopupUtilsService,
-        private modalService: ModalService, private toasterService: ToasterService) {
+        private modalService: ModalService,
+        private keyConnectorService: KeyConnectorService) {
     }
 
     async ngOnInit() {
@@ -118,6 +120,7 @@ export class SettingsComponent implements OnInit {
         this.biometric = await this.vaultTimeoutService.isBiometricLockSet();
         this.disableAutoBiometricsPrompt = await this.storageService.get<boolean>(
             ConstantsService.disableAutoBiometricsPromptKey) ?? true;
+        this.showChangeMasterPass = !await this.keyConnectorService.getUsesKeyConnector();
     }
 
     async saveVaultTimeout(newValue: number) {
@@ -132,7 +135,7 @@ export class SettingsComponent implements OnInit {
         }
 
         if (!this.vaultTimeout.valid) {
-            this.toasterService.popAsync('error', null, this.i18nService.t('vaultTimeoutToLarge'));
+            this.platformUtilsService.showToast('error', null, this.i18nService.t('vaultTimeoutToLarge'));
             return;
         }
 
@@ -161,7 +164,7 @@ export class SettingsComponent implements OnInit {
         }
 
         if (!this.vaultTimeout.valid) {
-            this.toasterService.popAsync('error', null, this.i18nService.t('vaultTimeoutToLarge'));
+            this.platformUtilsService.showToast('error', null, this.i18nService.t('vaultTimeoutToLarge'));
             return;
         }
 

src/popup/settings/sync.component.ts

@@ -1,11 +1,10 @@
-import { ToasterService } from 'angular2-toaster';
-
 import {
     Component,
     OnInit,
 } from '@angular/core';
 
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
+import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 import { SyncService } from 'jslib-common/abstractions/sync.service';
 
 @Component({
@@ -16,7 +15,7 @@ export class SyncComponent implements OnInit {
     lastSync = '--';
     syncPromise: Promise<any>;
 
-    constructor(private syncService: SyncService, private toasterService: ToasterService,
+    constructor(private syncService: SyncService, private platformUtilsService: PlatformUtilsService,
         private i18nService: I18nService) {
     }
 
@@ -29,9 +28,9 @@ export class SyncComponent implements OnInit {
         const success = await this.syncPromise;
         if (success) {
             await this.setLastSync();
-            this.toasterService.popAsync('success', null, this.i18nService.t('syncingComplete'));
+            this.platformUtilsService.showToast('success', null, this.i18nService.t('syncingComplete'));
         } else {
-            this.toasterService.popAsync('error', null, this.i18nService.t('syncingFailed'));
+            this.platformUtilsService.showToast('error', null, this.i18nService.t('syncingFailed'));
         }
     }