Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PM-16978] Add support for fido2 2fa on mac #12823

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+7 −12
Open

[PM-16978] Add support for fido2 2fa on mac #12823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22cc9f4
Add support for fido2 2fa on mac
quexten Jan 13, 2025
814cee0
Update comment
quexten Jan 13, 2025
b243c47
Update 2fa setup message
quexten Jan 15, 2025
3aeb325
Merge branch 'main' into km/fido-2-on-mac
quexten Jan 15, 2025
4aa3b7e
Merge branch 'main' into km/fido-2-on-mac
quexten Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apps/desktop/src/platform/services/electron-platform-utils.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,11 @@
return (await this.getApplicationVersion()).split(/[+|-]/)[0].trim();
}

// Temporarily restricted to only Windows until https://github.com/electron/electron/pull/28349
// has been merged and an updated electron build is available.
// Restricted to Windows and Mac. Mac is missing support for pin entry, and Linux is missing support entirely and has to be implemented in another way.
supportsWebAuthn(win: Window): boolean {
return this.getDevice() === DeviceType.WindowsDesktop;
return (

Check warning on line 82 in apps/desktop/src/platform/services/electron-platform-utils.service.ts

View check run for this annotation

Codecov / codecov/patch

apps/desktop/src/platform/services/electron-platform-utils.service.ts#L82 

Added line #L82 was not covered by tests
this.getDevice() === DeviceType.WindowsDesktop || this.getDevice() === DeviceType.MacOsDesktop
);
}

supportsDuo(): boolean {
Expand Down
5 changes: 1 addition & 4 deletions apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@
{{ "twoStepLoginProviderEnabled" | i18n }}
</app-callout>
<app-callout type="warning">
<p bitTypography="body1">{{ "twoFactorWebAuthnWarning" | i18n }}</p>
<ul class="tw-mb-0">
<li>{{ "twoFactorWebAuthnSupportWeb" | i18n }}</li>
</ul>
<p bitTypography="body1">{{ "twoFactorWebAuthnWarning1" | i18n }}</p>
</app-callout>
<img class="tw-float-right tw-ml-5 mfaType7" alt="FIDO2 WebAuthn logo" />
<ul class="bwi-ul">
Expand Down
7 changes: 2 additions & 5 deletions apps/web/src/locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2362,11 +2362,8 @@
"twoFactorU2fProblemReadingTryAgain": {
"message": "There was a problem reading the security key. Try again."
},
"twoFactorWebAuthnWarning": {
"message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used. Supported platforms:"
},
"twoFactorWebAuthnSupportWeb": {
"message": "Web vault and browser extensions on a desktop/laptop with a WebAuthn supported browser (Chrome, Opera, Vivaldi, or Firefox with FIDO U2F turned on)."
"twoFactorWebAuthnWarning1": {
"message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
},
"twoFactorRecoveryYourCode": {
"message": "Your Bitwarden two-step login recovery code"
Expand Down
Loading