TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 11:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

check for loginsettings

Browse Source
This commit is contained in:
Max Peintner
2025-06-11 14:02:13 +02:00
parent 75d2186490
commit 4e6ff833d8
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/login/src/app/(login)/loginname/page.tsx
View File

@@ -75,7 +75,7 @@ export default async function Page(props: {
submit={submit} submit={submit}
allowRegister={!!loginSettings?.allowRegister} allowRegister={!!loginSettings?.allowRegister}
> >
{identityProviders && ( {identityProviders && loginSettings?.allowExternalIdp && (
<SignInWithIdp <SignInWithIdp
identityProviders={identityProviders} identityProviders={identityProviders}
requestId={requestId} requestId={requestId}

33
apps/login/src/app/(login)/register/page.tsx
View File

@@ -12,6 +12,7 @@ import {
getPasswordComplexitySettings, getPasswordComplexitySettings,
} from "@/lib/zitadel"; } from "@/lib/zitadel";
import { Organization } from "@zitadel/proto/zitadel/org/v2/org_pb"; 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 { getLocale, getTranslations } from "next-intl/server";
import { headers } from "next/headers"; import { headers } from "next/headers";
@@ -84,20 +85,24 @@ export default async function Page(props: {
{!organization && <Alert>{tError("unknownContext")}</Alert>} {!organization && <Alert>{tError("unknownContext")}</Alert>}
{legal && passwordComplexitySettings && organization && ( {legal &&
<RegisterForm passwordComplexitySettings &&
idpCount={ organization &&
!loginSettings?.allowExternalIdp ? 0 : identityProviders.length (loginSettings.allowUsernamePassword ||
} loginSettings.passkeysType == PasskeysType.ALLOWED) && (
legal={legal} <RegisterForm
organization={organization} idpCount={
firstname={firstname} !loginSettings?.allowExternalIdp ? 0 : identityProviders.length
lastname={lastname} }
email={email} legal={legal}
requestId={requestId} organization={organization}
loginSettings={loginSettings} firstname={firstname}
></RegisterForm> lastname={lastname}
)} email={email}
requestId={requestId}
loginSettings={loginSettings}
></RegisterForm>
)}
{loginSettings?.allowExternalIdp && !!identityProviders.length && ( {loginSettings?.allowExternalIdp && !!identityProviders.length && (
<> <>

10
apps/login/src/components/register-form.tsx
View File

@@ -185,10 +185,12 @@ export function RegisterForm({
</> </>
)} )}
{(!loginSettings?.allowUsernamePassword || {!loginSettings?.allowUsernamePassword &&
loginSettings?.passkeysType != PasskeysType.ALLOWED) && loginSettings?.passkeysType != PasskeysType.ALLOWED &&
!idpCount && ( (!loginSettings?.allowExternalIdp || !idpCount) && (
<Alert type={AlertType.INFO}>{t("noMethodAvailableWarning")}</Alert> <div className="py-4">
<Alert type={AlertType.INFO}>{t("noMethodAvailableWarning")}</Alert>
</div>
)} )}
{error && ( {error && (