@@ -38,14 +63,21 @@ export default async function Page(props: {
)}
- {session?.id && (
+ {(session?.id || userId) && (
diff --git a/src/app/(login)/password/change/page.tsx b/src/app/(login)/password/change/page.tsx
index 78ba88d282..690c1dcb3f 100644
--- a/src/app/(login)/password/change/page.tsx
+++ b/src/app/(login)/password/change/page.tsx
@@ -10,8 +10,15 @@ import {
getLoginSettings,
getPasswordComplexitySettings,
} from "@/lib/zitadel";
+import { Metadata } from "next";
+import { getTranslations } from "next-intl/server";
import { headers } from "next/headers";
+export async function generateMetadata(): Promise
-
-
-
-
+ {error}
+
+ )}
);
}
diff --git a/src/components/device-code-form.tsx b/src/components/device-code-form.tsx
index 9c5a28ca4f..108c1a3529 100644
--- a/src/components/device-code-form.tsx
+++ b/src/components/device-code-form.tsx
@@ -66,7 +66,7 @@ export function DeviceCodeForm({ userCode }: { userCode?: string }) {
type="text"
autoComplete="one-time-code"
{...register("userCode", { required: t("usercode.required.code") })}
- label="Code"
+ label={t("usercode.labels.code")}
data-testid="code-text-input"
/>
- 
)}
{lightSrc && (
- 
)}
diff --git a/src/components/password-form.tsx b/src/components/password-form.tsx
index c8a10a9907..1b4c73b950 100644
--- a/src/components/password-form.tsx
+++ b/src/components/password-form.tsx
@@ -26,16 +26,11 @@ type Props = {
requestId?: string;
};
-export function PasswordForm({
- loginSettings,
- loginName,
- organization,
- requestId,
-}: Props) {
+export function PasswordForm({ loginSettings, loginName, organization, requestId }: Props) {
const { register, handleSubmit, formState } = useForm@@ -50,16 +62,17 @@ export function PrivacyPolicyCheckboxes({ legal, onChange }: Props) {
@@ -75,25 +88,22 @@ export function PrivacyPolicyCheckboxes({ legal, onChange }: Props) {
{
- setAcceptanceState({
+ const newState = {
...acceptanceState,
privacyPolicyAccepted: checked,
- });
- onChange(checked && acceptanceState.tosAccepted);
+ };
+ setAcceptanceState(newState);
+ onChange(checkAllAccepted(newState));
}}
- data-testid="tos-checkbox"
+ data-testid="privacy-policy-checkbox"
/>
(false);
const [error, setError] = useState("");
- const router = useRouter();
-
async function submitAndRegister(values: Inputs) {
setLoading(true);
const response = await registerUserAndLinkToIDP({
@@ -88,11 +85,7 @@ export function RegisterFormIDPIncomplete({
return;
}
- if (response && "redirect" in response && response.redirect) {
- return router.push(response.redirect);
- }
-
- return response;
+ // If no error, the function has already handled the redirect
}
const { errors } = formState;
@@ -106,7 +99,7 @@ export function RegisterFormIDPIncomplete({
autoComplete="firstname"
required
{...register("firstname", { required: t("required.firstname") })}
- label="First name"
+ label={t("labels.firstname")}
error={errors.firstname?.message as string}
data-testid="firstname-text-input"
/>
@@ -117,7 +110,7 @@ export function RegisterFormIDPIncomplete({
autoComplete="lastname"
required
{...register("lastname", { required: t("required.lastname") })}
- label="Last name"
+ label={t("labels.lastname")}
error={errors.lastname?.message as string}
data-testid="lastname-text-input"
/>
@@ -128,7 +121,7 @@ export function RegisterFormIDPIncomplete({
autoComplete="email"
required
{...register("email", { required: t("required.email") })}
- label="E-mail"
+ label={t("labels.email")}
error={errors.email?.message as string}
data-testid="email-text-input"
/>
@@ -150,8 +143,7 @@ export function RegisterFormIDPIncomplete({
onClick={handleSubmit(submitAndRegister)}
data-testid="submit-button"
>
- {loading &&
diff --git a/src/components/register-form.tsx b/src/components/register-form.tsx
index 7b4254b0b3..a8f8b0962b 100644
--- a/src/components/register-form.tsx
+++ b/src/components/register-form.tsx
@@ -2,20 +2,13 @@
import { registerUser } from "@/lib/server/register";
import { LegalAndSupportSettings } from "@zitadel/proto/zitadel/settings/v2/legal_settings_pb";
-import {
- LoginSettings,
- PasskeysType,
-} from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
+import { LoginSettings, PasskeysType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { useTranslations } from "next-intl";
import { FieldValues, useForm } from "react-hook-form";
import { Alert, AlertType } from "./alert";
-import {
- AuthenticationMethod,
- AuthenticationMethodRadio,
- methods,
-} from "./authentication-method-radio";
+import { AuthenticationMethod, AuthenticationMethodRadio, methods } from "./authentication-method-radio";
import { BackButton } from "./back-button";
import { Button, ButtonVariants } from "./button";
import { TextInput } from "./input";
@@ -98,10 +91,7 @@ export function RegisterForm({
return response;
}
- async function submitAndContinue(
- value: Inputs,
- withPassword: boolean = false,
- ) {
+ async function submitAndContinue(value: Inputs, withPassword: boolean = false) {
const registerParams: any = value;
if (organization) {
@@ -114,9 +104,7 @@ export function RegisterForm({
// redirect user to /register/password if password is chosen
if (withPassword) {
- return router.push(
- `/register/password?` + new URLSearchParams(registerParams),
- );
+ return router.push(`/register/password?` + new URLSearchParams(registerParams));
} else {
return submitAndRegister(value);
}
@@ -125,6 +113,11 @@ export function RegisterForm({
const { errors } = formState;
const [tosAndPolicyAccepted, setTosAndPolicyAccepted] = useState(false);
+
+ // Check if legal acceptance is required
+ const isLegalAcceptanceRequired = !!(legal?.tosLink || legal?.privacyPolicyLink);
+ const canSubmit = formState.isValid && (!isLegalAcceptanceRequired || tosAndPolicyAccepted);
+
return (
- {legal && (
-
-
)}
@@ -209,11 +191,10 @@ export function RegisterForm({
diff --git a/src/components/register-u2f.tsx b/src/components/register-u2f.tsx
index ebaabb8390..44276304b1 100644
--- a/src/components/register-u2f.tsx
+++ b/src/components/register-u2f.tsx
@@ -1,7 +1,7 @@
"use client";
import { coerceToArrayBuffer, coerceToBase64Url } from "@/helpers/base64";
-import { getNextUrl } from "@/lib/client";
+import { completeFlowOrGetUrl } from "@/lib/client";
import { addU2F, verifyU2F } from "@/lib/server/u2f";
import { LoginSettings } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
import { RegisterU2FResponse } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
@@ -22,26 +22,14 @@ type Props = {
loginSettings?: LoginSettings;
};
-export function RegisterU2f({
- loginName,
- sessionId,
- organization,
- requestId,
- checkAfter,
- loginSettings,
-}: Props) {
+export function RegisterU2f({ loginName, sessionId, organization, requestId, checkAfter, loginSettings }: Props) {
const [error, setError] = useState
-
+
-
-
-
- )}
+ {loginSettings && loginSettings.allowUsernamePassword && loginSettings.passkeysType == PasskeysType.ALLOWED && (
+ <>
+
+
+
+
+ )}
{!loginSettings?.allowUsernamePassword &&
loginSettings?.passkeysType !== PasskeysType.ALLOWED &&
(!loginSettings?.allowExternalIdp || !idpCount) && (