diff --git a/api/server/routes/config.js b/api/server/routes/config.js index 006fe6dc85..d0fe2c1beb 100644 --- a/api/server/routes/config.js +++ b/api/server/routes/config.js @@ -51,7 +51,7 @@ router.get('/', async function (req, res) { !!process.env.APPLE_TEAM_ID && !!process.env.APPLE_KEY_ID && !!process.env.APPLE_PRIVATE_KEY_PATH, - passkeyLoginEnabled : !!process.env.PASSKEY_ENABLED && !!process.env.RP_ID, + passkeyLoginEnabled: !!process.env.PASSKEY_ENABLED && !!process.env.RP_ID, openidLoginEnabled: !!process.env.OPENID_CLIENT_ID && !!process.env.OPENID_CLIENT_SECRET && diff --git a/client/src/components/Auth/AuthLayout.tsx b/client/src/components/Auth/AuthLayout.tsx index 7135214105..b5a71e08aa 100644 --- a/client/src/components/Auth/AuthLayout.tsx +++ b/client/src/components/Auth/AuthLayout.tsx @@ -92,7 +92,6 @@ function AuthLayout({ {header} )} - {/* Conditionally render the default content or the PasskeyAuth component */} {showPasskey ? ( setShowPasskey(false)} /> ) : ( diff --git a/client/src/components/Auth/SocialLoginRender.tsx b/client/src/components/Auth/SocialLoginRender.tsx index 50f6276941..c3c3761ee2 100644 --- a/client/src/components/Auth/SocialLoginRender.tsx +++ b/client/src/components/Auth/SocialLoginRender.tsx @@ -124,21 +124,16 @@ function SocialLoginRender({ startupConfig, mode, onPasskeyClick }: SocialLoginR {startupConfig.passkeyLoginEnabled && (
- { - e.preventDefault(); - if (onPasskeyClick) { - onPasskeyClick(); - } - }} + data-testid="passkey" + type="button" + onClick={onPasskeyClick} >

{passkeyLabel}

-
+
)}