t push origin masterMerge branch 'handle-window-hide' into master

Handle main window hidden event

jslib

@@ -1 +1 @@
-Subproject commit d84d6da7f77ec89ba69299b1ff982f083fd77203
+Subproject commit 9aa3cbf73d9df9a2641654270911359593bcb5c5

src/app/accounts/lock.component.ts

@@ -1,4 +1,8 @@
-import { Component } from '@angular/core';
+import {
+    Component,
+    OnDestroy,
+    NgZone,
+} from '@angular/core';
 import {
     ActivatedRoute,
     Router,
@@ -15,19 +19,24 @@ import { StorageService } from 'jslib/abstractions/storage.service';
 import { UserService } from 'jslib/abstractions/user.service';
 import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import { LockComponent as BaseLockComponent } from 'jslib/angular/components/lock.component';
 
+const BroadcasterSubscriptionId = 'LockComponent';
+
 @Component({
     selector: 'app-lock',
     templateUrl: 'lock.component.html',
 })
-export class LockComponent extends BaseLockComponent {
+export class LockComponent extends BaseLockComponent implements OnDestroy {
     constructor(router: Router, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
         userService: UserService, cryptoService: CryptoService,
         storageService: StorageService, vaultTimeoutService: VaultTimeoutService,
         environmentService: EnvironmentService, stateService: StateService,
-        apiService: ApiService, private route: ActivatedRoute) {
+        apiService: ApiService, private route: ActivatedRoute,
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) {
         super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
             storageService, vaultTimeoutService, environmentService, stateService, apiService);
     }
@@ -39,5 +48,23 @@ export class LockComponent extends BaseLockComponent {
                 setTimeout(() => this.unlockBiometric(), 1000);
             }
         });
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                    default:
+                }
+            });
+        });
+    }
+
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
+    onWindowHidden() {
+        this.showPassword = false;
     }
 }

src/app/accounts/login.component.ts

@@ -1,6 +1,8 @@
 import {
     Component,
     ComponentFactoryResolver,
+    OnDestroy,
+    NgZone,
     ViewChild,
     ViewContainerRef,
 } from '@angular/core';
@@ -19,14 +21,18 @@ import { StateService } from 'jslib/abstractions/state.service';
 import { StorageService } from 'jslib/abstractions/storage.service';
 import { SyncService } from 'jslib/abstractions/sync.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component';
 import { ModalComponent } from 'jslib/angular/components/modal.component';
 
+const BroadcasterSubscriptionId = 'LoginComponent';
+
 @Component({
     selector: 'app-login',
     templateUrl: 'login.component.html',
 })
-export class LoginComponent extends BaseLoginComponent {
+export class LoginComponent extends BaseLoginComponent implements OnDestroy {
     @ViewChild('environment', { read: ViewContainerRef, static: true }) environmentModal: ViewContainerRef;
 
     showingModal = false;
@@ -35,7 +41,8 @@ export class LoginComponent extends BaseLoginComponent {
         syncService: SyncService, private componentFactoryResolver: ComponentFactoryResolver,
         platformUtilsService: PlatformUtilsService, stateService: StateService,
         environmentService: EnvironmentService, passwordGenerationService: PasswordGenerationService,
-        cryptoFunctionService: CryptoFunctionService, storageService: StorageService) {
+        cryptoFunctionService: CryptoFunctionService, storageService: StorageService,
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) {
         super(authService, router, platformUtilsService, i18nService, stateService, environmentService,
             passwordGenerationService, cryptoFunctionService, storageService);
         super.onSuccessfulLogin = () => {
@@ -43,6 +50,24 @@ export class LoginComponent extends BaseLoginComponent {
         };
     }
 
+    async ngOnInit() {
+        await super.ngOnInit();
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                    default:
+                }
+            });
+        });
+    }
+
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
     settings() {
         const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
         const modal = this.environmentModal.createComponent(factory).instance;
@@ -61,4 +86,8 @@ export class LoginComponent extends BaseLoginComponent {
             modal.close();
         });
     }
+
+    onWindowHidden() {
+        this.showPassword = false;
+    }
 }

src/app/accounts/register.component.ts

@@ -1,4 +1,9 @@
-import { Component } from '@angular/core';
+import {
+    Component,
+    OnDestroy,
+    OnInit,
+    NgZone,
+} from '@angular/core';
 import { Router } from '@angular/router';
 
 import { ApiService } from 'jslib/abstractions/api.service';
