Merge branch 'dev' into feat/internal-user-passkey-support

This commit is contained in:
Adrian Astles
2025-07-14 07:20:33 +08:00
committed by GitHub
24 changed files with 2522 additions and 367 deletions
+4
View File
@@ -48,6 +48,10 @@ export default function LocaleSwitcher() {
{
value: 'zh-CN',
label: '简体中文'
},
{
value: 'ko-KR',
label: '한국어'
}
]}
/>
+6
View File
@@ -210,6 +210,12 @@ export default function LoginForm({ redirect, onLogin, idps }: LoginFormProps) {
return;
}
if (data?.twoFactorSetupRequired) {
const setupUrl = `/auth/2fa/setup?email=${encodeURIComponent(email)}${redirect ? `&redirect=${encodeURIComponent(redirect)}` : ''}`;
router.push(setupUrl);
return;
}
if (onLogin) {
await onLogin();
}