From 51d2ee6d517daf2163d98e1e4f472627460e3f03 Mon Sep 17 00:00:00 2001
From: peintnermax <max@caos.ch>
Date: Wed, 17 Jul 2024 16:23:02 +0200
Subject: [PATCH] promptPasswordless check

---
 apps/login/src/ui/PasswordForm.tsx |  1 -
 apps/login/src/ui/UsernameForm.tsx | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/login/src/ui/PasswordForm.tsx b/apps/login/src/ui/PasswordForm.tsx
index c69f689c874..bd76ff0d02e 100644
--- a/apps/login/src/ui/PasswordForm.tsx
+++ b/apps/login/src/ui/PasswordForm.tsx
@@ -171,7 +171,6 @@ export default function PasswordForm({
 
         return router.push(`/passkey/add?` + params);
       } else if (loginSettings?.forceMfa && !availableSecondFactors.length) {
-        console.log("force setup mfa");
         const params = new URLSearchParams({
           loginName: resp.factors.user.loginName,
           checkAfter: "true", // this defines if the check is directly made after the setup
diff --git a/apps/login/src/ui/UsernameForm.tsx b/apps/login/src/ui/UsernameForm.tsx
index 39c54049282..1ed2cf7c8d9 100644
--- a/apps/login/src/ui/UsernameForm.tsx
+++ b/apps/login/src/ui/UsernameForm.tsx
@@ -7,7 +7,10 @@ import { useForm } from "react-hook-form";
 import { useRouter } from "next/navigation";
 import { Spinner } from "./Spinner";
 import Alert from "./Alert";
-import { LoginSettings } from "@zitadel/proto/zitadel/settings/v2beta/login_settings_pb";
+import {
+  LoginSettings,
+  PasskeysType,
+} from "@zitadel/proto/zitadel/settings/v2beta/login_settings_pb";
 
 type Inputs = {
   loginName: string;
@@ -77,6 +80,7 @@ export default function UsernameForm({
     values: Inputs,
     organization?: string,
   ) {
+    console.log(loginSettings);
     return submitLoginName(values, organization).then((response) => {
       if (response.authMethodTypes.length == 1) {
         const method = response.authMethodTypes[0];
@@ -90,8 +94,13 @@ export default function UsernameForm({
               paramsPassword.organization = organization;
             }
 
-            if (loginSettings?.passkeysType === 1) {
-              paramsPassword.promptPasswordless = `true`; // PasskeysType.PASSKEYS_TYPE_ALLOWED,
+            if (
+              loginSettings?.passkeysType &&
+              (loginSettings?.passkeysType === PasskeysType.ALLOWED ||
+                (loginSettings.passkeysType as string) ===
+                  "PASSKEYS_TYPE_ALLOWED")
+            ) {
+              paramsPassword.promptPasswordless = `true`;
             }
 
             if (authRequestId) {