@@ -9,18 +14,44 @@ import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { StateService } from 'jslib/abstractions/state.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import { RegisterComponent as BaseRegisterComponent } from 'jslib/angular/components/register.component';
 
+const BroadcasterSubscriptionId = 'RegisterComponent';
+
 @Component({
     selector: 'app-register',
     templateUrl: 'register.component.html',
 })
-export class RegisterComponent extends BaseRegisterComponent {
+export class RegisterComponent extends BaseRegisterComponent implements OnInit, OnDestroy {
     constructor(authService: AuthService, router: Router,
         i18nService: I18nService, cryptoService: CryptoService,
         apiService: ApiService, stateService: StateService,
-        platformUtilsService: PlatformUtilsService, passwordGenerationService: PasswordGenerationService) {
+        platformUtilsService: PlatformUtilsService, passwordGenerationService: PasswordGenerationService,
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) {
         super(authService, router, i18nService, cryptoService, apiService, stateService, platformUtilsService,
             passwordGenerationService);
     }
+
+    async ngOnInit() {
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                    default:
+                }
+            });
+        });
+    }
+
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
+    onWindowHidden() {
+        this.showPassword = false;
+    }
 }

src/app/accounts/set-password.component.ts

@@ -1,4 +1,8 @@
-import { Component } from '@angular/core';
+import {
+    Component,
+    OnDestroy,
+    NgZone,
+} from '@angular/core';
 
 import {
     ActivatedRoute,
@@ -15,6 +19,10 @@ import { PolicyService } from 'jslib/abstractions/policy.service';
 import { SyncService } from 'jslib/abstractions/sync.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
+const BroadcasterSubscriptionId = 'SetPasswordComponent';
+
 import {
     SetPasswordComponent as BaseSetPasswordComponent,
 } from 'jslib/angular/components/set-password.component';
@@ -23,12 +31,13 @@ import {
     selector: 'app-set-password',
     templateUrl: 'set-password.component.html',
 })
-export class SetPasswordComponent extends BaseSetPasswordComponent {
+export class SetPasswordComponent extends BaseSetPasswordComponent implements OnDestroy {
     constructor(apiService: ApiService, i18nService: I18nService,
         cryptoService: CryptoService, messagingService: MessagingService,
         userService: UserService, passwordGenerationService: PasswordGenerationService,
         platformUtilsService: PlatformUtilsService, policyService: PolicyService, router: Router,
-        syncService: SyncService, route: ActivatedRoute) {
+        syncService: SyncService, route: ActivatedRoute,
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) {
         super(i18nService, cryptoService, messagingService, userService, passwordGenerationService,
             platformUtilsService, policyService, router, apiService, syncService, route);
     }
@@ -62,4 +71,26 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
                 return this.masterPasswordScore != null ? this.i18nService.t('weak') : null;
         }
     }
+
+    async ngOnInit() {
+        await super.ngOnInit();
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                    default:
+                }
+            });
+        });
+    }
+
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
+    onWindowHidden() {
+        this.showPassword = false;
+    }
 }

src/app/vault/add-edit.component.ts

@@ -1,6 +1,8 @@
 import {
     Component,
     OnChanges,
+    OnDestroy,
+    NgZone,
 } from '@angular/core';
 
 import { AuditService } from 'jslib/abstractions/audit.service';
@@ -14,24 +16,39 @@ import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { StateService } from 'jslib/abstractions/state.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/add-edit.component';
 
+const BroadcasterSubscriptionId = 'AddEditComponent';
+
 @Component({
     selector: 'app-vault-add-edit',
     templateUrl: 'add-edit.component.html',
 })
