From e5d4d4ad00d43bf1c1e9b19745329e212816b6cb Mon Sep 17 00:00:00 2001 From: Ike <137194738+ike-kottlowski@users.noreply.github.com> Date: Wed, 14 Feb 2024 09:06:04 -0800 Subject: [PATCH] [PM-4612] [PM-6218] [PM-6219] Enable Duo redirect on Desktop Client (#7798) * enable duo for desktop * added missing return path in main.ts * updated logic in component * removed switch added await; updated logic in main. * addressed subscription concerns in main; updated formatting in 2fa component * Update Duo case in locales --- apps/browser/src/_locales/en/messages.json | 6 +- .../src/auth/two-factor.component.html | 325 ++++++++++-------- apps/desktop/src/auth/two-factor.component.ts | 29 +- apps/desktop/src/images/yubikey.avif | Bin 0 -> 5340 bytes apps/desktop/src/images/yubikey.webp | Bin 0 -> 12884 bytes apps/desktop/src/locales/en/messages.json | 9 + apps/desktop/src/main.ts | 19 +- apps/web/src/locales/en/messages.json | 6 +- 8 files changed, 234 insertions(+), 160 deletions(-) create mode 100644 apps/desktop/src/images/yubikey.avif create mode 100644 apps/desktop/src/images/yubikey.webp diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index 988c9b0a247..31b02def8a9 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -2696,10 +2696,10 @@ } }, "launchDuoAndFollowStepsToFinishLoggingIn": { - "message": "Launch DUO and follow the steps to finish logging in." + "message": "Launch Duo and follow the steps to finish logging in." }, "duoRequiredByOrgForAccount": { - "message": "DUO two-step login is required for your account." + "message": "Duo two-step login is required for your account." }, "openExtensionInNewWindowToCompleteLogin": { "message": "Open the extension in a new window to complete login" @@ -2708,7 +2708,7 @@ "message": "Popout extension" }, "launchDuo": { - "message": "Launch DUO" + "message": "Launch Duo" }, "importFormatError": { "message": "Data is not formatted correctly. Please check your import file and try again." diff --git a/apps/desktop/src/auth/two-factor.component.html b/apps/desktop/src/auth/two-factor.component.html index 44c4b1b60f6..afd866e1d54 100644 --- a/apps/desktop/src/auth/two-factor.component.html +++ b/apps/desktop/src/auth/two-factor.component.html @@ -1,157 +1,186 @@ -