From a02e966da4478e1e2e8454ba49cec102f7199724 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Wed, 20 Apr 2022 01:30:46 +1000
Subject: [PATCH] Update jslib (#2511)

* Update jslib

* Update name of UserVerificationComponent

* Update service deps
---
 jslib                                                  |  2 +-
 src/background/main.background.ts                      |  1 +
 src/popup/app.module.ts                                |  4 ++--
 ...component.html => user-verification.component.html} |  0
 ...ord.component.ts => user-verification.component.ts} | 10 +++++-----
 src/popup/settings/export.component.html               |  4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)
 rename src/popup/components/{verify-master-password.component.html => user-verification.component.html} (100%)
 rename src/popup/components/{verify-master-password.component.ts => user-verification.component.ts} (55%)

diff --git a/jslib b/jslib
index 4d58200ee9..6bcadc4f40 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 4d58200ee90fb4fafa5d4f9f4c957654d4da306d
+Subproject commit 6bcadc4f408db2c150753f53a07d6f8888b6e9ff
diff --git a/src/background/main.background.ts b/src/background/main.background.ts
index 1537aec2d3..3cdad7b080 100644
--- a/src/background/main.background.ts
+++ b/src/background/main.background.ts
@@ -215,6 +215,7 @@ export default class MainBackground {
       this.tokenService,
       this.platformUtilsService,
       this.environmentService,
+      this.appIdService,
       (expired: boolean) => this.logout(expired)
     );
     this.settingsService = new SettingsService(this.stateService);
diff --git a/src/popup/app.module.ts b/src/popup/app.module.ts
index 5d79eed49e..ce759eee54 100644
--- a/src/popup/app.module.ts
+++ b/src/popup/app.module.ts
@@ -82,7 +82,7 @@ import { PopOutComponent } from "./components/pop-out.component";
 import { PrivateModeWarningComponent } from "./components/private-mode-warning.component";
 import { SendListComponent } from "./components/send-list.component";
 import { SetPinComponent } from "./components/set-pin.component";
-import { VerifyMasterPasswordComponent } from "./components/verify-master-password.component";
+import { UserVerificationComponent } from "./components/user-verification.component";
 import { GeneratorComponent } from "./generator/generator.component";
 import { PasswordGeneratorHistoryComponent } from "./generator/password-generator-history.component";
 import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component";
@@ -227,8 +227,8 @@ registerLocaleData(localeZhTw, "zh-TW");
     TwoFactorComponent,
     TwoFactorOptionsComponent,
     UpdateTempPasswordComponent,
+    UserVerificationComponent,
     VaultTimeoutInputComponent,
-    VerifyMasterPasswordComponent,
     ViewComponent,
     ViewCustomFieldsComponent,
     RemovePasswordComponent,
diff --git a/src/popup/components/verify-master-password.component.html b/src/popup/components/user-verification.component.html
similarity index 100%
rename from src/popup/components/verify-master-password.component.html
rename to src/popup/components/user-verification.component.html
diff --git a/src/popup/components/verify-master-password.component.ts b/src/popup/components/user-verification.component.ts
similarity index 55%
rename from src/popup/components/verify-master-password.component.ts
rename to src/popup/components/user-verification.component.ts
index 56b36505c5..dc12c94a78 100644
--- a/src/popup/components/verify-master-password.component.ts
+++ b/src/popup/components/user-verification.component.ts
@@ -2,16 +2,16 @@ import { animate, style, transition, trigger } from "@angular/animations";
 import { Component } from "@angular/core";
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
 
-import { VerifyMasterPasswordComponent as BaseComponent } from "jslib-angular/components/verify-master-password.component";
+import { UserVerificationComponent as BaseComponent } from "jslib-angular/components/user-verification.component";
 
 @Component({
-  selector: "app-verify-master-password",
-  templateUrl: "verify-master-password.component.html",
+  selector: "app-user-verification",
+  templateUrl: "user-verification.component.html",
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
       multi: true,
-      useExisting: VerifyMasterPasswordComponent,
+      useExisting: UserVerificationComponent,
     },
   ],
   animations: [
@@ -20,4 +20,4 @@ import { VerifyMasterPasswordComponent as BaseComponent } from "jslib-angular/co
     ]),
   ],
 })
-export class VerifyMasterPasswordComponent extends BaseComponent {}
+export class UserVerificationComponent extends BaseComponent {}
diff --git a/src/popup/settings/export.component.html b/src/popup/settings/export.component.html
index 4b19958ebf..cdd7510c57 100644
--- a/src/popup/settings/export.component.html
+++ b/src/popup/settings/export.component.html
@@ -29,8 +29,8 @@
             <option *ngFor="let f of formatOptions" [value]="f.value">{{ f.name }}</option>
           </select>
         </div>
-        <app-verify-master-password ngDefaultControl formControlName="secret" name="Secret">
-        </app-verify-master-password>
+        <app-user-verification ngDefaultControl formControlName="secret" name="Secret">
+        </app-user-verification>
       </div>
       <div class="box-footer">
         <p>{{ "confirmIdentity" | i18n }}</p>