diff --git a/apps/login/src/components/change-password-form.tsx b/apps/login/src/components/change-password-form.tsx index 0381e78d3..ade359dda 100644 --- a/apps/login/src/components/change-password-form.tsx +++ b/apps/login/src/components/change-password-form.tsx @@ -1,15 +1,7 @@ "use client"; -import { - lowerCaseValidator, - numberValidator, - symbolValidator, - upperCaseValidator, -} from "@/helpers/validators"; -import { - checkSessionAndSetPassword, - sendPassword, -} from "@/lib/server/password"; +import { lowerCaseValidator, numberValidator, symbolValidator, upperCaseValidator } from "@/helpers/validators"; +import { checkSessionAndSetPassword, sendPassword } from "@/lib/server/password"; import { create } from "@zitadel/client"; import { ChecksSchema } from "@zitadel/proto/zitadel/session/v2/session_service_pb"; import { PasswordComplexitySettings } from "@zitadel/proto/zitadel/settings/v2/password_settings_pb"; @@ -40,17 +32,11 @@ type Props = { organization?: string; }; -export function ChangePasswordForm({ - passwordComplexitySettings, - sessionId, - loginName, - requestId, - organization, -}: Props) { +export function ChangePasswordForm({ passwordComplexitySettings, sessionId, loginName, requestId, organization }: Props) { const router = useRouter(); const { register, handleSubmit, watch, formState } = useForm({ - mode: "onBlur", + mode: "onChange", defaultValues: { password: "", comfirmPassword: "", @@ -78,11 +64,7 @@ export function ChangePasswordForm({ }); if (changeResponse && "error" in changeResponse && changeResponse.error) { - setError( - typeof changeResponse.error === "string" - ? changeResponse.error - : t("change.errors.unknownError") - ); + setError(typeof changeResponse.error === "string" ? changeResponse.error : t("change.errors.unknownError")); return; } @@ -109,20 +91,12 @@ export function ChangePasswordForm({ setLoading(false); }); - if ( - passwordResponse && - "error" in passwordResponse && - passwordResponse.error - ) { + if (passwordResponse && "error" in passwordResponse && passwordResponse.error) { setError(passwordResponse.error); return; } - if ( - passwordResponse && - "redirect" in passwordResponse && - passwordResponse.redirect - ) { + if (passwordResponse && "redirect" in passwordResponse && passwordResponse.redirect) { return router.push(passwordResponse.redirect); } @@ -134,9 +108,7 @@ export function ChangePasswordForm({ const watchPassword = watch("password", ""); const watchConfirmPassword = watch("confirmPassword", ""); - const hasMinLength = - passwordComplexitySettings && - watchPassword?.length >= passwordComplexitySettings.minLength; + const hasMinLength = passwordComplexitySettings && watchPassword?.length >= passwordComplexitySettings.minLength; const hasSymbol = symbolValidator(watchPassword); const hasNumber = numberValidator(watchPassword); const hasUppercase = upperCaseValidator(watchPassword); @@ -196,17 +168,11 @@ export function ChangePasswordForm({ diff --git a/apps/login/src/components/device-code-form.tsx b/apps/login/src/components/device-code-form.tsx index 108c1a352..12a44fd59 100644 --- a/apps/login/src/components/device-code-form.tsx +++ b/apps/login/src/components/device-code-form.tsx @@ -20,7 +20,7 @@ export function DeviceCodeForm({ userCode }: { userCode?: string }) { const router = useRouter(); const { register, handleSubmit, formState } = useForm({ - mode: "onBlur", + mode: "onChange", defaultValues: { userCode: userCode || "", }, @@ -88,8 +88,7 @@ export function DeviceCodeForm({ userCode }: { userCode?: string }) { onClick={handleSubmit(submitCodeAndContinue)} data-testid="submit-button" > - {loading && }{" "} - + {loading && } diff --git a/apps/login/src/components/ldap-username-password-form.tsx b/apps/login/src/components/ldap-username-password-form.tsx index 476d7b13e..669c673f7 100644 --- a/apps/login/src/components/ldap-username-password-form.tsx +++ b/apps/login/src/components/ldap-username-password-form.tsx @@ -24,7 +24,7 @@ type Props = { export function LDAPUsernamePasswordForm({ idpId, link }: Props) { const { register, handleSubmit, formState } = useForm({ - mode: "onBlur", + mode: "onChange", }); const t = useTranslations("ldap"); diff --git a/apps/login/src/components/login-otp.tsx b/apps/login/src/components/login-otp.tsx index d4fa0fccb..170de2fd0 100644 --- a/apps/login/src/components/login-otp.tsx +++ b/apps/login/src/components/login-otp.tsx @@ -44,7 +44,7 @@ export function LoginOTP({ host, loginName, sessionId, requestId, organization, const initialized = useRef(false); const { register, handleSubmit, formState } = useForm({ - mode: "onBlur", + mode: "onChange", defaultValues: { code: code ? code : "", }, diff --git a/apps/login/src/components/password-form.tsx b/apps/login/src/components/password-form.tsx index 9f4b27fe8..b19c96fe1 100644 --- a/apps/login/src/components/password-form.tsx +++ b/apps/login/src/components/password-form.tsx @@ -28,7 +28,7 @@ type Props = { export function PasswordForm({ loginSettings, loginName, organization, requestId }: Props) { const { register, handleSubmit, formState } = useForm({ - mode: "onBlur", + mode: "onChange", }); const t = useTranslations("password"); diff --git a/apps/login/src/components/register-form-idp-incomplete.tsx b/apps/login/src/components/register-form-idp-incomplete.tsx index 30b6fd016..b5d12da01 100644 --- a/apps/login/src/components/register-form-idp-incomplete.tsx +++ b/apps/login/src/components/register-form-idp-incomplete.tsx @@ -47,7 +47,7 @@ export function RegisterFormIDPIncomplete({ idpUserName, }: Props) { const { register, handleSubmit, formState } = useForm({ - mode: "onBlur", + mode: "onChange", defaultValues: { email: defaultValues?.email ?? "", firstname: defaultValues?.firstname ?? "", diff --git a/apps/login/src/components/register-form.tsx b/apps/login/src/components/register-form.tsx index 968424c79..ba2c13c84 100644 --- a/apps/login/src/components/register-form.tsx +++ b/apps/login/src/components/register-form.tsx @@ -46,7 +46,7 @@ export function RegisterForm({ idpCount = 0, }: Props) { const { register, handleSubmit, formState } = useForm({ - mode: "onBlur", + mode: "onChange", defaultValues: { email: email ?? "", firstName: firstname ?? "", diff --git a/apps/login/src/components/register-passkey.tsx b/apps/login/src/components/register-passkey.tsx index c583498bd..1a619c51f 100644 --- a/apps/login/src/components/register-passkey.tsx +++ b/apps/login/src/components/register-passkey.tsx @@ -25,7 +25,7 @@ type Props = { export function RegisterPasskey({ sessionId, userId, isPrompt, organization, requestId, code, codeId }: Props) { const { handleSubmit, formState } = useForm({ - mode: "onBlur", + mode: "onChange", }); const [error, setError] = useState(""); diff --git a/apps/login/src/components/set-password-form.tsx b/apps/login/src/components/set-password-form.tsx index 3c6783fcd..593cab9ea 100644 --- a/apps/login/src/components/set-password-form.tsx +++ b/apps/login/src/components/set-password-form.tsx @@ -1,16 +1,7 @@ "use client"; -import { - lowerCaseValidator, - numberValidator, - symbolValidator, - upperCaseValidator, -} from "@/helpers/validators"; -import { - changePassword, - resetPassword, - sendPassword, -} from "@/lib/server/password"; +import { lowerCaseValidator, numberValidator, symbolValidator, upperCaseValidator } from "@/helpers/validators"; +import { changePassword, resetPassword, sendPassword } from "@/lib/server/password"; import { create } from "@zitadel/client"; import { ChecksSchema } from "@zitadel/proto/zitadel/session/v2/session_service_pb"; import { PasswordComplexitySettings } from "@zitadel/proto/zitadel/settings/v2/password_settings_pb"; @@ -54,7 +45,7 @@ export function SetPasswordForm({ codeRequired, }: Props) { const { register, handleSubmit, watch, formState } = useForm({ - mode: "onBlur", + mode: "onChange", defaultValues: { code: code ?? "", }, @@ -148,20 +139,12 @@ export function SetPasswordForm({ setLoading(false); }); - if ( - passwordResponse && - "error" in passwordResponse && - passwordResponse.error - ) { + if (passwordResponse && "error" in passwordResponse && passwordResponse.error) { setError(passwordResponse.error); return; } - if ( - passwordResponse && - "redirect" in passwordResponse && - passwordResponse.redirect - ) { + if (passwordResponse && "redirect" in passwordResponse && passwordResponse.redirect) { return router.push(passwordResponse.redirect); } @@ -173,9 +156,7 @@ export function SetPasswordForm({ const watchPassword = watch("password", ""); const watchConfirmPassword = watch("confirmPassword", ""); - const hasMinLength = - passwordComplexitySettings && - watchPassword?.length >= passwordComplexitySettings.minLength; + const hasMinLength = passwordComplexitySettings && watchPassword?.length >= passwordComplexitySettings.minLength; const hasSymbol = symbolValidator(watchPassword); const hasNumber = numberValidator(watchPassword); const hasUppercase = upperCaseValidator(watchPassword); @@ -271,17 +252,11 @@ export function SetPasswordForm({ diff --git a/apps/login/src/components/set-register-password-form.tsx b/apps/login/src/components/set-register-password-form.tsx index eedebc495..eb6ad0db3 100644 --- a/apps/login/src/components/set-register-password-form.tsx +++ b/apps/login/src/components/set-register-password-form.tsx @@ -1,11 +1,6 @@ "use client"; -import { - lowerCaseValidator, - numberValidator, - symbolValidator, - upperCaseValidator, -} from "@/helpers/validators"; +import { lowerCaseValidator, numberValidator, symbolValidator, upperCaseValidator } from "@/helpers/validators"; import { registerUser } from "@/lib/server/register"; import { PasswordComplexitySettings } from "@zitadel/proto/zitadel/settings/v2/password_settings_pb"; import { useRouter } from "next/navigation"; @@ -45,7 +40,7 @@ export function SetRegisterPasswordForm({ requestId, }: Props) { const { register, handleSubmit, watch, formState } = useForm({ - mode: "onBlur", + mode: "onChange", defaultValues: { email: email ?? "", firstname: firstname ?? "", @@ -93,9 +88,7 @@ export function SetRegisterPasswordForm({ const watchPassword = watch("password", ""); const watchConfirmPassword = watch("confirmPassword", ""); - const hasMinLength = - passwordComplexitySettings && - watchPassword?.length >= passwordComplexitySettings.minLength; + const hasMinLength = passwordComplexitySettings && watchPassword?.length >= passwordComplexitySettings.minLength; const hasSymbol = symbolValidator(watchPassword); const hasNumber = numberValidator(watchPassword); const hasUppercase = upperCaseValidator(watchPassword); @@ -155,17 +148,11 @@ export function SetRegisterPasswordForm({ diff --git a/apps/login/src/components/totp-register.tsx b/apps/login/src/components/totp-register.tsx index 80f0736e9..a84789b45 100644 --- a/apps/login/src/components/totp-register.tsx +++ b/apps/login/src/components/totp-register.tsx @@ -36,7 +36,7 @@ export function TotpRegister({ uri, loginName, sessionId, requestId, organizatio const router = useRouter(); const { register, handleSubmit, formState } = useForm({ - mode: "onBlur", + mode: "onChange", defaultValues: { code: "", }, diff --git a/apps/login/src/components/username-form.tsx b/apps/login/src/components/username-form.tsx index 78ae33ad4..89dd4c694 100644 --- a/apps/login/src/components/username-form.tsx +++ b/apps/login/src/components/username-form.tsx @@ -27,17 +27,9 @@ type Props = { allowRegister: boolean; }; -export function UsernameForm({ - loginName, - requestId, - organization, - suffix, - loginSettings, - submit, - allowRegister, -}: Props) { +export function UsernameForm({ loginName, requestId, organization, suffix, loginSettings, submit, allowRegister }: Props) { const { register, handleSubmit, formState } = useForm({ - mode: "onBlur", + mode: "onChange", defaultValues: { loginName: loginName ? loginName : "", }, @@ -87,10 +79,7 @@ export function UsernameForm({ }, []); let inputLabel = t("labels.loginname"); - if ( - loginSettings?.disableLoginWithEmail && - loginSettings?.disableLoginWithPhone - ) { + if (loginSettings?.disableLoginWithEmail && loginSettings?.disableLoginWithPhone) { inputLabel = t("labels.username"); } else if (loginSettings?.disableLoginWithEmail) { inputLabel = t("labels.usernameOrPhoneNumber"); diff --git a/apps/login/src/components/verify-form.tsx b/apps/login/src/components/verify-form.tsx index eac265924..171abbf09 100644 --- a/apps/login/src/components/verify-form.tsx +++ b/apps/login/src/components/verify-form.tsx @@ -25,18 +25,11 @@ type Props = { requestId?: string; }; -export function VerifyForm({ - userId, - loginName, - organization, - requestId, - code, - isInvite, -}: Props) { +export function VerifyForm({ userId, loginName, organization, requestId, code, isInvite }: Props) { const router = useRouter(); const { register, handleSubmit, formState } = useForm({ - mode: "onBlur", + mode: "onChange", defaultValues: { code: code ?? "", }, @@ -73,9 +66,7 @@ export function VerifyForm({ } const fcn = useCallback( - async function submitCodeAndContinue( - value: Inputs, - ): Promise { + async function submitCodeAndContinue(value: Inputs): Promise { setLoading(true); const response = await sendVerification({