bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-05 11:13:44 +00:00
Code Issues Releases Wiki Activity

Fix action text and close vault modal (#15634)

Browse Source 
* Fix action text and close vault modal

* Fix broken tests
This commit is contained in:
Jeffrey Holland
2025-07-30 18:05:08 +02:00
committed by GitHub
parent fa3483d33f
commit 34cdcf231b
4 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/desktop/src/autofill/modal/credentials/fido2-create.component.spec.ts
View File

@@ -137,7 +137,8 @@ describe("Fido2CreateComponent", () => {
title: { key: "unableToSavePasskey" },
content: { key: "closeThisBitwardenWindow" },
type: "danger",
acceptButtonText: { key: "closeBitwarden" },
acceptButtonText: { key: "closeThisWindow" },
acceptAction: expect.any(Function),
cancelButtonText: null,
});
});
@@ -217,7 +218,8 @@ describe("Fido2CreateComponent", () => {
title: { key: "unableToSavePasskey" },
content: { key: "closeThisBitwardenWindow" },
type: "danger",
acceptButtonText: { key: "closeBitwarden" },
acceptButtonText: { key: "closeThisWindow" },
acceptAction: expect.any(Function),
cancelButtonText: null,
});
});

58
apps/desktop/src/autofill/modal/credentials/fido2-create.component.ts
View File

@@ -35,28 +35,6 @@ import {
import { BitwardenShield } from "./bitwarden-shield.icon";
import { Fido2PasskeyExistsIcon } from "./fido2-passkey-exists-icon";
const DIALOG_MESSAGES = {
unexpectedErrorShort: {
title: { key: "unexpectedErrorShort" },
content: { key: "closeThisBitwardenWindow" },
type: "danger",
acceptButtonText: { key: "closeBitwarden" },
cancelButtonText: null as null,
},
unableToSavePasskey: {
title: { key: "unableToSavePasskey" },
content: { key: "closeThisBitwardenWindow" },
type: "danger",
acceptButtonText: { key: "closeBitwarden" },
cancelButtonText: null as null,
},
overwritePasskey: {
title: { key: "overwritePasskey" },
content: { key: "alreadyContainsPasskey" },
type: "warning",
},
} as const satisfies Record<string, SimpleDialogOptions>;
@Component({
standalone: true,
imports: [
@@ -81,6 +59,32 @@ export class Fido2CreateComponent implements OnInit, OnDestroy {
readonly Icons = { BitwardenShield };
protected fido2PasskeyExistsIcon = Fido2PasskeyExistsIcon;
private get DIALOG_MESSAGES() {
return {
unexpectedErrorShort: {
title: { key: "unexpectedErrorShort" },
content: { key: "closeThisBitwardenWindow" },
type: "danger",
acceptButtonText: { key: "closeThisWindow" },
cancelButtonText: null as null,
acceptAction: async () => this.dialogService.closeAll(),
},
unableToSavePasskey: {
title: { key: "unableToSavePasskey" },
content: { key: "closeThisBitwardenWindow" },
type: "danger",
acceptButtonText: { key: "closeThisWindow" },
cancelButtonText: null as null,
acceptAction: async () => this.dialogService.closeAll(),
},
overwritePasskey: {
title: { key: "overwritePasskey" },
content: { key: "alreadyContainsPasskey" },
type: "warning",
},
} as const satisfies Record<string, SimpleDialogOptions>;
}
constructor(
private readonly desktopSettingsService: DesktopSettingsService,
private readonly fido2UserInterfaceService: DesktopFido2UserInterfaceService,
@@ -98,7 +102,7 @@ export class Fido2CreateComponent implements OnInit, OnDestroy {
const rpid = await this.session?.getRpId();
if (!this.session) {
await this.showErrorDialog(DIALOG_MESSAGES.unableToSavePasskey);
await this.showErrorDialog(this.DIALOG_MESSAGES.unableToSavePasskey);
return;
}
@@ -119,7 +123,7 @@ export class Fido2CreateComponent implements OnInit, OnDestroy {
this.session.notifyConfirmCreateCredential(isConfirmed, cipher);
} catch {
await this.showErrorDialog(DIALOG_MESSAGES.unableToSavePasskey);
await this.showErrorDialog(this.DIALOG_MESSAGES.unableToSavePasskey);
return;
}
@@ -134,7 +138,7 @@ export class Fido2CreateComponent implements OnInit, OnDestroy {
this.session.notifyConfirmCreateCredential(true);
} catch {
await this.showErrorDialog(DIALOG_MESSAGES.unableToSavePasskey);
await this.showErrorDialog(this.DIALOG_MESSAGES.unableToSavePasskey);
}
await this.closeModal();
@@ -179,7 +183,7 @@ export class Fido2CreateComponent implements OnInit, OnDestroy {
!cipher.deletedDate,
);
} catch {
await this.showErrorDialog(DIALOG_MESSAGES.unexpectedErrorShort);
await this.showErrorDialog(this.DIALOG_MESSAGES.unexpectedErrorShort);
return [];
}
}),
@@ -189,7 +193,7 @@ export class Fido2CreateComponent implements OnInit, OnDestroy {
private async validateCipherAccess(cipher: CipherView): Promise<boolean> {
if (cipher.login.hasFido2Credentials) {
const overwriteConfirmed = await this.dialogService.openSimpleDialog(
DIALOG_MESSAGES.overwritePasskey,
this.DIALOG_MESSAGES.overwritePasskey,
);
if (!overwriteConfirmed) {

2
apps/desktop/src/autofill/modal/credentials/fido2-vault.component.ts
View File

@@ -85,7 +85,7 @@ export class Fido2VaultComponent implements OnInit, OnDestroy {
title: { key: "unexpectedErrorShort" },
content: { key: "closeThisBitwardenWindow" },
type: "danger",
acceptButtonText: { key: "closeBitwarden" },
acceptButtonText: { key: "closeThisWindow" },
cancelButtonText: null,
});
await this.closeModal();

6
apps/desktop/src/locales/en/messages.json
View File

@@ -3211,7 +3211,7 @@
"orgTrustWarning1": {
"message": "This organization has an Enterprise policy that will enroll you in account recovery. Enrollment will allow organization administrators to change your password. Only proceed if you recognize this organization and the fingerprint phrase displayed below matches the organization's fingerprint."
},
"trustUser":{
"trustUser": {
"message": "Trust user"
},
"inputRequired": {
@@ -3781,8 +3781,8 @@
"applicationDoesNotSupportDuplicates": {
"message": "This application does not support duplicates."
},
"closeBitwarden": {
"message": "Close Bitwarden"
"closeThisWindow": {
"message": "Close this window"
},
"allowScreenshots": {
"message": "Allow screen capture"