keycloakify 8.1.1 → 8.1.3
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/account/pages/Account.js +1 -1
- package/account/pages/Account.js.map +1 -1
- package/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.js +22 -12
- package/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.js.map +1 -1
- package/lib/usePrepareTemplate.js +7 -8
- package/lib/usePrepareTemplate.js.map +1 -1
- package/package.json +1 -1
- package/src/account/pages/Account.tsx +4 -4
- package/src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts +30 -14
- package/src/lib/usePrepareTemplate.ts +7 -10
package/account/pages/Account.js
CHANGED
|
@@ -10,6 +10,6 @@ export default function Account(props) {
|
|
|
10
10
|
});
|
|
11
11
|
const { url, realm, messagesPerField, stateChecker, account, referrer } = kcContext;
|
|
12
12
|
const { msg } = i18n;
|
|
13
|
-
return (_jsxs(Template, Object.assign({}, { kcContext, i18n, doUseDefaultCss, classes }, { active: "account" }, { children: [_jsxs("div", Object.assign({ className: "row" }, { children: [_jsx("div", Object.assign({ className: "col-md-10" }, { children: _jsx("h2", { children: msg("editAccountHtmlTitle") }) })), _jsx("div", Object.assign({ className: "col-md-2 subtitle" }, { children: _jsxs("span", Object.assign({ className: "subtitle" }, { children: [_jsx("span", Object.assign({ className: "required" }, { children: "*" })), " ", msg("requiredFields")] })) }))] })), _jsxs("form", Object.assign({ action: url.accountUrl, className: "form-horizontal", method: "post" }, { children: [_jsx("input", { type: "hidden", id: "stateChecker", name: "stateChecker", value: stateChecker }), !realm.registrationEmailAsUsername && (_jsxs("div", Object.assign({ className: clsx("form-group", messagesPerField.printIfExists("username", "has-error")) }, { children: [_jsxs("div", Object.assign({ className: "col-sm-2 col-md-2" }, { children: [_jsx("label", Object.assign({ htmlFor: "username", className: "control-label" }, { children: msg("username") })), realm.editUsernameAllowed && _jsx("span", Object.assign({ className: "required" }, { children: "*" }))] })), _jsx("div", Object.assign({ className: "col-sm-10 col-md-10" }, { children: _jsx("input", { type: "text", className: "form-control", id: "username", name: "username", disabled: !realm.editUsernameAllowed,
|
|
13
|
+
return (_jsxs(Template, Object.assign({}, { kcContext, i18n, doUseDefaultCss, classes }, { active: "account" }, { children: [_jsxs("div", Object.assign({ className: "row" }, { children: [_jsx("div", Object.assign({ className: "col-md-10" }, { children: _jsx("h2", { children: msg("editAccountHtmlTitle") }) })), _jsx("div", Object.assign({ className: "col-md-2 subtitle" }, { children: _jsxs("span", Object.assign({ className: "subtitle" }, { children: [_jsx("span", Object.assign({ className: "required" }, { children: "*" })), " ", msg("requiredFields")] })) }))] })), _jsxs("form", Object.assign({ action: url.accountUrl, className: "form-horizontal", method: "post" }, { children: [_jsx("input", { type: "hidden", id: "stateChecker", name: "stateChecker", value: stateChecker }), !realm.registrationEmailAsUsername && (_jsxs("div", Object.assign({ className: clsx("form-group", messagesPerField.printIfExists("username", "has-error")) }, { children: [_jsxs("div", Object.assign({ className: "col-sm-2 col-md-2" }, { children: [_jsx("label", Object.assign({ htmlFor: "username", className: "control-label" }, { children: msg("username") })), realm.editUsernameAllowed && _jsx("span", Object.assign({ className: "required" }, { children: "*" }))] })), _jsx("div", Object.assign({ className: "col-sm-10 col-md-10" }, { children: _jsx("input", { type: "text", className: "form-control", id: "username", name: "username", disabled: !realm.editUsernameAllowed, defaultValue: (_a = account.username) !== null && _a !== void 0 ? _a : "" }) }))] }))), _jsxs("div", Object.assign({ className: clsx("form-group", messagesPerField.printIfExists("email", "has-error")) }, { children: [_jsxs("div", Object.assign({ className: "col-sm-2 col-md-2" }, { children: [_jsx("label", Object.assign({ htmlFor: "email", className: "control-label" }, { children: msg("email") })), " ", _jsx("span", Object.assign({ className: "required" }, { children: "*" }))] })), _jsx("div", Object.assign({ className: "col-sm-10 col-md-10" }, { children: _jsx("input", { type: "text", className: "form-control", id: "email", name: "email", autoFocus: true, defaultValue: (_b = account.email) !== null && _b !== void 0 ? _b : "" }) }))] })), _jsxs("div", Object.assign({ className: clsx("form-group", messagesPerField.printIfExists("firstName", "has-error")) }, { children: [_jsxs("div", Object.assign({ className: "col-sm-2 col-md-2" }, { children: [_jsx("label", Object.assign({ htmlFor: "firstName", className: "control-label" }, { children: msg("firstName") })), " ", _jsx("span", Object.assign({ className: "required" }, { children: "*" }))] })), _jsx("div", Object.assign({ className: "col-sm-10 col-md-10" }, { children: _jsx("input", { type: "text", className: "form-control", id: "firstName", name: "firstName", defaultValue: (_c = account.firstName) !== null && _c !== void 0 ? _c : "" }) }))] })), _jsxs("div", Object.assign({ className: clsx("form-group", messagesPerField.printIfExists("lastName", "has-error")) }, { children: [_jsxs("div", Object.assign({ className: "col-sm-2 col-md-2" }, { children: [_jsx("label", Object.assign({ htmlFor: "lastName", className: "control-label" }, { children: msg("lastName") })), " ", _jsx("span", Object.assign({ className: "required" }, { children: "*" }))] })), _jsx("div", Object.assign({ className: "col-sm-10 col-md-10" }, { children: _jsx("input", { type: "text", className: "form-control", id: "lastName", name: "lastName", defaultValue: (_d = account.lastName) !== null && _d !== void 0 ? _d : "" }) }))] })), _jsx("div", Object.assign({ className: "form-group" }, { children: _jsx("div", Object.assign({ id: "kc-form-buttons", className: "col-md-offset-2 col-md-10 submit" }, { children: _jsxs("div", { children: [referrer !== undefined && _jsx("a", Object.assign({ href: referrer === null || referrer === void 0 ? void 0 : referrer.url }, { children: msg("backToApplication") })), _jsx("button", Object.assign({ type: "submit", className: clsx(getClassName("kcButtonClass"), getClassName("kcButtonPrimaryClass"), getClassName("kcButtonLargeClass")), name: "submitAction", value: "Save" }, { children: msg("doSave") })), _jsx("button", Object.assign({ type: "submit", className: clsx(getClassName("kcButtonClass"), getClassName("kcButtonDefaultClass"), getClassName("kcButtonLargeClass")), name: "submitAction", value: "Cancel" }, { children: msg("doCancel") }))] }) })) }))] }))] })));
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=Account.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Account.js","sourceRoot":"","sources":["../../src/account/pages/Account.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAI1E,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,KAAqE;;IACjG,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAEtE,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC;QACrC,eAAe;QACf,SAAS,kCACF,OAAO,KACV,aAAa,EAAE,IAAI,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,EAAE,MAAM,CAAC,GACpD;KACJ,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAEpF,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAErB,OAAO,CACH,MAAC,QAAQ,oBAAK,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,IAAE,MAAM,EAAC,SAAS,iBACzE,6BAAK,SAAS,EAAC,KAAK,iBAChB,4BAAK,SAAS,EAAC,WAAW,gBACtB,uBAAK,GAAG,CAAC,sBAAsB,CAAC,GAAM,IACpC,EACN,4BAAK,SAAS,EAAC,mBAAmB,gBAC9B,8BAAM,SAAS,EAAC,UAAU,iBACtB,6BAAM,SAAS,EAAC,UAAU,uBAAS,OAAE,GAAG,CAAC,gBAAgB,CAAC,KACvD,IACL,KACJ,EAEN,8BAAM,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,SAAS,EAAC,iBAAiB,EAAC,MAAM,EAAC,MAAM,iBACnE,gBAAO,IAAI,EAAC,QAAQ,EAAC,EAAE,EAAC,cAAc,EAAC,IAAI,EAAC,cAAc,EAAC,KAAK,EAAE,YAAY,GAAI,EAEjF,CAAC,KAAK,CAAC,2BAA2B,IAAI,CACnC,6BAAK,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,gBAAgB,CAAC,aAAa,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,iBACvF,6BAAK,SAAS,EAAC,mBAAmB,iBAC9B,8BAAO,OAAO,EAAC,UAAU,EAAC,SAAS,EAAC,eAAe,gBAC9C,GAAG,CAAC,UAAU,CAAC,IACZ,EACP,KAAK,CAAC,mBAAmB,IAAI,6BAAM,SAAS,EAAC,UAAU,uBAAS,KAC/D,EAEN,4BAAK,SAAS,EAAC,qBAAqB,gBAChC,gBACI,IAAI,EAAC,MAAM,EACX,SAAS,EAAC,cAAc,EACxB,EAAE,EAAC,UAAU,EACb,IAAI,EAAC,UAAU,EACf,QAAQ,EAAE,CAAC,KAAK,CAAC,mBAAmB,EACpC,
|
|
1
|
+
{"version":3,"file":"Account.js","sourceRoot":"","sources":["../../src/account/pages/Account.tsx"],"names":[],"mappings":"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"}
|
|
@@ -66,6 +66,7 @@ var path_1 = require("path");
|
|
|
66
66
|
var download_builtin_keycloak_theme_1 = require("../../download-builtin-keycloak-theme");
|
|
67
67
|
var mockTestingResourcesPath_1 = require("../../mockTestingResourcesPath");
|
|
68
68
|
var crypto = __importStar(require("crypto"));
|
|
69
|
+
var assert_1 = require("tsafe/assert");
|
|
69
70
|
function downloadKeycloakStaticResources(
|
|
70
71
|
// prettier-ignore
|
|
71
72
|
params) {
|
|
@@ -74,7 +75,25 @@ params) {
|
|
|
74
75
|
return __generator(this, function (_a) {
|
|
75
76
|
switch (_a.label) {
|
|
76
77
|
case 0:
|
|
77
|
-
projectDirPath = params.projectDirPath, themeType = params.themeType, themeDirPath = params.themeDirPath, keycloakVersion = params.keycloakVersion
|
|
78
|
+
projectDirPath = params.projectDirPath, themeType = params.themeType, themeDirPath = params.themeDirPath, keycloakVersion = params.keycloakVersion;
|
|
79
|
+
usedResources = (function () {
|
|
80
|
+
var usedResources = params.usedResources;
|
|
81
|
+
if (usedResources === undefined) {
|
|
82
|
+
return undefined;
|
|
83
|
+
}
|
|
84
|
+
(0, assert_1.assert)(usedResources !== undefined);
|
|
85
|
+
return {
|
|
86
|
+
"resourcesCommonDirPaths": usedResources.resourcesCommonFilePaths.map(function (filePath) {
|
|
87
|
+
{
|
|
88
|
+
var splitArg = "/dist/";
|
|
89
|
+
if (filePath.includes(splitArg)) {
|
|
90
|
+
return filePath.split(splitArg)[0] + splitArg;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return (0, path_1.dirname)(filePath);
|
|
94
|
+
})
|
|
95
|
+
};
|
|
96
|
+
})();
|
|
78
97
|
tmpDirPath = (0, path_1.join)(themeDirPath, "..", "tmp_suLeKsxId_".concat(crypto.createHash("sha256").update("".concat(themeType, "-").concat(keycloakVersion)).digest("hex").slice(0, 8)));
|
|
79
98
|
return [4 /*yield*/, (0, download_builtin_keycloak_theme_1.downloadBuiltinKeycloakTheme)({
|
|
80
99
|
projectDirPath: projectDirPath,
|
|
@@ -85,16 +104,7 @@ params) {
|
|
|
85
104
|
_a.sent();
|
|
86
105
|
(0, transformCodebase_1.transformCodebase)({
|
|
87
106
|
"srcDirPath": (0, path_1.join)(tmpDirPath, "keycloak", themeType, "resources"),
|
|
88
|
-
"destDirPath": (0, path_1.join)(themeDirPath, (0, path_1.relative)(mockTestingResourcesPath_1.basenameOfKeycloakDirInPublicDir, mockTestingResourcesPath_1.resourcesDirPathRelativeToPublicDir))
|
|
89
|
-
"transformSourceCode": usedResources === undefined
|
|
90
|
-
? undefined
|
|
91
|
-
: function (_a) {
|
|
92
|
-
var fileRelativePath = _a.fileRelativePath, sourceCode = _a.sourceCode;
|
|
93
|
-
if (!usedResources.resourcesFilePaths.includes(fileRelativePath)) {
|
|
94
|
-
return undefined;
|
|
95
|
-
}
|
|
96
|
-
return { "modifiedSourceCode": sourceCode };
|
|
97
|
-
}
|
|
107
|
+
"destDirPath": (0, path_1.join)(themeDirPath, (0, path_1.relative)(mockTestingResourcesPath_1.basenameOfKeycloakDirInPublicDir, mockTestingResourcesPath_1.resourcesDirPathRelativeToPublicDir))
|
|
98
108
|
});
|
|
99
109
|
(0, transformCodebase_1.transformCodebase)({
|
|
100
110
|
"srcDirPath": (0, path_1.join)(tmpDirPath, "keycloak", "common", "resources"),
|
|
@@ -103,7 +113,7 @@ params) {
|
|
|
103
113
|
? undefined
|
|
104
114
|
: function (_a) {
|
|
105
115
|
var fileRelativePath = _a.fileRelativePath, sourceCode = _a.sourceCode;
|
|
106
|
-
if (
|
|
116
|
+
if (usedResources.resourcesCommonDirPaths.find(function (dirPath) { return fileRelativePath.startsWith(dirPath); }) === undefined) {
|
|
107
117
|
return undefined;
|
|
108
118
|
}
|
|
109
119
|
return { "modifiedSourceCode": sourceCode };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"downloadKeycloakStaticResources.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAkE;AAClE,qCAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"downloadKeycloakStaticResources.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAkE;AAClE,qCAAyB;AACzB,6BAA0F;AAE1F,yFAAqF;AACrF,2EAIwC;AACxC,6CAAiC;AACjC,uCAAsC;AAEtC,SAAsB,+BAA+B;AACjD,kBAAkB;AAClB,MASC;;;;;;oBAEO,cAAc,GAA+C,MAAM,eAArD,EAAE,SAAS,GAAoC,MAAM,UAA1C,EAAE,YAAY,GAAsB,MAAM,aAA5B,EAAE,eAAe,GAAK,MAAM,gBAAX,CAAY;oBAGtE,aAAa,GAAG,CAAC;wBACX,IAAA,aAAa,GAAK,MAAM,cAAX,CAAY;wBAEjC,IAAI,aAAa,KAAK,SAAS,EAAE;4BAC7B,OAAO,SAAS,CAAC;yBACpB;wBAED,IAAA,eAAM,EAAC,aAAa,KAAK,SAAS,CAAC,CAAC;wBAEpC,OAAO;4BACH,yBAAyB,EAAE,aAAa,CAAC,wBAAwB,CAAC,GAAG,CAAC,UAAA,QAAQ;gCAC1E;oCACI,IAAM,QAAQ,GAAG,QAAQ,CAAC;oCAE1B,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wCAC7B,OAAO,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC;qCACjD;iCACJ;gCAED,OAAO,IAAA,cAAW,EAAC,QAAQ,CAAC,CAAC;4BACjC,CAAC,CAAC;yBACL,CAAC;oBACN,CAAC,CAAC,EAAE,CAAC;oBAEC,UAAU,GAAG,IAAA,WAAQ,EACvB,YAAY,EACZ,IAAI,EACJ,wBAAiB,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAG,SAAS,cAAI,eAAe,CAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,CACrH,CAAC;oBAEF,qBAAM,IAAA,8DAA4B,EAAC;4BAC/B,cAAc,gBAAA;4BACd,eAAe,iBAAA;4BACf,aAAa,EAAE,UAAU;yBAC5B,CAAC,EAAA;;oBAJF,SAIE,CAAC;oBAEH,IAAA,qCAAiB,EAAC;wBACd,YAAY,EAAE,IAAA,WAAQ,EAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC;wBACtE,aAAa,EAAE,IAAA,WAAQ,EAAC,YAAY,EAAE,IAAA,eAAY,EAAC,2DAAgC,EAAE,8DAAmC,CAAC,CAAC;qBAC7H,CAAC,CAAC;oBAEH,IAAA,qCAAiB,EAAC;wBACd,YAAY,EAAE,IAAA,WAAQ,EAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC;wBACrE,aAAa,EAAE,IAAA,WAAQ,EAAC,YAAY,EAAE,IAAA,eAAY,EAAC,2DAAgC,EAAE,oEAAyC,CAAC,CAAC;wBAChI,qBAAqB,EACjB,aAAa,KAAK,SAAS;4BACvB,CAAC,CAAC,SAAS;4BACX,CAAC,CAAC,UAAC,EAAgC;oCAA9B,gBAAgB,sBAAA,EAAE,UAAU,gBAAA;gCAC3B,IAAI,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,UAAA,OAAO,IAAI,OAAA,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,EAApC,CAAoC,CAAC,KAAK,SAAS,EAAE;oCAC3G,OAAO,SAAS,CAAC;iCACpB;gCAED,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,CAAC;4BAChD,CAAC;qBACd,CAAC,CAAC;oBAEH,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;;;;;CAC/D;AAzED,0EAyEC"}
|
|
@@ -11,19 +11,18 @@ export function usePrepareTemplate(params) {
|
|
|
11
11
|
let isUnmounted = false;
|
|
12
12
|
const removeArray = [];
|
|
13
13
|
(async () => {
|
|
14
|
-
const
|
|
15
|
-
styles.reverse().forEach(href => {
|
|
14
|
+
for (const style of [...styles].reverse()) {
|
|
16
15
|
const { prLoaded, remove } = headInsert({
|
|
17
16
|
"type": "css",
|
|
18
17
|
"position": "prepend",
|
|
19
|
-
href
|
|
18
|
+
"href": style
|
|
20
19
|
});
|
|
21
20
|
removeArray.push(remove);
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
21
|
+
// TODO: Find a way to do that in parallel (without breaking the order)
|
|
22
|
+
await prLoaded;
|
|
23
|
+
if (isUnmounted) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
27
26
|
}
|
|
28
27
|
setReady();
|
|
29
28
|
})();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePrepareTemplate.js","sourceRoot":"","sources":["../src/lib/usePrepareTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAE9C,MAAM,UAAU,kBAAkB,CAAC,MAMlC;IACG,MAAM,EAAE,4BAA4B,EAAE,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;IAEzG,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,4BAA4B,CAAC,CAAC;IAElF,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,4BAA4B,EAAE;YAC/B,OAAO;SACV;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,MAAM,WAAW,GAAmB,EAAE,CAAC;QAEvC,CAAC,KAAK,IAAI,EAAE;YACR,MAAM,
|
|
1
|
+
{"version":3,"file":"usePrepareTemplate.js","sourceRoot":"","sources":["../src/lib/usePrepareTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAE9C,MAAM,UAAU,kBAAkB,CAAC,MAMlC;IACG,MAAM,EAAE,4BAA4B,EAAE,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;IAEzG,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,4BAA4B,CAAC,CAAC;IAElF,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,4BAA4B,EAAE;YAC/B,OAAO;SACV;QAED,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,MAAM,WAAW,GAAmB,EAAE,CAAC;QAEvC,CAAC,KAAK,IAAI,EAAE;YACR,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;gBACvC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;oBACpC,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,SAAS;oBACrB,MAAM,EAAE,KAAK;iBAChB,CAAC,CAAC;gBAEH,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAEzB,uEAAuE;gBACvE,MAAM,QAAQ,CAAC;gBAEf,IAAI,WAAW,EAAE;oBACb,OAAO;iBACV;aACJ;YAED,QAAQ,EAAE,CAAC;QACf,CAAC,CAAC,EAAE,CAAC;QAEL,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAClB,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;gBAC1B,MAAM,EAAE,YAAY;gBACpB,GAAG;aACN,CAAC,CAAC;YAEH,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE;YACR,WAAW,GAAG,IAAI,CAAC;YACnB,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;QAC5C,CAAC,CAAC;IACN,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,eAAe,CAAC;QACZ,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,aAAa;KAC7B,CAAC,CAAC;IAEH,eAAe,CAAC;QACZ,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,aAAa;KAC7B,CAAC,CAAC;IAEH,OAAO,EAAE,OAAO,EAAE,CAAC;AACvB,CAAC;AAED,SAAS,eAAe,CAAC,MAAkE;IACvF,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAErC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,SAAS,KAAK,SAAS,EAAE;YACzB,OAAO;SACV;QAED,MAAM,aAAa,GAAG,QAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEzE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE1C,aAAa,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;QAE7B,OAAO,GAAG,EAAE;YACR,aAAa,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC;QACpC,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;AACpB,CAAC"}
|
package/package.json
CHANGED
|
@@ -51,7 +51,7 @@ export default function Account(props: PageProps<Extract<KcContext, { pageId: "a
|
|
|
51
51
|
id="username"
|
|
52
52
|
name="username"
|
|
53
53
|
disabled={!realm.editUsernameAllowed}
|
|
54
|
-
|
|
54
|
+
defaultValue={account.username ?? ""}
|
|
55
55
|
/>
|
|
56
56
|
</div>
|
|
57
57
|
</div>
|
|
@@ -66,7 +66,7 @@ export default function Account(props: PageProps<Extract<KcContext, { pageId: "a
|
|
|
66
66
|
</div>
|
|
67
67
|
|
|
68
68
|
<div className="col-sm-10 col-md-10">
|
|
69
|
-
<input type="text" className="form-control" id="email" name="email" autoFocus
|
|
69
|
+
<input type="text" className="form-control" id="email" name="email" autoFocus defaultValue={account.email ?? ""} />
|
|
70
70
|
</div>
|
|
71
71
|
</div>
|
|
72
72
|
|
|
@@ -79,7 +79,7 @@ export default function Account(props: PageProps<Extract<KcContext, { pageId: "a
|
|
|
79
79
|
</div>
|
|
80
80
|
|
|
81
81
|
<div className="col-sm-10 col-md-10">
|
|
82
|
-
<input type="text" className="form-control" id="firstName" name="firstName"
|
|
82
|
+
<input type="text" className="form-control" id="firstName" name="firstName" defaultValue={account.firstName ?? ""} />
|
|
83
83
|
</div>
|
|
84
84
|
</div>
|
|
85
85
|
|
|
@@ -92,7 +92,7 @@ export default function Account(props: PageProps<Extract<KcContext, { pageId: "a
|
|
|
92
92
|
</div>
|
|
93
93
|
|
|
94
94
|
<div className="col-sm-10 col-md-10">
|
|
95
|
-
<input type="text" className="form-control" id="lastName" name="lastName"
|
|
95
|
+
<input type="text" className="form-control" id="lastName" name="lastName" defaultValue={account.lastName ?? ""} />
|
|
96
96
|
</div>
|
|
97
97
|
</div>
|
|
98
98
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { transformCodebase } from "../../tools/transformCodebase";
|
|
2
2
|
import * as fs from "fs";
|
|
3
|
-
import { join as pathJoin, relative as pathRelative } from "path";
|
|
3
|
+
import { join as pathJoin, relative as pathRelative, dirname as pathDirname } from "path";
|
|
4
4
|
import type { ThemeType } from "../generateFtl";
|
|
5
5
|
import { downloadBuiltinKeycloakTheme } from "../../download-builtin-keycloak-theme";
|
|
6
6
|
import {
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
basenameOfKeycloakDirInPublicDir
|
|
10
10
|
} from "../../mockTestingResourcesPath";
|
|
11
11
|
import * as crypto from "crypto";
|
|
12
|
+
import { assert } from "tsafe/assert";
|
|
12
13
|
|
|
13
14
|
export async function downloadKeycloakStaticResources(
|
|
14
15
|
// prettier-ignore
|
|
@@ -23,7 +24,32 @@ export async function downloadKeycloakStaticResources(
|
|
|
23
24
|
} | undefined
|
|
24
25
|
}
|
|
25
26
|
) {
|
|
26
|
-
const { projectDirPath, themeType, themeDirPath, keycloakVersion
|
|
27
|
+
const { projectDirPath, themeType, themeDirPath, keycloakVersion } = params;
|
|
28
|
+
|
|
29
|
+
// NOTE: Hack for 427
|
|
30
|
+
const usedResources = (() => {
|
|
31
|
+
const { usedResources } = params;
|
|
32
|
+
|
|
33
|
+
if (usedResources === undefined) {
|
|
34
|
+
return undefined;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
assert(usedResources !== undefined);
|
|
38
|
+
|
|
39
|
+
return {
|
|
40
|
+
"resourcesCommonDirPaths": usedResources.resourcesCommonFilePaths.map(filePath => {
|
|
41
|
+
{
|
|
42
|
+
const splitArg = "/dist/";
|
|
43
|
+
|
|
44
|
+
if (filePath.includes(splitArg)) {
|
|
45
|
+
return filePath.split(splitArg)[0] + splitArg;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
return pathDirname(filePath);
|
|
50
|
+
})
|
|
51
|
+
};
|
|
52
|
+
})();
|
|
27
53
|
|
|
28
54
|
const tmpDirPath = pathJoin(
|
|
29
55
|
themeDirPath,
|
|
@@ -39,17 +65,7 @@ export async function downloadKeycloakStaticResources(
|
|
|
39
65
|
|
|
40
66
|
transformCodebase({
|
|
41
67
|
"srcDirPath": pathJoin(tmpDirPath, "keycloak", themeType, "resources"),
|
|
42
|
-
"destDirPath": pathJoin(themeDirPath, pathRelative(basenameOfKeycloakDirInPublicDir, resourcesDirPathRelativeToPublicDir))
|
|
43
|
-
"transformSourceCode":
|
|
44
|
-
usedResources === undefined
|
|
45
|
-
? undefined
|
|
46
|
-
: ({ fileRelativePath, sourceCode }) => {
|
|
47
|
-
if (!usedResources.resourcesFilePaths.includes(fileRelativePath)) {
|
|
48
|
-
return undefined;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
return { "modifiedSourceCode": sourceCode };
|
|
52
|
-
}
|
|
68
|
+
"destDirPath": pathJoin(themeDirPath, pathRelative(basenameOfKeycloakDirInPublicDir, resourcesDirPathRelativeToPublicDir))
|
|
53
69
|
});
|
|
54
70
|
|
|
55
71
|
transformCodebase({
|
|
@@ -59,7 +75,7 @@ export async function downloadKeycloakStaticResources(
|
|
|
59
75
|
usedResources === undefined
|
|
60
76
|
? undefined
|
|
61
77
|
: ({ fileRelativePath, sourceCode }) => {
|
|
62
|
-
if (
|
|
78
|
+
if (usedResources.resourcesCommonDirPaths.find(dirPath => fileRelativePath.startsWith(dirPath)) === undefined) {
|
|
63
79
|
return undefined;
|
|
64
80
|
}
|
|
65
81
|
|
|
@@ -23,24 +23,21 @@ export function usePrepareTemplate(params: {
|
|
|
23
23
|
const removeArray: (() => void)[] = [];
|
|
24
24
|
|
|
25
25
|
(async () => {
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
styles.reverse().forEach(href => {
|
|
26
|
+
for (const style of [...styles].reverse()) {
|
|
29
27
|
const { prLoaded, remove } = headInsert({
|
|
30
28
|
"type": "css",
|
|
31
29
|
"position": "prepend",
|
|
32
|
-
href
|
|
30
|
+
"href": style
|
|
33
31
|
});
|
|
34
32
|
|
|
35
33
|
removeArray.push(remove);
|
|
36
34
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
await Promise.all(prLoadedArray);
|
|
35
|
+
// TODO: Find a way to do that in parallel (without breaking the order)
|
|
36
|
+
await prLoaded;
|
|
41
37
|
|
|
42
|
-
|
|
43
|
-
|
|
38
|
+
if (isUnmounted) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
44
41
|
}
|
|
45
42
|
|
|
46
43
|
setReady();
|