Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-03-31 22:51:25 -05:00
Code Issues Activity

refactor(experience): hide webauthn on native webview (#4778)

Browse source
This commit is contained in:
Xiao Yijun 2023-10-27 17:21:06 +08:00 • committed by GitHub
parent de9810709f
commit 8acfdb86f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 48 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/experience/src/hooks/use-mfa-error-handler.ts
View file

@ -10,6 +10,7 @@ import {
backupCodeErrorDataGuard,
type BackupCodeBindingState,
} from '@/types/guard';
import { isNativeWebview } from '@/utils/native-sdk';
import type { ErrorHandlers } from './use-error-handler';
import useStartTotpBinding from './use-start-totp-binding';
@ -66,14 +67,20 @@ const useMfaErrorHandler = ({ replace }: Options = {}) => {
(flow: UserMfaFlow) => {
return (error: RequestErrorBody) => {
const [_, data] = validate(error.data, mfaErrorDataGuard);
const availableFactors = data?.availableFactors ?? [];
const factors = data?.availableFactors ?? [];
const skippable = data?.skippable;
if (availableFactors.length === 0) {
if (factors.length === 0) {
setToast(error.message);
return;
}
const availableFactors =
// Hide the webauthn factor on native webview if the user has other options, since it's not supported.
isNativeWebview() && factors.length > 1
? factors.filter((factor) => factor !== MfaFactor.WebAuthn)
: factors;
handleMfaRedirect(flow, { availableFactors, skippable });
};
},

11
packages/experience/src/hooks/use-webauthn-operation.ts
View file

@ -5,7 +5,11 @@ import {
type WebAuthnRegistrationOptions,
} from '@logto/schemas';
import { trySafe } from '@silverhand/essentials';
import { startAuthentication, startRegistration } from '@simplewebauthn/browser';
import {
browserSupportsWebAuthn,
startAuthentication,
startRegistration,
} from '@simplewebauthn/browser';
import type {
RegistrationResponseJSON,
AuthenticationResponseJSON,
@ -108,6 +112,11 @@ const useWebAuthnOperation = (flow: UserMfaFlow) => {
);
return useCallback(async () => {
if (!browserSupportsWebAuthn()) {
setToast(t('mfa.webauthn_not_supported'));
return;
}
if (!webAuthnOptions) {
/**
* This error message is just for program robustness; in practice, this issue is unlikely to occur.

2
packages/phrases-experience/src/locales/de/mfa.ts
View file

@ -53,6 +53,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

1
packages/phrases-experience/src/locales/en/mfa.ts
View file

@ -50,6 +50,7 @@ const mfa = {
secret_key_copied: 'Secret key copied.',
backup_code_copied: 'Backup code copied.',
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
webauthn_failed_to_create: 'Failed to create. Please try again.',
webauthn_failed_to_verify: 'Failed to verify. Please try again.',
};

2
packages/phrases-experience/src/locales/es/mfa.ts
View file

@ -52,6 +52,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/fr/mfa.ts
View file

@ -52,6 +52,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/it/mfa.ts
View file

@ -52,6 +52,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/ja/mfa.ts
View file

@ -52,6 +52,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/ko/mfa.ts
View file

@ -50,6 +50,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/pl-pl/mfa.ts
View file

@ -52,6 +52,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/pt-br/mfa.ts
View file

@ -52,6 +52,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/pt-pt/mfa.ts
View file

@ -52,6 +52,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/ru/mfa.ts
View file

@ -52,6 +52,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/tr-tr/mfa.ts
View file

@ -52,6 +52,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/zh-cn/mfa.ts
View file

@ -47,6 +47,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/zh-hk/mfa.ts
View file

@ -47,6 +47,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',

2
packages/phrases-experience/src/locales/zh-tw/mfa.ts
View file

@ -47,6 +47,8 @@ const mfa = {
/** UNTRANSLATED */
webauthn_not_ready: 'WebAuthn is not ready yet. Please try again later.',
/** UNTRANSLATED */
webauthn_not_supported: 'WebAuthn is not supported in this browser.',
/** UNTRANSLATED */
webauthn_failed_to_create: 'Failed to create. Please try again.',
/** UNTRANSLATED */
webauthn_failed_to_verify: 'Failed to verify. Please try again.',