From 9846ef0946f9547a7b3c5bdab9dd1af2c126b3e9 Mon Sep 17 00:00:00 2001 From: peintnermax Date: Thu, 5 Sep 2024 15:52:14 +0200 Subject: [PATCH] favor passkey setup --- apps/login/src/ui/PasswordForm.tsx | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/login/src/ui/PasswordForm.tsx b/apps/login/src/ui/PasswordForm.tsx index 4127d8fcaae..29192acccce 100644 --- a/apps/login/src/ui/PasswordForm.tsx +++ b/apps/login/src/ui/PasswordForm.tsx @@ -148,22 +148,6 @@ export default function PasswordForm({ } return router.push(`/mfa?` + params); - } else if (loginSettings?.forceMfa && !availableSecondFactors.length) { - const params = new URLSearchParams({ - loginName: submitted.factors.user.loginName, - checkAfter: "true", // this defines if the check is directly made after the setup - }); - - if (authRequestId) { - params.append("authRequestId", authRequestId); - } - - if (organization) { - params.append("organization", organization); - } - - // TODO: provide a way to setup passkeys on mfa page? - return router.push(`/mfa/set?` + params); } else if ( submitted.factors && !submitted.factors.webAuthN && // if session was not verified with a passkey @@ -184,6 +168,22 @@ export default function PasswordForm({ } return router.push(`/passkey/add?` + params); + } else if (loginSettings?.forceMfa && !availableSecondFactors.length) { + const params = new URLSearchParams({ + loginName: submitted.factors.user.loginName, + checkAfter: "true", // this defines if the check is directly made after the setup + }); + + if (authRequestId) { + params.append("authRequestId", authRequestId); + } + + if (organization) { + params.append("organization", organization); + } + + // TODO: provide a way to setup passkeys on mfa page? + return router.push(`/mfa/set?` + params); } else if (authRequestId && submitted.sessionId) { const params = new URLSearchParams({ sessionId: submitted.sessionId,