This commit is contained in:
garronej
2023-06-27 17:51:59 +02:00
parent 90d765d7f6
commit de2efe0c01

View File

@ -26,64 +26,34 @@
<#if !messagesPerField?? || !(messagesPerField?is_hash)> <#if !messagesPerField?? || !(messagesPerField?is_hash)>
throw new Error("You're not supposed to use messagesPerField.printIfExists in this page"); throw new Error("You're not supposed to use messagesPerField.printIfExists in this page");
</#if> <#else>
<#list fieldNames as fieldName>
if(fieldName === "${fieldName}" ){
<#list fieldNames as fieldName> <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
if(fieldName === "${fieldName}" ){ <#if !messagesPerField.existsError??>
<#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
<#if !messagesPerField.existsError??> <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#assign doExistMessageForUsernameOrPassword = "">
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#assign doExistMessageForUsernameOrPassword = "">
<#attempt>
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
<#recover>
<#assign doExistMessageForUsernameOrPassword = true>
</#attempt>
<#if !doExistMessageForUsernameOrPassword>
<#attempt> <#attempt>
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
<#recover> <#recover>
<#assign doExistMessageForUsernameOrPassword = true> <#assign doExistMessageForUsernameOrPassword = true>
</#attempt> </#attempt>
</#if>
return <#if doExistMessageForUsernameOrPassword>text<#else>undefined</#if>; <#if !doExistMessageForUsernameOrPassword>
<#attempt>
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
<#recover>
<#assign doExistMessageForUsernameOrPassword = true>
</#attempt>
</#if>
<#else> return <#if doExistMessageForUsernameOrPassword>text<#else>undefined</#if>;
<#assign doExistMessageForField = "">
<#attempt>
<#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
<#recover>
<#assign doExistMessageForField = true>
</#attempt>
return <#if doExistMessageForField>text<#else>undefined</#if>;
</#if>
<#else>
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#assign doExistErrorOnUsernameOrPassword = "">
<#attempt>
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
<#recover>
<#assign doExistErrorOnUsernameOrPassword = true>
</#attempt>
<#if doExistErrorOnUsernameOrPassword>
return text;
<#else> <#else>
<#assign doExistMessageForField = ""> <#assign doExistMessageForField = "">
@ -100,107 +70,139 @@
<#else> <#else>
<#assign doExistMessageForField = ""> <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#attempt> <#assign doExistErrorOnUsernameOrPassword = "">
<#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
<#recover>
<#assign doExistMessageForField = true>
</#attempt>
return <#if doExistMessageForField>text<#else>undefined</#if>; <#attempt>
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
<#recover>
<#assign doExistErrorOnUsernameOrPassword = true>
</#attempt>
<#if doExistErrorOnUsernameOrPassword>
return text;
<#else>
<#assign doExistMessageForField = "">
<#attempt>
<#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
<#recover>
<#assign doExistMessageForField = true>
</#attempt>
return <#if doExistMessageForField>text<#else>undefined</#if>;
</#if>
<#else>
<#assign doExistMessageForField = "">
<#attempt>
<#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
<#recover>
<#assign doExistMessageForField = true>
</#attempt>
return <#if doExistMessageForField>text<#else>undefined</#if>;
</#if>
</#if> </#if>
</#if> }
</#list>
} throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
</#list> </#if>
throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
}, },
"existsError": function (fieldName) { "existsError": function (fieldName) {
<#if !messagesPerField?? || !(messagesPerField?is_hash)> <#if !messagesPerField?? || !(messagesPerField?is_hash)>
throw new Error("You're not supposed to use messagesPerField.printIfExists in this page"); throw new Error("You're not supposed to use messagesPerField.printIfExists in this page");
</#if> <#else>
<#list fieldNames as fieldName>
if(fieldName === "${fieldName}" ){
<#list fieldNames as fieldName> <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
if(fieldName === "${fieldName}" ){ <#if !messagesPerField.existsError??>
<#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
<#if !messagesPerField.existsError??> <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#assign doExistMessageForUsernameOrPassword = "">
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#assign doExistMessageForUsernameOrPassword = "">
<#attempt>
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
<#recover>
<#assign doExistMessageForUsernameOrPassword = true>
</#attempt>
<#if !doExistMessageForUsernameOrPassword>
<#attempt> <#attempt>
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
<#recover> <#recover>
<#assign doExistMessageForUsernameOrPassword = true> <#assign doExistMessageForUsernameOrPassword = true>
</#attempt> </#attempt>
<#if !doExistMessageForUsernameOrPassword>
<#attempt>
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
<#recover>
<#assign doExistMessageForUsernameOrPassword = true>
</#attempt>
</#if>
return <#if doExistMessageForUsernameOrPassword>true<#else>false</#if>;
<#else>
<#assign doExistMessageForField = "">
<#attempt>
<#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
<#recover>
<#assign doExistMessageForField = true>
</#attempt>
return <#if doExistMessageForField>true<#else>false</#if>;
</#if> </#if>
return <#if doExistMessageForUsernameOrPassword>true<#else>false</#if>;
<#else> <#else>
<#assign doExistMessageForField = ""> <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#attempt> <#assign doExistErrorOnUsernameOrPassword = "">
<#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
<#recover>
<#assign doExistMessageForField = true>
</#attempt>
return <#if doExistMessageForField>true<#else>false</#if>; <#attempt>
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
<#recover>
<#assign doExistErrorOnUsernameOrPassword = true>
</#attempt>
return <#if doExistErrorOnUsernameOrPassword>true<#else>false</#if>;
<#else>
<#assign doExistErrorMessageForField = "">
<#attempt>
<#assign doExistErrorMessageForField = messagesPerField.existsError('${fieldName}')>
<#recover>
<#assign doExistErrorMessageForField = true>
</#attempt>
return <#if doExistErrorMessageForField>true<#else>false</#if>;
</#if>
</#if> </#if>
<#else> }
</#list>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#assign doExistErrorOnUsernameOrPassword = ""> </#if>
<#attempt>
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
<#recover>
<#assign doExistErrorOnUsernameOrPassword = true>
</#attempt>
return <#if doExistErrorOnUsernameOrPassword>true<#else>false</#if>;
<#else>
<#assign doExistErrorMessageForField = "">
<#attempt>
<#assign doExistErrorMessageForField = messagesPerField.existsError('${fieldName}')>
<#recover>
<#assign doExistErrorMessageForField = true>
</#attempt>
return <#if doExistErrorMessageForField>true<#else>false</#if>;
</#if>
</#if>
}
</#list>
throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
}, },
"get": function (fieldName) { "get": function (fieldName) {
@ -208,184 +210,185 @@
<#if !messagesPerField?? || !(messagesPerField?is_hash)> <#if !messagesPerField?? || !(messagesPerField?is_hash)>
throw new Error("You're not supposed to use messagesPerField.get in this page"); throw new Error("You're not supposed to use messagesPerField.get in this page");
</#if> <#else>
<#list fieldNames as fieldName>
if(fieldName === "${fieldName}" ){
<#list fieldNames as fieldName> <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
if(fieldName === "${fieldName}" ){ <#if !messagesPerField.existsError??>
<#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
<#if !messagesPerField.existsError??> <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#assign doExistMessageForUsernameOrPassword = "">
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#assign doExistMessageForUsernameOrPassword = "">
<#attempt>
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
<#recover>
<#assign doExistMessageForUsernameOrPassword = true>
</#attempt>
<#if !doExistMessageForUsernameOrPassword>
<#attempt> <#attempt>
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
<#recover> <#recover>
<#assign doExistMessageForUsernameOrPassword = true> <#assign doExistMessageForUsernameOrPassword = true>
</#attempt> </#attempt>
</#if>
<#if !doExistMessageForUsernameOrPassword> <#if !doExistMessageForUsernameOrPassword>
return ""; <#attempt>
<#else> <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
<#attempt> <#recover>
return "${kcSanitize(msg('invalidUserMessage'))?no_esc}"; <#assign doExistMessageForUsernameOrPassword = true>
<#recover> </#attempt>
return "Invalid username or password."; </#if>
</#attempt>
</#if>
<#else> <#if !doExistMessageForUsernameOrPassword>
return "";
<#attempt> <#else>
return "${messagesPerField.get('${fieldName}')?no_esc}"; <#attempt>
<#recover> return "${kcSanitize(msg('invalidUserMessage'))?no_esc}";
return "invalid field"; <#recover>
</#attempt> return "Invalid username or password.";
</#attempt>
</#if> </#if>
<#else>
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#assign doExistErrorOnUsernameOrPassword = "">
<#attempt>
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
<#recover>
<#assign doExistErrorOnUsernameOrPassword = true>
</#attempt>
<#if doExistErrorOnUsernameOrPassword>
<#attempt>
return "${kcSanitize(msg('invalidUserMessage'))?no_esc}";
<#recover>
return "Invalid username or password.";
</#attempt>
<#else> <#else>
<#attempt> <#attempt>
return "${messagesPerField.get('${fieldName}')?no_esc}"; return "${messagesPerField.get('${fieldName}')?no_esc}";
<#recover> <#recover>
return ""; return "invalid field";
</#attempt> </#attempt>
</#if> </#if>
<#else> <#else>
<#attempt> <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
return "${messagesPerField.get('${fieldName}')?no_esc}"; <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#recover>
return "invalid field"; <#assign doExistErrorOnUsernameOrPassword = "">
</#attempt>
<#attempt>
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
<#recover>
<#assign doExistErrorOnUsernameOrPassword = true>
</#attempt>
<#if doExistErrorOnUsernameOrPassword>
<#attempt>
return "${kcSanitize(msg('invalidUserMessage'))?no_esc}";
<#recover>
return "Invalid username or password.";
</#attempt>
<#else>
<#attempt>
return "${messagesPerField.get('${fieldName}')?no_esc}";
<#recover>
return "";
</#attempt>
</#if>
<#else>
<#attempt>
return "${messagesPerField.get('${fieldName}')?no_esc}";
<#recover>
return "invalid field";
</#attempt>
</#if>
</#if> </#if>
</#if> }
</#list>
} throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
</#list>
throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated"); </#if>
}, },
"exists": function (fieldName) { "exists": function (fieldName) {
<#if !messagesPerField?? || !(messagesPerField?is_hash)> <#if !messagesPerField?? || !(messagesPerField?is_hash)>
throw new Error("You're not supposed to use messagesPerField.exists in this page"); throw new Error("You're not supposed to use messagesPerField.exists in this page");
</#if> <#else>
<#list fieldNames as fieldName>
if(fieldName === "${fieldName}" ){
<#list fieldNames as fieldName> <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
if(fieldName === "${fieldName}" ){ <#if !messagesPerField.existsError??>
<#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
<#if !messagesPerField.existsError??> <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> <#assign doExistMessageForUsernameOrPassword = "">
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#assign doExistMessageForUsernameOrPassword = "">
<#attempt>
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
<#recover>
<#assign doExistMessageForUsernameOrPassword = true>
</#attempt>
<#if !doExistMessageForUsernameOrPassword>
<#attempt> <#attempt>
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
<#recover> <#recover>
<#assign doExistMessageForUsernameOrPassword = true> <#assign doExistMessageForUsernameOrPassword = true>
</#attempt> </#attempt>
<#if !doExistMessageForUsernameOrPassword>
<#attempt>
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
<#recover>
<#assign doExistMessageForUsernameOrPassword = true>
</#attempt>
</#if>
return <#if doExistMessageForUsernameOrPassword>true<#else>false</#if>;
<#else>
<#assign doExistMessageForField = "">
<#attempt>
<#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
<#recover>
<#assign doExistMessageForField = true>
</#attempt>
return <#if doExistMessageForField>true<#else>false</#if>;
</#if> </#if>
return <#if doExistMessageForUsernameOrPassword>true<#else>false</#if>;
<#else> <#else>
<#assign doExistMessageForField = ""> <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
<#attempt> <#assign doExistErrorOnUsernameOrPassword = "">
<#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
<#recover>
<#assign doExistMessageForField = true>
</#attempt>
return <#if doExistMessageForField>true<#else>false</#if>; <#attempt>
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
<#recover>
<#assign doExistErrorOnUsernameOrPassword = true>
</#attempt>
return <#if doExistErrorOnUsernameOrPassword>true<#else>false</#if>;
<#else>
<#assign doExistErrorMessageForField = "">
<#attempt>
<#assign doExistErrorMessageForField = messagesPerField.exists('${fieldName}')>
<#recover>
<#assign doExistErrorMessageForField = true>
</#attempt>
return <#if doExistErrorMessageForField>true<#else>false</#if>;
</#if>
</#if> </#if>
<#else> }
</#list>
<#-- https://github.com/keycloakify/keycloakify/pull/218 --> throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> </#if>
<#assign doExistErrorOnUsernameOrPassword = "">
<#attempt>
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
<#recover>
<#assign doExistErrorOnUsernameOrPassword = true>
</#attempt>
return <#if doExistErrorOnUsernameOrPassword>true<#else>false</#if>;
<#else>
<#assign doExistErrorMessageForField = "">
<#attempt>
<#assign doExistErrorMessageForField = messagesPerField.exists('${fieldName}')>
<#recover>
<#assign doExistErrorMessageForField = true>
</#attempt>
return <#if doExistErrorMessageForField>true<#else>false</#if>;
</#if>
</#if>
}
</#list>
throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
} }
}; };