diff --git a/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl b/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl index fa1b112b..efbb76b7 100644 --- a/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +++ b/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl @@ -34,7 +34,7 @@ <#if !messagesPerField.existsError??> <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'> <#assign doExistMessageForUsernameOrPassword = ""> @@ -71,7 +71,7 @@ <#else> <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'> <#assign doExistErrorOnUsernameOrPassword = ""> @@ -132,7 +132,7 @@ <#if !messagesPerField.existsError??> <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'> <#assign doExistMessageForUsernameOrPassword = ""> @@ -169,7 +169,7 @@ <#else> <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'> <#assign doExistErrorOnUsernameOrPassword = ""> @@ -218,7 +218,7 @@ <#if !messagesPerField.existsError??> <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'> <#assign doExistMessageForUsernameOrPassword = ""> @@ -259,7 +259,7 @@ <#else> <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'> <#assign doExistErrorOnUsernameOrPassword = ""> @@ -319,7 +319,7 @@ <#if !messagesPerField.existsError??> <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'> <#assign doExistMessageForUsernameOrPassword = ""> @@ -356,7 +356,7 @@ <#else> <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'> <#assign doExistErrorOnUsernameOrPassword = ""> diff --git a/src/login/lib/useFormValidation.tsx b/src/login/lib/useFormValidation.tsx index cc2092e2..fa010ef4 100644 --- a/src/login/lib/useFormValidation.tsx +++ b/src/login/lib/useFormValidation.tsx @@ -25,16 +25,7 @@ export function useFormValidation(params: { passwordValidators?: Validators; i18n: I18n; }) { - const { - kcContext, - passwordValidators = { - "length": { - "ignore.empty.value": true, - "min": "4" - } - }, - i18n - } = params; + const { kcContext, passwordValidators = {}, i18n } = params; const attributesWithPassword = useMemo( () => @@ -211,7 +202,7 @@ function useGetErrors(params: { const { value: defaultValue, validators } = attributes.find(attribute => attribute.name === name)!; block: { - if (defaultValue !== value) { + if ((defaultValue ?? "") !== value) { break block; }