Fixed autofill to use new method on userVerificationService (#6029)

bitwarden · Aug 14, 2023 · 39ecad3 · 39ecad3
1 parent 93e3307
commit 39ecad3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts
@@ -118,8 +118,8 @@ describe("CipherContextMenuHandler", () => {
     it("adds ciphers with master password reprompt if the user does not have a master password", async () => {
       authService.getAuthStatus.mockResolvedValue(AuthenticationStatus.Unlocked);
 
-      // User does not have a master password (key connector user or TDE user)
-      userVerificationService.hasMasterPassword.mockResolvedValue(false);
+      // User does not have a master password, or has one but hasn't logged in with it (key connector user or TDE user)
+      userVerificationService.hasMasterPasswordAndMasterKeyHash.mockResolvedValue(false);
 
       mainContextMenuHandler.init.mockResolvedValue(true);
 

diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts
@@ -185,7 +185,7 @@ export class CipherContextMenuHandler {
       cipher == null ||
       cipher.type !== CipherType.Login ||
       (cipher.reprompt !== CipherRepromptType.None &&
-        (await this.userVerificationService.hasMasterPassword()))
+        (await this.userVerificationService.hasMasterPasswordAndMasterKeyHash()))
     ) {
       return;
     }

diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
@@ -239,7 +239,7 @@ export default class AutofillService implements AutofillServiceInterface {
     if (
       cipher == null ||
       (cipher.reprompt !== CipherRepromptType.None &&
-        (await this.userVerificationService.hasMasterPassword()))
+        (await this.userVerificationService.hasMasterPasswordAndMasterKeyHash()))
     ) {
       return null;
     }