-export class AddEditComponent extends BaseAddEditComponent implements OnChanges {
+export class AddEditComponent extends BaseAddEditComponent implements OnChanges, OnDestroy {
     constructor(cipherService: CipherService, folderService: FolderService,
         i18nService: I18nService, platformUtilsService: PlatformUtilsService,
         auditService: AuditService, stateService: StateService,
         userService: UserService, collectionService: CollectionService,
-        messagingService: MessagingService, eventService: EventService) {
+        messagingService: MessagingService, eventService: EventService,
+        private broadcasterService: BroadcasterService, private ngZone: NgZone) {
         super(cipherService, folderService, i18nService, platformUtilsService, auditService, stateService,
             userService, collectionService, messagingService, eventService);
     }
 
     async ngOnInit() {
-        // We use ngOnChanges instead.
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                    default:
+                }
+            });
+        });
+        // We use ngOnChanges for everything else instead.
     }
 
     async ngOnChanges() {
@@ -39,6 +56,10 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges
         await this.load();
     }
 
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
     async load() {
         if (document.querySelectorAll('app-vault-add-edit .ng-dirty').length === 0 ||
             (this.cipher != null && this.cipherId !== this.cipher.id)) {
@@ -46,4 +67,14 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges
         }
         super.load();
     }
+
+    onWindowHidden() {
+        this.showPassword = false;
+        this.showCardCode = false;
+        if (this.cipher !== null && this.cipher.hasFields) {
+            this.cipher.fields.forEach(field => {
+                field.showValue = false;
+            });
+        }
+    }
 }

src/app/vault/export.component.ts

@@ -1,4 +1,9 @@
-import { Component } from '@angular/core';
+import {
+    Component,
+    OnDestroy,
+    OnInit,
+    NgZone,
+} from '@angular/core';
 
 import { CryptoService } from 'jslib/abstractions/crypto.service';
 import { EventService } from 'jslib/abstractions/event.service';
@@ -6,16 +11,42 @@ import { ExportService } from 'jslib/abstractions/export.service';
 import { I18nService } from 'jslib/abstractions/i18n.service';
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
 import { ExportComponent as BaseExportComponent } from 'jslib/angular/components/export.component';
 
+const BroadcasterSubscriptionId = 'ExportComponent';
+
 @Component({
     selector: 'app-export',
     templateUrl: 'export.component.html',
 })
-export class ExportComponent extends BaseExportComponent {
+export class ExportComponent extends BaseExportComponent implements OnInit {
     constructor(cryptoService: CryptoService, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, exportService: ExportService,
-        eventService: EventService) {
+        eventService: EventService, private broadcasterService: BroadcasterService,
+        private ngZone: NgZone) {
         super(cryptoService, i18nService, platformUtilsService, exportService, eventService, window);
     }
+
+    async ngOnInit() {
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                    default:
+                }
+            });
+        });
+    }
+
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
+    onWindowHidden() {
+        this.showPassword = false;
+    }
 }

src/app/vault/view.component.ts

@@ -25,6 +25,8 @@ import { ViewComponent as BaseViewComponent } from 'jslib/angular/components/vie
 
 import { CipherView } from 'jslib/models/view/cipherView';
 
+const BroadcasterSubscriptionId = 'ViewComponent';
+
 @Component({
     selector: 'app-vault-view',
     templateUrl: 'view.component.html',
@@ -42,6 +44,24 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
         super(cipherService, totpService, tokenService, i18nService, cryptoService, platformUtilsService,
             auditService, window, broadcasterService, ngZone, changeDetectorRef, userService, eventService);
     }
+    ngOnInit() {
+        super.ngOnInit();
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
+            this.ngZone.run(() => {
+                switch (message.command) {
+                    case 'windowHidden':
+                        this.onWindowHidden();
+                        break;
+                    default:
+                }
+            });
+        });
+    }
+
+    ngOnDestroy() {
+        super.ngOnDestroy();
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
 
     async ngOnChanges() {
         await super.load();
@@ -56,4 +76,14 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
         super.copy(value, typeI18nKey, aType);
         this.messagingService.send('minimizeOnCopy');
     }
+
+    onWindowHidden() {
+        this.showPassword = false;
+        this.showCardCode = false;
+        if (this.cipher !== null && this.cipher.hasFields) {
+            this.cipher.fields.forEach(field => {
+                field.showValue = false;
+            });
+        }
+    }
 }

src/main.ts

@@ -149,6 +149,14 @@ export class Main {
                 event.preventDefault();
                 this.processDeepLink([url]);
             });
+
+            // Handle window visibility events
+            this.windowMain.win.on('hide', () => {
+                this.messagingService.send('windowHidden');
+            });
+            this.windowMain.win.on('minimize', () => {
+                this.messagingService.send('windowHidden');
+            });
         }, (e: any) => {
             // tslint:disable-next-line
             console.error(e);