keycloakify 7.13.0 → 7.13.2-rc.0
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.
- package/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +4 -0
- package/bin/keycloakify/generateTheme/readFieldNameUsage.js +1 -1
- package/bin/keycloakify/generateTheme/readFieldNameUsage.js.map +1 -1
- package/package.json +1 -1
- package/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +4 -0
- package/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts +1 -1
|
@@ -34,6 +34,8 @@
|
|
|
34
34
|
<#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
|
|
35
35
|
<#if !messagesPerField.existsError??>
|
|
36
36
|
|
|
37
|
+
/* Consider updating to Keycloak v12 or newer */
|
|
38
|
+
|
|
37
39
|
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
|
|
38
40
|
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
|
|
39
41
|
|
|
@@ -42,6 +44,7 @@
|
|
|
42
44
|
<#attempt>
|
|
43
45
|
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
|
|
44
46
|
<#recover>
|
|
47
|
+
/* There was an FTL error calling messagesPerField.exists('username') */
|
|
45
48
|
<#assign doExistMessageForUsernameOrPassword = true>
|
|
46
49
|
</#attempt>
|
|
47
50
|
|
|
@@ -49,6 +52,7 @@
|
|
|
49
52
|
<#attempt>
|
|
50
53
|
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
|
|
51
54
|
<#recover>
|
|
55
|
+
/* There was an FTL error calling messagesPerField.exists('password') */
|
|
52
56
|
<#assign doExistMessageForUsernameOrPassword = true>
|
|
53
57
|
</#attempt>
|
|
54
58
|
</#if>
|
|
@@ -119,7 +119,7 @@ function readFieldNameUsage(params) {
|
|
|
119
119
|
if (!rawSourceFile.includes("messagesPerField")) {
|
|
120
120
|
continue;
|
|
121
121
|
}
|
|
122
|
-
fieldNames.push.apply(fieldNames, __spreadArray([], __read(Array.from(rawSourceFile.matchAll(/(?:(?:printIfExists)|(?:existsError)|(?:get)|(?:exists))\(["']([^"']+)["']/g), function (m) { return m[1]; })), false));
|
|
122
|
+
fieldNames.push.apply(fieldNames, __spreadArray([], __read(Array.from(rawSourceFile.matchAll(/(?:(?:printIfExists)|(?:existsError)|(?:get)|(?:exists))\(\s*["']([^"']+)["']/g), function (m) { return m[1]; })), false));
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
125
|
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readFieldNameUsage.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/readFieldNameUsage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,wEAAuE;AACvE,6BAAwC;AACxC,qCAAyB;AAEzB,yCAAwC;AAExC,SAAgB,kBAAkB,CAAC,MAIlC;;IACW,IAAA,qBAAqB,GAAiC,MAAM,sBAAvC,EAAE,eAAe,GAAgB,MAAM,gBAAtB,EAAE,SAAS,GAAK,MAAM,UAAX,CAAY;IAErE,IAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,4GAA4G;QAC5G,UAAU,CAAC,IAAI,OAAf,UAAU,EACH;YACC,QAAQ;YACR,WAAW;YACX,UAAU;YACV,OAAO;YACP,WAAW;YACX,UAAU;YACV,UAAU;YACV,kBAAkB;YAClB,MAAM;YACN,YAAY;YACZ,aAAa;YACb,cAAc;YACd,YAAY;YACZ,kBAAkB;YAClB,MAAM;YACN,cAAc;YACd,YAAY;YACZ,OAAO;YACP,yBAAyB;YACzB,YAAY;YACZ,gBAAgB;YAChB,mBAAmB;YACnB,WAAW;YACX,cAAc;YACd,YAAY;YACZ,OAAO;YACP,eAAe;YACf,yBAAyB;YACzB,YAAY;YACZ,WAAW;YACX,mBAAmB;YACnB,uBAAuB;YACvB,oBAAoB;SACvB,EACH;KACL;4BAEU,UAAU;;QAkBjB,IAAM,SAAS,GAAG,IAAA,aAAK,EAAC,UAAU,CAAC;aAC9B,MAAM,CAAC,UAAA,QAAQ,IAAI,OAAA,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAnC,CAAmC,CAAC;aACvD,GAAG,CAAC,UAAA,QAAQ,IAAI,OAAA,IAAA,WAAQ,EAAC,UAAU,EAAE,QAAQ,CAAC,EAA9B,CAA8B,CAAC,CAAC;;YAErD,KAAuB,IAAA,6BAAA,SAAA,SAAS,CAAA,CAAA,oCAAA,2DAAE;gBAA7B,IAAM,QAAQ,sBAAA;gBACf,IAAM,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAEjE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;oBAC7C,SAAS;iBACZ;gBAED,UAAU,CAAC,IAAI,OAAf,UAAU,2BACH,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"readFieldNameUsage.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/readFieldNameUsage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,wEAAuE;AACvE,6BAAwC;AACxC,qCAAyB;AAEzB,yCAAwC;AAExC,SAAgB,kBAAkB,CAAC,MAIlC;;IACW,IAAA,qBAAqB,GAAiC,MAAM,sBAAvC,EAAE,eAAe,GAAgB,MAAM,gBAAtB,EAAE,SAAS,GAAK,MAAM,UAAX,CAAY;IAErE,IAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,4GAA4G;QAC5G,UAAU,CAAC,IAAI,OAAf,UAAU,EACH;YACC,QAAQ;YACR,WAAW;YACX,UAAU;YACV,OAAO;YACP,WAAW;YACX,UAAU;YACV,UAAU;YACV,kBAAkB;YAClB,MAAM;YACN,YAAY;YACZ,aAAa;YACb,cAAc;YACd,YAAY;YACZ,kBAAkB;YAClB,MAAM;YACN,cAAc;YACd,YAAY;YACZ,OAAO;YACP,yBAAyB;YACzB,YAAY;YACZ,gBAAgB;YAChB,mBAAmB;YACnB,WAAW;YACX,cAAc;YACd,YAAY;YACZ,OAAO;YACP,eAAe;YACf,yBAAyB;YACzB,YAAY;YACZ,WAAW;YACX,mBAAmB;YACnB,uBAAuB;YACvB,oBAAoB;SACvB,EACH;KACL;4BAEU,UAAU;;QAkBjB,IAAM,SAAS,GAAG,IAAA,aAAK,EAAC,UAAU,CAAC;aAC9B,MAAM,CAAC,UAAA,QAAQ,IAAI,OAAA,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAnC,CAAmC,CAAC;aACvD,GAAG,CAAC,UAAA,QAAQ,IAAI,OAAA,IAAA,WAAQ,EAAC,UAAU,EAAE,QAAQ,CAAC,EAA9B,CAA8B,CAAC,CAAC;;YAErD,KAAuB,IAAA,6BAAA,SAAA,SAAS,CAAA,CAAA,oCAAA,2DAAE;gBAA7B,IAAM,QAAQ,sBAAA;gBACf,IAAM,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAEjE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;oBAC7C,SAAS;iBACZ;gBAED,UAAU,CAAC,IAAI,OAAf,UAAU,2BACH,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,gFAAgF,CAAC,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,CAAC,CAAC,EAAJ,CAAI,CAAC,WACpI;aACL;;;;;;;;;;;QAhCL,KAAyB,IAAA,KAAA,SACrB;YACI,IAAA,WAAQ,EAAC,qBAAqB,EAAE,SAAS,CAAC;YAC1C,CAAC;gBACG,IAAI,eAAe,KAAK,SAAS,EAAE;oBAC/B,OAAO,SAAS,CAAC;iBACpB;gBAED,IAAM,UAAU,GAAG,IAAA,WAAQ,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;gBAExD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;oBAC5B,OAAO,SAAS,CAAC;iBACpB;gBAED,OAAO,UAAU,CAAC;YACtB,CAAC,CAAC,EAAE;SAEX,CAAC,MAAM,CAAC,IAAA,iBAAO,EAAC,SAAS,CAAC,CAAC,CAAA,gBAAA;YAjBvB,IAAM,UAAU,WAAA;oBAAV,UAAU;SAiCpB;;;;;;;;;IAED,IAAM,GAAG,GAAG,UAAU,CAAC,MAAM,OAAjB,UAAU,2BAAW,IAAA,mCAAgB,GAAU,UAAC,CAAC;IAE7D,OAAO,GAAG,CAAC;AACf,CAAC;AAxFD,gDAwFC"}
|
package/package.json
CHANGED
|
@@ -34,6 +34,8 @@
|
|
|
34
34
|
<#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
|
|
35
35
|
<#if !messagesPerField.existsError??>
|
|
36
36
|
|
|
37
|
+
/* Consider updating to Keycloak v12 or newer */
|
|
38
|
+
|
|
37
39
|
<#-- https://github.com/keycloakify/keycloakify/pull/218 -->
|
|
38
40
|
<#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
|
|
39
41
|
|
|
@@ -42,6 +44,7 @@
|
|
|
42
44
|
<#attempt>
|
|
43
45
|
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
|
|
44
46
|
<#recover>
|
|
47
|
+
/* There was an FTL error calling messagesPerField.exists('username') */
|
|
45
48
|
<#assign doExistMessageForUsernameOrPassword = true>
|
|
46
49
|
</#attempt>
|
|
47
50
|
|
|
@@ -49,6 +52,7 @@
|
|
|
49
52
|
<#attempt>
|
|
50
53
|
<#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
|
|
51
54
|
<#recover>
|
|
55
|
+
/* There was an FTL error calling messagesPerField.exists('password') */
|
|
52
56
|
<#assign doExistMessageForUsernameOrPassword = true>
|
|
53
57
|
</#attempt>
|
|
54
58
|
</#if>
|
|
@@ -85,7 +85,7 @@ export function readFieldNameUsage(params: {
|
|
|
85
85
|
}
|
|
86
86
|
|
|
87
87
|
fieldNames.push(
|
|
88
|
-
...Array.from(rawSourceFile.matchAll(/(?:(?:printIfExists)|(?:existsError)|(?:get)|(?:exists))\(["']([^"']+)["']/g), m => m[1])
|
|
88
|
+
...Array.from(rawSourceFile.matchAll(/(?:(?:printIfExists)|(?:existsError)|(?:get)|(?:exists))\(\s*["']([^"']+)["']/g), m => m[1])
|
|
89
89
|
);
|
|
90
90
|
}
|
|
91
91
|
}
|