Drop compat with Keycloak prior to v12 #359
This commit is contained in:
Joseph Garrone
parent
a7a3ec711b
commit
00651c0c3c
@ -30,30 +30,19 @@
|
|||||||
<#list fieldNames as fieldName>
|
<#list fieldNames as fieldName>
|
||||||
if(fieldName === "${fieldName}" ){
|
if(fieldName === "${fieldName}" ){
|
||||||
|
|
||||||
<#-- 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') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
||||||
|
|
||||||
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
|
<#assign doExistErrorOnUsernameOrPassword = "">
|
||||||
<#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
|
||||||
|
|
||||||
<#assign doExistMessageForUsernameOrPassword = "">
|
<#attempt>
|
||||||
|
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
|
||||||
<#attempt>
|
<#recover>
|
||||||
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
|
<#assign doExistErrorOnUsernameOrPassword = true>
|
||||||
<#recover>
|
</#attempt>
|
||||||
<#assign doExistMessageForUsernameOrPassword = true>
|
|
||||||
</#attempt>
|
|
||||||
|
|
||||||
<#if !doExistMessageForUsernameOrPassword>
|
|
||||||
<#attempt>
|
|
||||||
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
|
|
||||||
<#recover>
|
|
||||||
<#assign doExistMessageForUsernameOrPassword = true>
|
|
||||||
</#attempt>
|
|
||||||
</#if>
|
|
||||||
|
|
||||||
return <#if doExistMessageForUsernameOrPassword>text<#else>undefined</#if>;
|
|
||||||
|
|
||||||
|
<#if doExistErrorOnUsernameOrPassword>
|
||||||
|
return text;
|
||||||
<#else>
|
<#else>
|
||||||
|
|
||||||
<#assign doExistMessageForField = "">
|
<#assign doExistMessageForField = "">
|
||||||
@ -70,49 +59,19 @@
|
|||||||
|
|
||||||
<#else>
|
<#else>
|
||||||
|
|
||||||
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
|
<#assign doExistMessageForField = "">
|
||||||
<#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
|
||||||
|
|
||||||
<#assign doExistErrorOnUsernameOrPassword = "">
|
<#attempt>
|
||||||
|
<#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
|
||||||
|
<#recover>
|
||||||
|
<#assign doExistMessageForField = true>
|
||||||
|
</#attempt>
|
||||||
|
|
||||||
<#attempt>
|
return <#if doExistMessageForField>text<#else>undefined</#if>;
|
||||||
<#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>
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
</#list>
|
</#list>
|
||||||
|
|
||||||
@ -128,72 +87,30 @@
|
|||||||
<#list fieldNames as fieldName>
|
<#list fieldNames as fieldName>
|
||||||
if(fieldName === "${fieldName}" ){
|
if(fieldName === "${fieldName}" ){
|
||||||
|
|
||||||
<#-- 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') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
||||||
|
|
||||||
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
|
<#assign doExistErrorOnUsernameOrPassword = "">
|
||||||
<#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
|
||||||
|
|
||||||
<#assign doExistMessageForUsernameOrPassword = "">
|
<#attempt>
|
||||||
|
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
|
||||||
|
<#recover>
|
||||||
|
<#assign doExistErrorOnUsernameOrPassword = true>
|
||||||
|
</#attempt>
|
||||||
|
|
||||||
<#attempt>
|
return <#if doExistErrorOnUsernameOrPassword>true<#else>false</#if>;
|
||||||
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
|
|
||||||
<#recover>
|
|
||||||
<#assign doExistMessageForUsernameOrPassword = true>
|
|
||||||
</#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>
|
|
||||||
|
|
||||||
<#else>
|
<#else>
|
||||||
|
|
||||||
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
|
<#assign doExistErrorMessageForField = "">
|
||||||
<#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
|
||||||
|
|
||||||
<#assign doExistErrorOnUsernameOrPassword = "">
|
<#attempt>
|
||||||
|
<#assign doExistErrorMessageForField = messagesPerField.existsError('${fieldName}')>
|
||||||
|
<#recover>
|
||||||
|
<#assign doExistErrorMessageForField = true>
|
||||||
|
</#attempt>
|
||||||
|
|
||||||
<#attempt>
|
return <#if doExistErrorMessageForField>true<#else>false</#if>;
|
||||||
<#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>
|
||||||
|
|
||||||
@ -214,88 +131,42 @@
|
|||||||
<#list fieldNames as fieldName>
|
<#list fieldNames as fieldName>
|
||||||
if(fieldName === "${fieldName}" ){
|
if(fieldName === "${fieldName}" ){
|
||||||
|
|
||||||
<#-- 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') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
||||||
|
|
||||||
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
|
<#assign doExistErrorOnUsernameOrPassword = "">
|
||||||
<#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
|
||||||
|
|
||||||
<#assign doExistMessageForUsernameOrPassword = "">
|
<#attempt>
|
||||||
|
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
|
||||||
|
<#recover>
|
||||||
|
<#assign doExistErrorOnUsernameOrPassword = true>
|
||||||
|
</#attempt>
|
||||||
|
|
||||||
|
<#if doExistErrorOnUsernameOrPassword>
|
||||||
|
|
||||||
<#attempt>
|
<#attempt>
|
||||||
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
|
return "${kcSanitize(msg('invalidUserMessage'))?no_esc}";
|
||||||
<#recover>
|
<#recover>
|
||||||
<#assign doExistMessageForUsernameOrPassword = true>
|
return "Invalid username or password.";
|
||||||
</#attempt>
|
</#attempt>
|
||||||
|
|
||||||
<#if !doExistMessageForUsernameOrPassword>
|
|
||||||
<#attempt>
|
|
||||||
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
|
|
||||||
<#recover>
|
|
||||||
<#assign doExistMessageForUsernameOrPassword = true>
|
|
||||||
</#attempt>
|
|
||||||
</#if>
|
|
||||||
|
|
||||||
<#if !doExistMessageForUsernameOrPassword>
|
|
||||||
return "";
|
|
||||||
<#else>
|
|
||||||
<#attempt>
|
|
||||||
return "${kcSanitize(msg('invalidUserMessage'))?no_esc}";
|
|
||||||
<#recover>
|
|
||||||
return "Invalid username or password.";
|
|
||||||
</#attempt>
|
|
||||||
</#if>
|
|
||||||
|
|
||||||
<#else>
|
<#else>
|
||||||
|
|
||||||
<#attempt>
|
<#attempt>
|
||||||
return "${messagesPerField.get('${fieldName}')?no_esc}";
|
return "${messagesPerField.get('${fieldName}')?no_esc}";
|
||||||
<#recover>
|
<#recover>
|
||||||
return "invalid field";
|
return "";
|
||||||
</#attempt>
|
</#attempt>
|
||||||
|
|
||||||
</#if>
|
</#if>
|
||||||
|
|
||||||
<#else>
|
<#else>
|
||||||
|
|
||||||
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
|
<#attempt>
|
||||||
<#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
return "${messagesPerField.get('${fieldName}')?no_esc}";
|
||||||
|
<#recover>
|
||||||
<#assign doExistErrorOnUsernameOrPassword = "">
|
return "invalid field";
|
||||||
|
</#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>
|
||||||
|
|
||||||
@ -315,72 +186,30 @@
|
|||||||
<#list fieldNames as fieldName>
|
<#list fieldNames as fieldName>
|
||||||
if(fieldName === "${fieldName}" ){
|
if(fieldName === "${fieldName}" ){
|
||||||
|
|
||||||
<#-- 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') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
||||||
|
|
||||||
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
|
<#assign doExistErrorOnUsernameOrPassword = "">
|
||||||
<#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
|
||||||
|
|
||||||
<#assign doExistMessageForUsernameOrPassword = "">
|
<#attempt>
|
||||||
|
<#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
|
||||||
|
<#recover>
|
||||||
|
<#assign doExistErrorOnUsernameOrPassword = true>
|
||||||
|
</#attempt>
|
||||||
|
|
||||||
<#attempt>
|
return <#if doExistErrorOnUsernameOrPassword>true<#else>false</#if>;
|
||||||
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
|
|
||||||
<#recover>
|
|
||||||
<#assign doExistMessageForUsernameOrPassword = true>
|
|
||||||
</#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>
|
|
||||||
|
|
||||||
<#else>
|
<#else>
|
||||||
|
|
||||||
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
|
<#assign doExistErrorMessageForField = "">
|
||||||
<#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
|
|
||||||
|
|
||||||
<#assign doExistErrorOnUsernameOrPassword = "">
|
<#attempt>
|
||||||
|
<#assign doExistErrorMessageForField = messagesPerField.exists('${fieldName}')>
|
||||||
|
<#recover>
|
||||||
|
<#assign doExistErrorMessageForField = true>
|
||||||
|
</#attempt>
|
||||||
|
|
||||||
<#attempt>
|
return <#if doExistErrorMessageForField>true<#else>false</#if>;
|
||||||
<#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>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user