keycloakify 6.8.8 → 6.8.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +23 -5
  2. package/package.json +4 -4
  3. package/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +23 -5
package/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl CHANGED
@@ -36,7 +36,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
36
36
  <#list fieldNames as fieldName>
37
37
  if(fieldName === "${fieldName}" ){
38
38
  <#attempt>
39
- return "${messagesPerField.printIfExists(fieldName,'1')}" ? x : undefined;
39
+ <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
40
+ return <#if messagesPerField.existsError('username', 'password')>x<#else>undefined</#if>;
41
+ <#else>
42
+ return <#if messagesPerField.existsError('${fieldName}')>x<#else>undefined</#if>;
43
+ </#if>
40
44
  <#recover>
41
45
  </#attempt>
42
46
  }
@@ -51,7 +55,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
51
55
  <#list fieldNames as fieldName>
52
56
  if(fieldName === "${fieldName}" ){
53
57
  <#attempt>
54
- return <#if messagesPerField.existsError('${fieldName}')>true<#else>false</#if>;
58
+ <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
59
+ return <#if messagesPerField.existsError('username', 'password')>true<#else>false</#if>;
60
+ <#else>
61
+ return <#if messagesPerField.existsError('${fieldName}')>true<#else>false</#if>;
62
+ </#if>
55
63
  <#recover>
56
64
  </#attempt>
57
65
  }
@@ -66,8 +74,14 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
66
74
  <#list fieldNames as fieldName>
67
75
  if(fieldName === "${fieldName}" ){
68
76
  <#attempt>
69
- <#if messagesPerField.existsError('${fieldName}')>
70
- return "${messagesPerField.get('${fieldName}')?no_esc}";
77
+ <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
78
+ <#if messagesPerField.existsError('username', 'password')>
79
+ return 'Invalid username or password.';
80
+ </#if>
81
+ <#else>
82
+ <#if messagesPerField.existsError('${fieldName}')>
83
+ return "${messagesPerField.get('${fieldName}')?no_esc}";
84
+ </#if>
71
85
  </#if>
72
86
  <#recover>
73
87
  </#attempt>
@@ -83,7 +97,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
83
97
  <#list fieldNames as fieldName>
84
98
  if(fieldName === "${fieldName}" ){
85
99
  <#attempt>
86
- return <#if messagesPerField.exists('${fieldName}')>true<#else>false</#if>;
100
+ <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
101
+ return <#if messagesPerField.exists('username', 'password')>true<#else>false</#if>
102
+ <#else>
103
+ return <#if messagesPerField.exists('${fieldName}')>true<#else>false</#if>;
104
+ </#if>
87
105
  <#recover>
88
106
  </#attempt>
89
107
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "keycloakify",
3
- "version": "6.8.8",
3
+ "version": "6.8.10",
4
4
  "description": "Keycloak theme generator for Reacts app",
5
5
  "repository": {
6
6
  "type": "git",
@@ -1293,16 +1293,16 @@
1293
1293
  "@octokit/rest": "^18.12.0",
1294
1294
  "cheerio": "^1.0.0-rc.5",
1295
1295
  "cli-select": "^1.1.2",
1296
- "evt": "^2.4.10",
1296
+ "evt": "^2.4.13",
1297
1297
  "memoizee": "^0.4.15",
1298
1298
  "minimal-polyfills": "^2.2.2",
1299
1299
  "minimist": "^1.2.6",
1300
1300
  "path-browserify": "^1.0.1",
1301
- "powerhooks": "^0.20.27",
1301
+ "powerhooks": "^0.20.32",
1302
1302
  "react-markdown": "^5.0.3",
1303
1303
  "rfc4648": "^1.5.2",
1304
1304
  "scripting-tools": "^0.19.13",
1305
- "tsafe": "^1.2.1",
1305
+ "tsafe": "^1.4.1",
1306
1306
  "tss-react": "4.4.1-rc.0",
1307
1307
  "zod": "^3.17.10"
1308
1308
  }
package/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl CHANGED
@@ -36,7 +36,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
36
36
  <#list fieldNames as fieldName>
37
37
  if(fieldName === "${fieldName}" ){
38
38
  <#attempt>
39
- return "${messagesPerField.printIfExists(fieldName,'1')}" ? x : undefined;
39
+ <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
40
+ return <#if messagesPerField.existsError('username', 'password')>x<#else>undefined</#if>;
41
+ <#else>
42
+ return <#if messagesPerField.existsError('${fieldName}')>x<#else>undefined</#if>;
43
+ </#if>
40
44
  <#recover>
41
45
  </#attempt>
42
46
  }
@@ -51,7 +55,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
51
55
  <#list fieldNames as fieldName>
52
56
  if(fieldName === "${fieldName}" ){
53
57
  <#attempt>
54
- return <#if messagesPerField.existsError('${fieldName}')>true<#else>false</#if>;
58
+ <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
59
+ return <#if messagesPerField.existsError('username', 'password')>true<#else>false</#if>;
60
+ <#else>
61
+ return <#if messagesPerField.existsError('${fieldName}')>true<#else>false</#if>;
62
+ </#if>
55
63
  <#recover>
56
64
  </#attempt>
57
65
  }
@@ -66,8 +74,14 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
66
74
  <#list fieldNames as fieldName>
67
75
  if(fieldName === "${fieldName}" ){
68
76
  <#attempt>
69
- <#if messagesPerField.existsError('${fieldName}')>
70
- return "${messagesPerField.get('${fieldName}')?no_esc}";
77
+ <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
78
+ <#if messagesPerField.existsError('username', 'password')>
79
+ return 'Invalid username or password.';
80
+ </#if>
81
+ <#else>
82
+ <#if messagesPerField.existsError('${fieldName}')>
83
+ return "${messagesPerField.get('${fieldName}')?no_esc}";
84
+ </#if>
71
85
  </#if>
72
86
  <#recover>
73
87
  </#attempt>
@@ -83,7 +97,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
83
97
  <#list fieldNames as fieldName>
84
98
  if(fieldName === "${fieldName}" ){
85
99
  <#attempt>
86
- return <#if messagesPerField.exists('${fieldName}')>true<#else>false</#if>;
100
+ <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
101
+ return <#if messagesPerField.exists('username', 'password')>true<#else>false</#if>
102
+ <#else>
103
+ return <#if messagesPerField.exists('${fieldName}')>true<#else>false</#if>;
104
+ </#if>
87
105
  <#recover>
88
106
  </#attempt>
89
107
  }