keycloakify 10.0.0-rc.0 → 10.0.0-rc.1
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/buildJars/buildJar.js +20 -12
- package/bin/keycloakify/buildJars/buildJar.js.map +1 -1
- package/bin/keycloakify/buildJars/generatePom.js +5 -4
- package/bin/keycloakify/buildJars/generatePom.js.map +1 -1
- package/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +2 -2
- package/bin/keycloakify/generateTheme/readFieldNameUsage.js +0 -1
- package/bin/keycloakify/generateTheme/readFieldNameUsage.js.map +1 -1
- package/package.json +1 -1
- package/src/bin/keycloakify/buildJars/buildJar.ts +22 -11
- package/src/bin/keycloakify/buildJars/generatePom.ts +3 -3
- package/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl +2 -2
- package/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts +0 -2
- package/src/login/pages/Register.tsx +1 -1
|
@@ -106,19 +106,22 @@ function buildJar(params) {
|
|
|
106
106
|
case 0:
|
|
107
107
|
jarFileBasename = params.jarFileBasename, keycloakAccountV1Version = params.keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion = params.keycloakThemeAdditionalInfoExtensionVersion, buildOptions = params.buildOptions;
|
|
108
108
|
keycloakifyBuildTmpDirPath = (0, path_1.join)(buildOptions.keycloakifyBuildDirPath, "..", jarFileBasename.replace(".jar", ""));
|
|
109
|
-
if (
|
|
110
|
-
return [4 /*yield*/, fs.
|
|
109
|
+
if (!(0, fs_1.existsSync)(keycloakifyBuildTmpDirPath)) return [3 /*break*/, 2];
|
|
110
|
+
return [4 /*yield*/, fs.rm(keycloakifyBuildTmpDirPath, { "recursive": true })];
|
|
111
111
|
case 1:
|
|
112
112
|
_a.sent();
|
|
113
113
|
_a.label = 2;
|
|
114
|
-
case 2: return [4 /*yield*/, fs.
|
|
114
|
+
case 2: return [4 /*yield*/, fs.mkdir(keycloakifyBuildTmpDirPath, { "recursive": true })];
|
|
115
115
|
case 3:
|
|
116
|
+
_a.sent();
|
|
117
|
+
return [4 /*yield*/, fs.writeFile((0, path_1.join)(keycloakifyBuildTmpDirPath, ".gitignore"), Buffer.from("*", "utf8"))];
|
|
118
|
+
case 4:
|
|
116
119
|
_a.sent();
|
|
117
120
|
srcMainResourcesRelativeDirPath = (0, path_1.join)("src", "main", "resources");
|
|
118
121
|
{
|
|
119
122
|
keycloakThemesJsonFilePath_1 = (0, path_1.join)(srcMainResourcesRelativeDirPath, "META-INF", "keycloak-themes.json");
|
|
120
|
-
themePropertiesFilePathSet_1 = new (Set.bind.apply(Set, __spreadArray([void 0], __read(buildOptions.themeNames.map(function (themeName) { return (0, path_1.join)(srcMainResourcesRelativeDirPath, "
|
|
121
|
-
accountV1RelativeDirPath_1 = (0, path_1.join)(srcMainResourcesRelativeDirPath, "
|
|
123
|
+
themePropertiesFilePathSet_1 = new (Set.bind.apply(Set, __spreadArray([void 0], __read(buildOptions.themeNames.map(function (themeName) { return (0, path_1.join)(srcMainResourcesRelativeDirPath, "theme", themeName, "account", "theme.properties"); })), false)))();
|
|
124
|
+
accountV1RelativeDirPath_1 = (0, path_1.join)(srcMainResourcesRelativeDirPath, "theme", constants_1.accountV1ThemeName);
|
|
122
125
|
(0, transformCodebase_1.transformCodebase)({
|
|
123
126
|
"srcDirPath": buildOptions.keycloakifyBuildDirPath,
|
|
124
127
|
"destDirPath": keycloakifyBuildTmpDirPath,
|
|
@@ -165,7 +168,7 @@ function buildJar(params) {
|
|
|
165
168
|
}
|
|
166
169
|
["register.ftl", "login-update-profile.ftl"].forEach(function (pageId) {
|
|
167
170
|
return buildOptions.themeNames.map(function (themeName) {
|
|
168
|
-
var ftlFilePath = (0, path_1.join)(srcMainResourcesRelativeDirPath, "
|
|
171
|
+
var ftlFilePath = (0, path_1.join)(keycloakifyBuildTmpDirPath, srcMainResourcesRelativeDirPath, "theme", themeName, "login", pageId);
|
|
169
172
|
var ftlFileContent = (0, fs_1.readFileSync)(ftlFilePath).toString("utf8");
|
|
170
173
|
var realPageId = (function () {
|
|
171
174
|
switch (pageId) {
|
|
@@ -176,7 +179,7 @@ function buildJar(params) {
|
|
|
176
179
|
}
|
|
177
180
|
(0, assert_1.assert)(false);
|
|
178
181
|
})();
|
|
179
|
-
var modifiedFtlFileContent = ftlFileContent.replace("out[\"pageId\"] = \"
|
|
182
|
+
var modifiedFtlFileContent = ftlFileContent.replace("out[\"pageId\"] = \"${pageId}\";", "out[\"pageId\"] = \"".concat(pageId, "\"; out[\"realPageId\"] = \"").concat(realPageId, "\";"));
|
|
180
183
|
(0, assert_1.assert)(modifiedFtlFileContent !== ftlFileContent);
|
|
181
184
|
fs.writeFile((0, path_1.join)((0, path_1.dirname)(ftlFilePath), realPageId), Buffer.from(modifiedFtlFileContent, "utf8"));
|
|
182
185
|
});
|
|
@@ -187,25 +190,30 @@ function buildJar(params) {
|
|
|
187
190
|
keycloakAccountV1Version: keycloakAccountV1Version,
|
|
188
191
|
keycloakThemeAdditionalInfoExtensionVersion: keycloakThemeAdditionalInfoExtensionVersion
|
|
189
192
|
}).pomFileCode;
|
|
190
|
-
return [4 /*yield*/, fs.writeFile((0, path_1.join)(
|
|
191
|
-
case
|
|
193
|
+
return [4 /*yield*/, fs.writeFile((0, path_1.join)(keycloakifyBuildTmpDirPath, "pom.xml"), Buffer.from(pomFileCode, "utf8"))];
|
|
194
|
+
case 5:
|
|
192
195
|
_a.sent();
|
|
193
196
|
return [4 /*yield*/, new Promise(function (resolve, reject) {
|
|
194
197
|
return child_process_1.default.exec("mvn clean install", { "cwd": keycloakifyBuildTmpDirPath }, function (error) {
|
|
195
198
|
if (error !== null) {
|
|
199
|
+
console.error("Build jar failed: ".concat(JSON.stringify({
|
|
200
|
+
jarFileBasename: jarFileBasename,
|
|
201
|
+
keycloakAccountV1Version: keycloakAccountV1Version,
|
|
202
|
+
keycloakThemeAdditionalInfoExtensionVersion: keycloakThemeAdditionalInfoExtensionVersion
|
|
203
|
+
}, null, 2)));
|
|
196
204
|
reject(error);
|
|
197
205
|
return;
|
|
198
206
|
}
|
|
199
207
|
resolve();
|
|
200
208
|
});
|
|
201
209
|
})];
|
|
202
|
-
case
|
|
210
|
+
case 6:
|
|
203
211
|
_a.sent();
|
|
204
212
|
return [4 /*yield*/, fs.rename((0, path_1.join)(keycloakifyBuildTmpDirPath, "target", "".concat(buildOptions.artifactId, "-").concat(buildOptions.themeVersion, ".jar")), (0, path_1.join)(buildOptions.keycloakifyBuildDirPath, jarFileBasename))];
|
|
205
|
-
case
|
|
213
|
+
case 7:
|
|
206
214
|
_a.sent();
|
|
207
215
|
return [4 /*yield*/, fs.rm(keycloakifyBuildTmpDirPath, { "recursive": true })];
|
|
208
|
-
case
|
|
216
|
+
case 8:
|
|
209
217
|
_a.sent();
|
|
210
218
|
return [2 /*return*/];
|
|
211
219
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildJar.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/buildJars/buildJar.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAmD;AAEnD,6BAAgE;AAChE,mEAAkE;AAElE,8CAAkC;AAClC,6CAAqD;AACrD,6CAA8F;AAC9F,yBAA8C;AAC9C,iDAAgD;AAChD,gEAA0C;AAS1C,IAAA,eAAM,GAAwD,CAAC;AAE/D,SAAsB,QAAQ,CAAC,MAK9B;;;;;;oBACW,eAAe,GAA0F,MAAM,gBAAhG,EAAE,wBAAwB,GAAgE,MAAM,yBAAtE,EAAE,2CAA2C,GAAmB,MAAM,4CAAzB,EAAE,YAAY,GAAK,MAAM,aAAX,CAAY;oBAElH,0BAA0B,GAAG,IAAA,WAAQ,EAAC,YAAY,CAAC,uBAAuB,EAAE,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"buildJar.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/buildJars/buildJar.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ var assert_1 = require("tsafe/assert");
|
|
|
31
31
|
function generatePom(params) {
|
|
32
32
|
var keycloakAccountV1Version = params.keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion = params.keycloakThemeAdditionalInfoExtensionVersion, buildOptions = params.buildOptions;
|
|
33
33
|
var pomFileCode = (function generatePomFileCode() {
|
|
34
|
-
var pomFileCode = __spreadArray([
|
|
34
|
+
var pomFileCode = __spreadArray(__spreadArray([
|
|
35
35
|
"<?xml version=\"1.0\"?>",
|
|
36
36
|
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\"",
|
|
37
37
|
"\t xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"",
|
|
@@ -83,9 +83,10 @@ function generatePom(params) {
|
|
|
83
83
|
" </dependency>"
|
|
84
84
|
]
|
|
85
85
|
: [])), false), [
|
|
86
|
-
" </dependencies>"
|
|
87
|
-
|
|
88
|
-
|
|
86
|
+
" </dependencies>"
|
|
87
|
+
], false) : [])), false), [
|
|
88
|
+
"</project>"
|
|
89
|
+
], false).join("\n");
|
|
89
90
|
return { pomFileCode: pomFileCode };
|
|
90
91
|
})().pomFileCode;
|
|
91
92
|
return { pomFileCode: pomFileCode };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatePom.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/buildJars/generatePom.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAsC;AAUtC,IAAA,eAAM,GAAwD,CAAC;AAE/D,SAAgB,WAAW,CAAC,MAI3B;IACW,IAAA,wBAAwB,GAAgE,MAAM,yBAAtE,EAAE,2CAA2C,GAAmB,MAAM,4CAAzB,EAAE,YAAY,GAAK,MAAM,aAAX,CAAY;IAE/F,IAAA,WAAW,GAAK,CAAC,SAAS,mBAAmB;QAGjD,IAAM,WAAW,GAAG;YAChB,yBAAuB;YACvB,sDAAoD;YACpD,4DAAyD;YACzD,uGAAoG;YACpG,sCAAsC;YACtC,qBAAa,YAAY,CAAC,OAAO,eAAY;YAC7C,wBAAgB,YAAY,CAAC,UAAU,kBAAe;YACtD,qBAAa,YAAY,CAAC,YAAY,eAAY;YAClD,kBAAU,YAAY,CAAC,UAAU,YAAS;YAC1C,mBAAmB;YACnB,8BAA8B;YAC9B,gBAAgB;YAChB,wEAAwE;YACxE,iBAAiB;kBACd,CAAC,wBAAwB,KAAK,IAAI,IAAI,2CAA2C,KAAK,IAAI;YACzF,CAAC;gBACK,WAAW;gBACX,eAAe;gBACf,gBAAgB;gBAChB,qDAAqD;gBACrD,qDAAqD;gBACrD,iCAAgC;gBAChC,sBAAsB;gBACtB,uBAAuB;gBACvB,oCAAoC;gBACpC,qBAAqB;gBACrB,kCAAkC;gBAClC,sBAAsB;gBACtB,wBAAwB;gBACxB,uBAAuB;gBACvB,iBAAiB;gBACjB,gBAAgB;gBAChB,YAAY;gBACZ,kBAAkB;sBACf,CAAC,wBAAwB,KAAK,IAAI;gBACjC,CAAC,CAAC;oBACI,kBAAkB;oBAClB,+CAA+C;oBAC/C,oDAAoD;oBACpD,yBAAkB,wBAAwB,eAAY;oBACtD,mBAAmB;iBACtB;gBACH,CAAC,CAAC,EAAE,CAAC,kBACN,CAAC,2CAA2C,KAAK,IAAI;gBACpD,CAAC,CAAC;oBACI,kBAAkB;oBAClB,uCAAuC;oBACvC,yEAAyE;oBACzE,yBAAkB,2CAA2C,eAAY;oBACzE,mBAAmB;iBACtB;gBACH,CAAC,CAAC,EAAE,CAAC;gBACT,mBAAmB;
|
|
1
|
+
{"version":3,"file":"generatePom.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/buildJars/generatePom.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAsC;AAUtC,IAAA,eAAM,GAAwD,CAAC;AAE/D,SAAgB,WAAW,CAAC,MAI3B;IACW,IAAA,wBAAwB,GAAgE,MAAM,yBAAtE,EAAE,2CAA2C,GAAmB,MAAM,4CAAzB,EAAE,YAAY,GAAK,MAAM,aAAX,CAAY;IAE/F,IAAA,WAAW,GAAK,CAAC,SAAS,mBAAmB;QAGjD,IAAM,WAAW,GAAG;YAChB,yBAAuB;YACvB,sDAAoD;YACpD,4DAAyD;YACzD,uGAAoG;YACpG,sCAAsC;YACtC,qBAAa,YAAY,CAAC,OAAO,eAAY;YAC7C,wBAAgB,YAAY,CAAC,UAAU,kBAAe;YACtD,qBAAa,YAAY,CAAC,YAAY,eAAY;YAClD,kBAAU,YAAY,CAAC,UAAU,YAAS;YAC1C,mBAAmB;YACnB,8BAA8B;YAC9B,gBAAgB;YAChB,wEAAwE;YACxE,iBAAiB;kBACd,CAAC,wBAAwB,KAAK,IAAI,IAAI,2CAA2C,KAAK,IAAI;YACzF,CAAC;gBACK,WAAW;gBACX,eAAe;gBACf,gBAAgB;gBAChB,qDAAqD;gBACrD,qDAAqD;gBACrD,iCAAgC;gBAChC,sBAAsB;gBACtB,uBAAuB;gBACvB,oCAAoC;gBACpC,qBAAqB;gBACrB,kCAAkC;gBAClC,sBAAsB;gBACtB,wBAAwB;gBACxB,uBAAuB;gBACvB,iBAAiB;gBACjB,gBAAgB;gBAChB,YAAY;gBACZ,kBAAkB;sBACf,CAAC,wBAAwB,KAAK,IAAI;gBACjC,CAAC,CAAC;oBACI,kBAAkB;oBAClB,+CAA+C;oBAC/C,oDAAoD;oBACpD,yBAAkB,wBAAwB,eAAY;oBACtD,mBAAmB;iBACtB;gBACH,CAAC,CAAC,EAAE,CAAC,kBACN,CAAC,2CAA2C,KAAK,IAAI;gBACpD,CAAC,CAAC;oBACI,kBAAkB;oBAClB,uCAAuC;oBACvC,yEAAyE;oBACzE,yBAAkB,2CAA2C,eAAY;oBACzE,mBAAmB;iBACtB;gBACH,CAAC,CAAC,EAAE,CAAC;gBACT,mBAAmB;sBAEzB,CAAC,CAAC,EAAE,CAAC;YACT,YAAY;kBACd,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,OAAO,EAAE,WAAW,aAAA,EAAE,CAAC;IAC3B,CAAC,CAAC,EAAE,YA/De,CA+Dd;IAEL,OAAO,EAAE,WAAW,aAAA,EAAE,CAAC;AAC3B,CAAC;AAzED,kCAyEC"}
|
|
@@ -373,7 +373,7 @@
|
|
|
373
373
|
|
|
374
374
|
<#-- https://github.com/keycloakify/keycloakify/discussions/406 -->
|
|
375
375
|
<#if (
|
|
376
|
-
["register.ftl", "info.ftl", "login.ftl", "login-update-password.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(pageId) &&
|
|
376
|
+
["register.ftl", "register-user-profile.ftl", "info.ftl", "login.ftl", "login-update-password.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(pageId) &&
|
|
377
377
|
key == "attemptedUsername" && are_same_path(path, ["auth"])
|
|
378
378
|
)>
|
|
379
379
|
<#attempt>
|
|
@@ -383,7 +383,7 @@
|
|
|
383
383
|
<#continue>
|
|
384
384
|
</#if>
|
|
385
385
|
<#recover>
|
|
386
|
-
<#local out_seq += ["/*
|
|
386
|
+
<#local out_seq += ["/*Accessing attemptedUsername throwed an exception */"]>
|
|
387
387
|
</#attempt>
|
|
388
388
|
</#if>
|
|
389
389
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readFieldNameUsage.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/readFieldNameUsage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,6BAAwC;AACxC,qCAAyB;AAGzB,oCAAoC;AACpC,SAAgB,kBAAkB,CAAC,MAAwF;;IAC/G,IAAA,qBAAqB,GAAiC,MAAM,sBAAvC,EAAE,eAAe,GAAgB,MAAM,gBAAtB,EAAE,SAAS,GAAK,MAAM,UAAX,CAAY;IAErE,IAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;;QAErC,KAAyB,IAAA,KAAA,SAAA,CAAC,IAAA,WAAQ,EAAC,qBAAqB,EAAE,SAAS,CAAC,EAAE,IAAA,WAAQ,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAA,gBAAA,4BAAE;YAAxG,IAAM,UAAU,WAAA;YACjB,IAAM,SAAS,GAAG,IAAA,aAAK,EAAC,EAAE,SAAS,EAAE,UAAU,EAAE,mBAAmB,EAAE,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,UAAA,QAAQ,IAAI,OAAA,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAnC,CAAmC,CAAC,CAAC;;gBAE5I,KAAuB,IAAA,6BAAA,SAAA,SAAS,CAAA,CAAA,oCAAA,2DAAE;oBAA7B,IAAM,QAAQ,sBAAA;oBACf,IAAM,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBAEjE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;wBAC7C,SAAS;qBACZ;4CAEU,YAAY;wBACnB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;;yBAE1C;wBAED,IAAI;4BACA,aAAa;iCACR,KAAK,CAAC,YAAY,CAAC;iCACnB,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAApB,CAAoB,CAAC;iCACpC,GAAG,CAAC,UAAA,IAAI;gCACD,IAAA,KAAA,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAA,EAArB,EAAE,QAAmB,CAAC;gCAE3B,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gCAEjB,OAAO,EAAE,CAAC;4BACd,CAAC,CAAC;iCACD,GAAG,CAAC,UAAA,IAAI;gCACL,OAAO,
|
|
1
|
+
{"version":3,"file":"readFieldNameUsage.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/readFieldNameUsage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -29,24 +29,23 @@ export async function buildJar(params: {
|
|
|
29
29
|
|
|
30
30
|
const keycloakifyBuildTmpDirPath = pathJoin(buildOptions.keycloakifyBuildDirPath, "..", jarFileBasename.replace(".jar", ""));
|
|
31
31
|
|
|
32
|
-
{
|
|
33
|
-
|
|
34
|
-
await fs.mkdir(buildOptions.keycloakifyBuildDirPath, { "recursive": true });
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
await fs.writeFile(pathJoin(buildOptions.keycloakifyBuildDirPath, ".gitignore"), Buffer.from("*", "utf8"));
|
|
32
|
+
if (existsSync(keycloakifyBuildTmpDirPath)) {
|
|
33
|
+
await fs.rm(keycloakifyBuildTmpDirPath, { "recursive": true });
|
|
38
34
|
}
|
|
39
35
|
|
|
36
|
+
await fs.mkdir(keycloakifyBuildTmpDirPath, { "recursive": true });
|
|
37
|
+
await fs.writeFile(pathJoin(keycloakifyBuildTmpDirPath, ".gitignore"), Buffer.from("*", "utf8"));
|
|
38
|
+
|
|
40
39
|
const srcMainResourcesRelativeDirPath = pathJoin("src", "main", "resources");
|
|
41
40
|
|
|
42
41
|
{
|
|
43
42
|
const keycloakThemesJsonFilePath = pathJoin(srcMainResourcesRelativeDirPath, "META-INF", "keycloak-themes.json");
|
|
44
43
|
|
|
45
44
|
const themePropertiesFilePathSet = new Set(
|
|
46
|
-
...buildOptions.themeNames.map(themeName => pathJoin(srcMainResourcesRelativeDirPath, "
|
|
45
|
+
...buildOptions.themeNames.map(themeName => pathJoin(srcMainResourcesRelativeDirPath, "theme", themeName, "account", "theme.properties"))
|
|
47
46
|
);
|
|
48
47
|
|
|
49
|
-
const accountV1RelativeDirPath = pathJoin(srcMainResourcesRelativeDirPath, "
|
|
48
|
+
const accountV1RelativeDirPath = pathJoin(srcMainResourcesRelativeDirPath, "theme", accountV1ThemeName);
|
|
50
49
|
|
|
51
50
|
transformCodebase({
|
|
52
51
|
"srcDirPath": buildOptions.keycloakifyBuildDirPath,
|
|
@@ -108,7 +107,7 @@ export async function buildJar(params: {
|
|
|
108
107
|
|
|
109
108
|
(["register.ftl", "login-update-profile.ftl"] as const).forEach(pageId =>
|
|
110
109
|
buildOptions.themeNames.map(themeName => {
|
|
111
|
-
const ftlFilePath = pathJoin(srcMainResourcesRelativeDirPath, "
|
|
110
|
+
const ftlFilePath = pathJoin(keycloakifyBuildTmpDirPath, srcMainResourcesRelativeDirPath, "theme", themeName, "login", pageId);
|
|
112
111
|
|
|
113
112
|
const ftlFileContent = readFileSync(ftlFilePath).toString("utf8");
|
|
114
113
|
|
|
@@ -123,7 +122,7 @@ export async function buildJar(params: {
|
|
|
123
122
|
})();
|
|
124
123
|
|
|
125
124
|
const modifiedFtlFileContent = ftlFileContent.replace(
|
|
126
|
-
`out["pageId"] = "
|
|
125
|
+
`out["pageId"] = "\${pageId}";`,
|
|
127
126
|
`out["pageId"] = "${pageId}"; out["realPageId"] = "${realPageId}";`
|
|
128
127
|
);
|
|
129
128
|
|
|
@@ -141,12 +140,24 @@ export async function buildJar(params: {
|
|
|
141
140
|
keycloakThemeAdditionalInfoExtensionVersion
|
|
142
141
|
});
|
|
143
142
|
|
|
144
|
-
await fs.writeFile(pathJoin(
|
|
143
|
+
await fs.writeFile(pathJoin(keycloakifyBuildTmpDirPath, "pom.xml"), Buffer.from(pomFileCode, "utf8"));
|
|
145
144
|
}
|
|
146
145
|
|
|
147
146
|
await new Promise<void>((resolve, reject) =>
|
|
148
147
|
child_process.exec("mvn clean install", { "cwd": keycloakifyBuildTmpDirPath }, error => {
|
|
149
148
|
if (error !== null) {
|
|
149
|
+
console.error(
|
|
150
|
+
`Build jar failed: ${JSON.stringify(
|
|
151
|
+
{
|
|
152
|
+
jarFileBasename,
|
|
153
|
+
keycloakAccountV1Version,
|
|
154
|
+
keycloakThemeAdditionalInfoExtensionVersion
|
|
155
|
+
},
|
|
156
|
+
null,
|
|
157
|
+
2
|
|
158
|
+
)}`
|
|
159
|
+
);
|
|
160
|
+
|
|
150
161
|
reject(error);
|
|
151
162
|
return;
|
|
152
163
|
}
|
|
@@ -373,7 +373,7 @@
|
|
|
373
373
|
|
|
374
374
|
<#-- https://github.com/keycloakify/keycloakify/discussions/406 -->
|
|
375
375
|
<#if (
|
|
376
|
-
["register.ftl", "info.ftl", "login.ftl", "login-update-password.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(pageId) &&
|
|
376
|
+
["register.ftl", "register-user-profile.ftl", "info.ftl", "login.ftl", "login-update-password.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(pageId) &&
|
|
377
377
|
key == "attemptedUsername" && are_same_path(path, ["auth"])
|
|
378
378
|
)>
|
|
379
379
|
<#attempt>
|
|
@@ -383,7 +383,7 @@
|
|
|
383
383
|
<#continue>
|
|
384
384
|
</#if>
|
|
385
385
|
<#recover>
|
|
386
|
-
<#local out_seq += ["/*
|
|
386
|
+
<#local out_seq += ["/*Accessing attemptedUsername throwed an exception */"]>
|
|
387
387
|
</#attempt>
|
|
388
388
|
</#if>
|
|
389
389
|
|
|
@@ -85,7 +85,7 @@ export default function Register(props: RegisterProps) {
|
|
|
85
85
|
function TermsAcceptance(props: {
|
|
86
86
|
i18n: I18n;
|
|
87
87
|
getClassName: ReturnType<typeof useGetClassName>["getClassName"];
|
|
88
|
-
messagesPerField: Pick<KcContext
|
|
88
|
+
messagesPerField: Pick<KcContext["messagesPerField"], "existsError" | "get">;
|
|
89
89
|
}) {
|
|
90
90
|
const { i18n, getClassName, messagesPerField } = props;
|
|
91
91
|
|