From 4e6ff833d8b935a17e8dcda3be535064935b97be Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Wed, 11 Jun 2025 14:02:13 +0200
Subject: [PATCH] check for loginsettings

---
 apps/login/src/app/(login)/loginname/page.tsx |  2 +-
 apps/login/src/app/(login)/register/page.tsx  | 33 +++++++++++--------
 apps/login/src/components/register-form.tsx   | 10 +++---
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/apps/login/src/app/(login)/loginname/page.tsx b/apps/login/src/app/(login)/loginname/page.tsx
index 79372729c4..adb6ec0eef 100644
--- a/apps/login/src/app/(login)/loginname/page.tsx
+++ b/apps/login/src/app/(login)/loginname/page.tsx
@@ -75,7 +75,7 @@ export default async function Page(props: {
           submit={submit}
           allowRegister={!!loginSettings?.allowRegister}
         >
-          {identityProviders && (
+          {identityProviders && loginSettings?.allowExternalIdp && (
             <SignInWithIdp
               identityProviders={identityProviders}
               requestId={requestId}
diff --git a/apps/login/src/app/(login)/register/page.tsx b/apps/login/src/app/(login)/register/page.tsx
index 3a61dbae7c..be872b4dc7 100644
--- a/apps/login/src/app/(login)/register/page.tsx
+++ b/apps/login/src/app/(login)/register/page.tsx
@@ -12,6 +12,7 @@ import {
   getPasswordComplexitySettings,
 } from "@/lib/zitadel";
 import { Organization } from "@zitadel/proto/zitadel/org/v2/org_pb";
+import { PasskeysType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
 import { getLocale, getTranslations } from "next-intl/server";
 import { headers } from "next/headers";
 
@@ -84,20 +85,24 @@ export default async function Page(props: {
 
         {!organization && <Alert>{tError("unknownContext")}</Alert>}
 
-        {legal && passwordComplexitySettings && organization && (
-          <RegisterForm
-            idpCount={
-              !loginSettings?.allowExternalIdp ? 0 : identityProviders.length
-            }
-            legal={legal}
-            organization={organization}
-            firstname={firstname}
-            lastname={lastname}
-            email={email}
-            requestId={requestId}
-            loginSettings={loginSettings}
-          ></RegisterForm>
-        )}
+        {legal &&
+          passwordComplexitySettings &&
+          organization &&
+          (loginSettings.allowUsernamePassword ||
+            loginSettings.passkeysType == PasskeysType.ALLOWED) && (
+            <RegisterForm
+              idpCount={
+                !loginSettings?.allowExternalIdp ? 0 : identityProviders.length
+              }
+              legal={legal}
+              organization={organization}
+              firstname={firstname}
+              lastname={lastname}
+              email={email}
+              requestId={requestId}
+              loginSettings={loginSettings}
+            ></RegisterForm>
+          )}
 
         {loginSettings?.allowExternalIdp && !!identityProviders.length && (
           <>
diff --git a/apps/login/src/components/register-form.tsx b/apps/login/src/components/register-form.tsx
index 1999bc7251..c581131c8c 100644
--- a/apps/login/src/components/register-form.tsx
+++ b/apps/login/src/components/register-form.tsx
@@ -185,10 +185,12 @@ export function RegisterForm({
           </>
         )}
 
-      {(!loginSettings?.allowUsernamePassword ||
-        loginSettings?.passkeysType != PasskeysType.ALLOWED) &&
-        !idpCount && (
-          <Alert type={AlertType.INFO}>{t("noMethodAvailableWarning")}</Alert>
+      {!loginSettings?.allowUsernamePassword &&
+        loginSettings?.passkeysType != PasskeysType.ALLOWED &&
+        (!loginSettings?.allowExternalIdp || !idpCount) && (
+          <div className="py-4">
+            <Alert type={AlertType.INFO}>{t("noMethodAvailableWarning")}</Alert>
+          </div>
         )}
 
       {error && (