agtic/keycloak_theme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#377

Browse Source
This commit is contained in:
garronej
2023-07-07 17:02:18 +02:00
parent 0301003ccf
commit e6cebdd546
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
View File

@ -34,7 +34,7 @@
<#if !messagesPerField.existsError??> <#if !messagesPerField.existsError??>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#-- 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 = ""> <#assign doExistMessageForUsernameOrPassword = "">
@ -71,7 +71,7 @@
<#else> <#else>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#-- 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 = ""> <#assign doExistErrorOnUsernameOrPassword = "">
@ -132,7 +132,7 @@
<#if !messagesPerField.existsError??> <#if !messagesPerField.existsError??>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#-- 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 = ""> <#assign doExistMessageForUsernameOrPassword = "">
@ -169,7 +169,7 @@
<#else> <#else>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#-- 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 = ""> <#assign doExistErrorOnUsernameOrPassword = "">
@ -218,7 +218,7 @@
<#if !messagesPerField.existsError??> <#if !messagesPerField.existsError??>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#-- 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 = ""> <#assign doExistMessageForUsernameOrPassword = "">
@ -259,7 +259,7 @@
<#else> <#else>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#-- 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 = ""> <#assign doExistErrorOnUsernameOrPassword = "">
@ -319,7 +319,7 @@
<#if !messagesPerField.existsError??> <#if !messagesPerField.existsError??>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#-- 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 = ""> <#assign doExistMessageForUsernameOrPassword = "">
@ -356,7 +356,7 @@
<#else> <#else>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#-- 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 = ""> <#assign doExistErrorOnUsernameOrPassword = "">

13
src/login/lib/useFormValidation.tsx
View File

@ -25,16 +25,7 @@ export function useFormValidation(params: {
passwordValidators?: Validators; passwordValidators?: Validators;
i18n: I18n; i18n: I18n;
}) { }) {
const { const { kcContext, passwordValidators = {}, i18n } = params;
kcContext,
passwordValidators = {
"length": {
"ignore.empty.value": true,
"min": "4"
}
},
i18n
} = params;
const attributesWithPassword = useMemo( const attributesWithPassword = useMemo(
() => () =>
@ -211,7 +202,7 @@ function useGetErrors(params: {
const { value: defaultValue, validators } = attributes.find(attribute => attribute.name === name)!; const { value: defaultValue, validators } = attributes.find(attribute => attribute.name === name)!;
block: { block: {
if (defaultValue !== value) { if ((defaultValue ?? "") !== value) {
break block; break block;
} }