[Key Connector] Add support for key connector and OTP (#2156)

Co-authored-by: Hinton <oscar@oscarhinton.com>

src/popup/accounts/lock.component.ts

@@ -8,6 +8,7 @@ import { ApiService } from 'jslib-common/abstractions/api.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 { LogService } from 'jslib-common/abstractions/log.service';
 import { MessagingService } from 'jslib-common/abstractions/messaging.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
@@ -30,9 +31,10 @@ export class LockComponent extends BaseLockComponent {
         userService: UserService, cryptoService: CryptoService,
         storageService: StorageService, vaultTimeoutService: VaultTimeoutService,
         environmentService: EnvironmentService, stateService: StateService,
-        apiService: ApiService, logService: LogService) {
+        apiService: ApiService, logService: LogService, keyConnectorService: KeyConnectorService) {
         super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
-            storageService, vaultTimeoutService, environmentService, stateService, apiService, logService);
+            storageService, vaultTimeoutService, environmentService, stateService, apiService, logService,
+            keyConnectorService);
         this.successRoute = '/tabs/current';
         this.isInitialLockScreen = (window as any).previousPopupUrl == null;
     }

src/popup/accounts/remove-password.component.html

@@ -0,0 +1,29 @@
+<header>
+    <div class="left"></div>
+    <div class="center">
+        <span class="title">{{'removeMasterPassword' | i18n}}</span>
+    </div>
+    <div class="right"></div>
+</header>
+
+<content>
+    <div class="box">
+        <div class="box-content">
+            <div class="box-content-row" appBoxRow>
+                <p>{{'convertOrganizationEncryptionDesc' | i18n : organization.name}}</p>
+            </div>
+            <div class="box-content-row">
+                <button type="button" class="btn block primary" (click)="convert()" [disabled]="actionPromise">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true" *ngIf="continuing"></i>
+                    {{'removeMasterPassword' | i18n}}
+                </button>
+            </div>
+            <div class="box-content-row">
+                <button type="button" class="btn btn-outline-secondary block" (click)="leave()" [disabled]="actionPromise">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true" *ngIf="leaving"></i>
+                    {{'leaveOrganization' | i18n}}
+                </button>
+            </div>
+        </div>
+    </div>
+</content>

src/popup/accounts/remove-password.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+import { RemovePasswordComponent as BaseRemovePasswordComponent } from 'jslib-angular/components/remove-password.component';
+
+@Component({
+    selector: 'app-remove-password',
+    templateUrl: 'remove-password.component.html',
+})
+export class RemovePasswordComponent extends BaseRemovePasswordComponent {
+}

src/popup/accounts/sso.component.ts

@@ -16,6 +16,7 @@ import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.se
 import { StateService } from 'jslib-common/abstractions/state.service';
 import { StorageService } from 'jslib-common/abstractions/storage.service';
 import { SyncService } from 'jslib-common/abstractions/sync.service';
+import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
 
 import { SsoComponent as BaseSsoComponent } from 'jslib-angular/components/sso.component';
 import { BrowserApi } from '../../browser/browserApi';
@@ -30,7 +31,8 @@ export class SsoComponent extends BaseSsoComponent {
         storageService: StorageService, stateService: StateService,
         platformUtilsService: PlatformUtilsService, apiService: ApiService,
         cryptoFunctionService: CryptoFunctionService, passwordGenerationService: PasswordGenerationService,
-        syncService: SyncService, environmentService: EnvironmentService, logService: LogService) {
+        syncService: SyncService, environmentService: EnvironmentService, logService: LogService,
+        private vaultTimeoutService: VaultTimeoutService) {
         super(authService, router, i18nService, route, storageService, stateService, platformUtilsService,
             apiService, cryptoFunctionService, environmentService, passwordGenerationService, logService);
 
@@ -41,7 +43,11 @@ export class SsoComponent extends BaseSsoComponent {
 
         super.onSuccessfulLogin = async () => {
             await syncService.fullSync(true);
-            BrowserApi.reloadOpenWindows();
+            if (await this.vaultTimeoutService.isLocked()) {
+                // If the vault is unlocked then this will clear keys from memory, which we don't want to do
+                BrowserApi.reloadOpenWindows();
+            }
+
             const thisWindow = window.open('', '_self');
             thisWindow.close();
         };