From de2efe0c01e3d544dd80399fa428c667e6e2bf4e Mon Sep 17 00:00:00 2001 From: garronej Date: Tue, 27 Jun 2023 17:51:59 +0200 Subject: [PATCH] #369 --- ..._object_to_js_code_declaring_an_object.ftl | 491 +++++++++--------- 1 file changed, 247 insertions(+), 244 deletions(-) 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 e6cdac0c..fa1b112b 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 @@ -26,64 +26,34 @@ <#if !messagesPerField?? || !(messagesPerField?is_hash)> throw new Error("You're not supposed to use messagesPerField.printIfExists in this page"); - + <#else> + <#list fieldNames as fieldName> + if(fieldName === "${fieldName}" ){ - <#list fieldNames as fieldName> - if(fieldName === "${fieldName}" ){ + <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> + <#if !messagesPerField.existsError??> - <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> - <#if !messagesPerField.existsError??> + <#-- https://github.com/keycloakify/keycloakify/pull/218 --> + <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> - <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#assign doExistMessageForUsernameOrPassword = ""> - <#assign doExistMessageForUsernameOrPassword = ""> - - <#attempt> - <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')> - <#recover> - <#assign doExistMessageForUsernameOrPassword = true> - - - <#if !doExistMessageForUsernameOrPassword> <#attempt> - <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> + <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')> <#recover> <#assign doExistMessageForUsernameOrPassword = true> - - return <#if doExistMessageForUsernameOrPassword>text<#else>undefined; + <#if !doExistMessageForUsernameOrPassword> + <#attempt> + <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> + <#recover> + <#assign doExistMessageForUsernameOrPassword = true> + + - <#else> + return <#if doExistMessageForUsernameOrPassword>text<#else>undefined; - <#assign doExistMessageForField = ""> - - <#attempt> - <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')> - <#recover> - <#assign doExistMessageForField = true> - - - return <#if doExistMessageForField>text<#else>undefined; - - - - <#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> - - - <#if doExistErrorOnUsernameOrPassword> - return text; <#else> <#assign doExistMessageForField = ""> @@ -100,107 +70,139 @@ <#else> - <#assign doExistMessageForField = ""> + <#-- https://github.com/keycloakify/keycloakify/pull/218 --> + <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> - <#attempt> - <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')> - <#recover> - <#assign doExistMessageForField = true> - + <#assign doExistErrorOnUsernameOrPassword = ""> - return <#if doExistMessageForField>text<#else>undefined; + <#attempt> + <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')> + <#recover> + <#assign doExistErrorOnUsernameOrPassword = true> + + + <#if doExistErrorOnUsernameOrPassword> + return text; + <#else> + + <#assign doExistMessageForField = ""> + + <#attempt> + <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')> + <#recover> + <#assign doExistMessageForField = true> + + + return <#if doExistMessageForField>text<#else>undefined; + + + + <#else> + + <#assign doExistMessageForField = ""> + + <#attempt> + <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')> + <#recover> + <#assign doExistMessageForField = true> + + + return <#if doExistMessageForField>text<#else>undefined; + + - + } + - } - + throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated"); + - throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated"); }, "existsError": function (fieldName) { <#if !messagesPerField?? || !(messagesPerField?is_hash)> throw new Error("You're not supposed to use messagesPerField.printIfExists in this page"); - + <#else> + <#list fieldNames as fieldName> + if(fieldName === "${fieldName}" ){ - <#list fieldNames as fieldName> - if(fieldName === "${fieldName}" ){ + <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> + <#if !messagesPerField.existsError??> - <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> - <#if !messagesPerField.existsError??> + <#-- https://github.com/keycloakify/keycloakify/pull/218 --> + <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> - <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#assign doExistMessageForUsernameOrPassword = ""> - <#assign doExistMessageForUsernameOrPassword = ""> - - <#attempt> - <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')> - <#recover> - <#assign doExistMessageForUsernameOrPassword = true> - - - <#if !doExistMessageForUsernameOrPassword> <#attempt> - <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> + <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')> <#recover> <#assign doExistMessageForUsernameOrPassword = true> + + <#if !doExistMessageForUsernameOrPassword> + <#attempt> + <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> + <#recover> + <#assign doExistMessageForUsernameOrPassword = true> + + + + return <#if doExistMessageForUsernameOrPassword>true<#else>false; + + <#else> + + <#assign doExistMessageForField = ""> + + <#attempt> + <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')> + <#recover> + <#assign doExistMessageForField = true> + + + return <#if doExistMessageForField>true<#else>false; + - return <#if doExistMessageForUsernameOrPassword>true<#else>false; - <#else> - <#assign doExistMessageForField = ""> + <#-- https://github.com/keycloakify/keycloakify/pull/218 --> + <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> - <#attempt> - <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')> - <#recover> - <#assign doExistMessageForField = true> - + <#assign doExistErrorOnUsernameOrPassword = ""> - return <#if doExistMessageForField>true<#else>false; + <#attempt> + <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')> + <#recover> + <#assign doExistErrorOnUsernameOrPassword = true> + + + return <#if doExistErrorOnUsernameOrPassword>true<#else>false; + + <#else> + + <#assign doExistErrorMessageForField = ""> + + <#attempt> + <#assign doExistErrorMessageForField = messagesPerField.existsError('${fieldName}')> + <#recover> + <#assign doExistErrorMessageForField = true> + + + return <#if doExistErrorMessageForField>true<#else>false; + + - <#else> + } + - <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated"); - <#assign doExistErrorOnUsernameOrPassword = ""> - - <#attempt> - <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')> - <#recover> - <#assign doExistErrorOnUsernameOrPassword = true> - - - return <#if doExistErrorOnUsernameOrPassword>true<#else>false; - - <#else> - - <#assign doExistErrorMessageForField = ""> - - <#attempt> - <#assign doExistErrorMessageForField = messagesPerField.existsError('${fieldName}')> - <#recover> - <#assign doExistErrorMessageForField = true> - - - return <#if doExistErrorMessageForField>true<#else>false; - - - - - - } - - - throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated"); + }, "get": function (fieldName) { @@ -208,184 +210,185 @@ <#if !messagesPerField?? || !(messagesPerField?is_hash)> throw new Error("You're not supposed to use messagesPerField.get in this page"); - + <#else> + <#list fieldNames as fieldName> + if(fieldName === "${fieldName}" ){ - <#list fieldNames as fieldName> - if(fieldName === "${fieldName}" ){ + <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> + <#if !messagesPerField.existsError??> - <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> - <#if !messagesPerField.existsError??> + <#-- https://github.com/keycloakify/keycloakify/pull/218 --> + <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> - <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#assign doExistMessageForUsernameOrPassword = ""> - <#assign doExistMessageForUsernameOrPassword = ""> - - <#attempt> - <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')> - <#recover> - <#assign doExistMessageForUsernameOrPassword = true> - - - <#if !doExistMessageForUsernameOrPassword> <#attempt> - <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> + <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')> <#recover> <#assign doExistMessageForUsernameOrPassword = true> - - <#if !doExistMessageForUsernameOrPassword> - return ""; - <#else> - <#attempt> - return "${kcSanitize(msg('invalidUserMessage'))?no_esc}"; - <#recover> - return "Invalid username or password."; - - + <#if !doExistMessageForUsernameOrPassword> + <#attempt> + <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> + <#recover> + <#assign doExistMessageForUsernameOrPassword = true> + + - <#else> - - <#attempt> - return "${messagesPerField.get('${fieldName}')?no_esc}"; - <#recover> - return "invalid field"; - - - - - <#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> - - - <#if doExistErrorOnUsernameOrPassword> - - <#attempt> - return "${kcSanitize(msg('invalidUserMessage'))?no_esc}"; - <#recover> - return "Invalid username or password."; - + <#if !doExistMessageForUsernameOrPassword> + return ""; + <#else> + <#attempt> + return "${kcSanitize(msg('invalidUserMessage'))?no_esc}"; + <#recover> + return "Invalid username or password."; + + <#else> <#attempt> return "${messagesPerField.get('${fieldName}')?no_esc}"; <#recover> - return ""; + return "invalid field"; <#else> - <#attempt> - return "${messagesPerField.get('${fieldName}')?no_esc}"; - <#recover> - return "invalid field"; - + <#-- 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> + + + <#if doExistErrorOnUsernameOrPassword> + + <#attempt> + return "${kcSanitize(msg('invalidUserMessage'))?no_esc}"; + <#recover> + return "Invalid username or password."; + + + <#else> + + <#attempt> + return "${messagesPerField.get('${fieldName}')?no_esc}"; + <#recover> + return ""; + + + + + <#else> + + <#attempt> + return "${messagesPerField.get('${fieldName}')?no_esc}"; + <#recover> + return "invalid field"; + + + - + } + - } - + throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated"); - throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated"); + }, "exists": function (fieldName) { <#if !messagesPerField?? || !(messagesPerField?is_hash)> throw new Error("You're not supposed to use messagesPerField.exists in this page"); - + <#else> + <#list fieldNames as fieldName> + if(fieldName === "${fieldName}" ){ - <#list fieldNames as fieldName> - if(fieldName === "${fieldName}" ){ + <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> + <#if !messagesPerField.existsError??> - <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 --> - <#if !messagesPerField.existsError??> + <#-- https://github.com/keycloakify/keycloakify/pull/218 --> + <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> - <#-- https://github.com/keycloakify/keycloakify/pull/218 --> - <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> + <#assign doExistMessageForUsernameOrPassword = ""> - <#assign doExistMessageForUsernameOrPassword = ""> - - <#attempt> - <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')> - <#recover> - <#assign doExistMessageForUsernameOrPassword = true> - - - <#if !doExistMessageForUsernameOrPassword> <#attempt> - <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> + <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')> <#recover> <#assign doExistMessageForUsernameOrPassword = true> + + <#if !doExistMessageForUsernameOrPassword> + <#attempt> + <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')> + <#recover> + <#assign doExistMessageForUsernameOrPassword = true> + + + + return <#if doExistMessageForUsernameOrPassword>true<#else>false; + + <#else> + + <#assign doExistMessageForField = ""> + + <#attempt> + <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')> + <#recover> + <#assign doExistMessageForField = true> + + + return <#if doExistMessageForField>true<#else>false; + - return <#if doExistMessageForUsernameOrPassword>true<#else>false; - <#else> - <#assign doExistMessageForField = ""> + <#-- https://github.com/keycloakify/keycloakify/pull/218 --> + <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'> - <#attempt> - <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')> - <#recover> - <#assign doExistMessageForField = true> - + <#assign doExistErrorOnUsernameOrPassword = ""> - return <#if doExistMessageForField>true<#else>false; + <#attempt> + <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')> + <#recover> + <#assign doExistErrorOnUsernameOrPassword = true> + + + return <#if doExistErrorOnUsernameOrPassword>true<#else>false; + + <#else> + + <#assign doExistErrorMessageForField = ""> + + <#attempt> + <#assign doExistErrorMessageForField = messagesPerField.exists('${fieldName}')> + <#recover> + <#assign doExistErrorMessageForField = true> + + + return <#if doExistErrorMessageForField>true<#else>false; + + - <#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> - - - return <#if doExistErrorOnUsernameOrPassword>true<#else>false; - - <#else> - - <#assign doExistErrorMessageForField = ""> - - <#attempt> - <#assign doExistErrorMessageForField = messagesPerField.exists('${fieldName}')> - <#recover> - <#assign doExistErrorMessageForField = true> - - - return <#if doExistErrorMessageForField>true<#else>false; - - - - - - } - - - throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated"); + throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated"); + } };