keycloakify 8.1.2 → 8.2.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/README.md +1 -0
- package/account/pages/Account.js +1 -1
- package/account/pages/Account.js.map +1 -1
- package/bin/getSrcDirPath.js +30 -17
- package/bin/getSrcDirPath.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/getSrcDirPath.ts +8 -8
- package/src/lib/usePrepareTemplate.ts +7 -10
package/README.md
CHANGED
@@ -117,6 +117,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
|
|
117
117
|
<td align="center" valign="top" width="14.28%"><a href="https://github.com/satanshiro"><img src="https://avatars.githubusercontent.com/u/38865738?v=4?s=100" width="100px;" alt="satanshiro"/><br /><sub><b>satanshiro</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=satanshiro" title="Code">💻</a></td>
|
118
118
|
<td align="center" valign="top" width="14.28%"><a href="https://poelhekke.dev"><img src="https://avatars.githubusercontent.com/u/1632377?v=4?s=100" width="100px;" alt="Koen Poelhekke"/><br /><sub><b>Koen Poelhekke</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=kpoelhekke" title="Code">💻</a></td>
|
119
119
|
<td align="center" valign="top" width="14.28%"><a href="https://github.com/zavoloklom"><img src="https://avatars.githubusercontent.com/u/4151869?v=4?s=100" width="100px;" alt="Sergey Kupletsky"/><br /><sub><b>Sergey Kupletsky</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=zavoloklom" title="Tests">⚠️</a> <a href="https://github.com/keycloakify/keycloakify/commits?author=zavoloklom" title="Code">💻</a></td>
|
120
|
+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/rome-user"><img src="https://avatars.githubusercontent.com/u/114131048?v=4?s=100" width="100px;" alt="rome-user"/><br /><sub><b>rome-user</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=rome-user" title="Code">💻</a></td>
|
120
121
|
</tr>
|
121
122
|
</tbody>
|
122
123
|
</table>
|
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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"}
|
package/bin/getSrcDirPath.js
CHANGED
@@ -22,6 +22,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
22
22
|
__setModuleDefault(result, mod);
|
23
23
|
return result;
|
24
24
|
};
|
25
|
+
var __values = (this && this.__values) || function(o) {
|
26
|
+
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
27
|
+
if (m) return m.call(o);
|
28
|
+
if (o && typeof o.length === "number") return {
|
29
|
+
next: function () {
|
30
|
+
if (o && i >= o.length) o = void 0;
|
31
|
+
return { value: o && o[i++], done: !o };
|
32
|
+
}
|
33
|
+
};
|
34
|
+
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
35
|
+
};
|
25
36
|
var __read = (this && this.__read) || function (o, n) {
|
26
37
|
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
27
38
|
if (!m) return o;
|
@@ -47,17 +58,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
47
58
|
}
|
48
59
|
return to.concat(ar || Array.prototype.slice.call(from));
|
49
60
|
};
|
50
|
-
var __values = (this && this.__values) || function(o) {
|
51
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
52
|
-
if (m) return m.call(o);
|
53
|
-
if (o && typeof o.length === "number") return {
|
54
|
-
next: function () {
|
55
|
-
if (o && i >= o.length) o = void 0;
|
56
|
-
return { value: o && o[i++], done: !o };
|
57
|
-
}
|
58
|
-
};
|
59
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
60
|
-
};
|
61
61
|
Object.defineProperty(exports, "__esModule", { value: true });
|
62
62
|
exports.getThemeSrcDirPath = void 0;
|
63
63
|
var fs = __importStar(require("fs"));
|
@@ -65,7 +65,7 @@ var tsafe_1 = require("tsafe");
|
|
65
65
|
var crawl_1 = require("./tools/crawl");
|
66
66
|
var path_1 = require("path");
|
67
67
|
var generateFtl_1 = require("./keycloakify/generateFtl");
|
68
|
-
var
|
68
|
+
var themeSrcDirBasenames = ["keycloak-theme", "keycloak_theme"];
|
69
69
|
/** Can't catch error, if the directory isn't found, this function will just exit the process with an error message. */
|
70
70
|
function getThemeSrcDirPath(params) {
|
71
71
|
var e_1, _a;
|
@@ -73,11 +73,24 @@ function getThemeSrcDirPath(params) {
|
|
73
73
|
var srcDirPath = (0, path_1.join)(projectDirPath, "src");
|
74
74
|
var themeSrcDirPath = (0, crawl_1.crawl)({ "dirPath": srcDirPath, "returnedPathsType": "relative to dirPath" })
|
75
75
|
.map(function (fileRelativePath) {
|
76
|
-
var
|
77
|
-
|
78
|
-
|
76
|
+
var e_2, _a;
|
77
|
+
try {
|
78
|
+
for (var themeSrcDirBasenames_1 = __values(themeSrcDirBasenames), themeSrcDirBasenames_1_1 = themeSrcDirBasenames_1.next(); !themeSrcDirBasenames_1_1.done; themeSrcDirBasenames_1_1 = themeSrcDirBasenames_1.next()) {
|
79
|
+
var themeSrcDirBasename = themeSrcDirBasenames_1_1.value;
|
80
|
+
var split = fileRelativePath.split(themeSrcDirBasename);
|
81
|
+
if (split.length === 2) {
|
82
|
+
return (0, path_1.join)(srcDirPath, split[0] + themeSrcDirBasename);
|
83
|
+
}
|
84
|
+
}
|
85
|
+
}
|
86
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
87
|
+
finally {
|
88
|
+
try {
|
89
|
+
if (themeSrcDirBasenames_1_1 && !themeSrcDirBasenames_1_1.done && (_a = themeSrcDirBasenames_1.return)) _a.call(themeSrcDirBasenames_1);
|
90
|
+
}
|
91
|
+
finally { if (e_2) throw e_2.error; }
|
79
92
|
}
|
80
|
-
return
|
93
|
+
return undefined;
|
81
94
|
})
|
82
95
|
.filter((0, tsafe_1.exclude)(undefined))[0];
|
83
96
|
if (themeSrcDirPath !== undefined) {
|
@@ -101,7 +114,7 @@ function getThemeSrcDirPath(params) {
|
|
101
114
|
}
|
102
115
|
console.error([
|
103
116
|
"Can't locate your theme source directory. It should be either: ",
|
104
|
-
"src/ or src/keycloak-theme.",
|
117
|
+
"src/ or src/keycloak-theme or src/keycloak_theme.",
|
105
118
|
"Example in the starter: https://github.com/keycloakify/keycloakify-starter/tree/main/src/keycloak-theme"
|
106
119
|
].join("\n"));
|
107
120
|
process.exit(-1);
|
package/bin/getSrcDirPath.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getSrcDirPath.js","sourceRoot":"","sources":["../src/bin/getSrcDirPath.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAyB;AACzB,+BAAgC;AAChC,uCAAsC;AACtC,6BAAwC;AACxC,yDAAuD;AAEvD,IAAM,
|
1
|
+
{"version":3,"file":"getSrcDirPath.js","sourceRoot":"","sources":["../src/bin/getSrcDirPath.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAyB;AACzB,+BAAgC;AAChC,uCAAsC;AACtC,6BAAwC;AACxC,yDAAuD;AAEvD,IAAM,oBAAoB,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;AAElE,uHAAuH;AACvH,SAAgB,kBAAkB,CAAC,MAAkC;;IACzD,IAAA,cAAc,GAAK,MAAM,eAAX,CAAY;IAElC,IAAM,UAAU,GAAG,IAAA,WAAQ,EAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAEnD,IAAM,eAAe,GAAuB,IAAA,aAAK,EAAC,EAAE,SAAS,EAAE,UAAU,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,CAAC;SACnH,GAAG,CAAC,UAAA,gBAAgB;;;YACjB,KAAkC,IAAA,yBAAA,SAAA,oBAAoB,CAAA,0DAAA,4FAAE;gBAAnD,IAAM,mBAAmB,iCAAA;gBAC1B,IAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;gBAC1D,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oBACpB,OAAO,IAAA,WAAQ,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC;iBAC/D;aACJ;;;;;;;;;QACD,OAAO,SAAS,CAAC;IACrB,CAAC,CAAC;SACD,MAAM,CAAC,IAAA,eAAO,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnC,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,OAAO,EAAE,eAAe,iBAAA,EAAE,CAAC;KAC9B;;QAED,KAAwB,IAAA,KAAA,gDAAI,wBAAU,YAAE,OAAO,UAAC,gBAAA,4BAAE;YAA7C,IAAM,SAAS,WAAA;YAChB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAA,WAAQ,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE;gBACjD,SAAS;aACZ;YACD,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,CAAC;SAC5C;;;;;;;;;IAED,OAAO,CAAC,KAAK,CACT;QACI,iEAAiE;QACjE,mDAAmD;QACnD,yGAAyG;KAC5G,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;IAEF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AACrB,CAAC;AArCD,gDAqCC"}
|
@@ -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
|
|
package/src/bin/getSrcDirPath.ts
CHANGED
@@ -4,7 +4,7 @@ import { crawl } from "./tools/crawl";
|
|
4
4
|
import { join as pathJoin } from "path";
|
5
5
|
import { themeTypes } from "./keycloakify/generateFtl";
|
6
6
|
|
7
|
-
const
|
7
|
+
const themeSrcDirBasenames = ["keycloak-theme", "keycloak_theme"];
|
8
8
|
|
9
9
|
/** Can't catch error, if the directory isn't found, this function will just exit the process with an error message. */
|
10
10
|
export function getThemeSrcDirPath(params: { projectDirPath: string }) {
|
@@ -14,13 +14,13 @@ export function getThemeSrcDirPath(params: { projectDirPath: string }) {
|
|
14
14
|
|
15
15
|
const themeSrcDirPath: string | undefined = crawl({ "dirPath": srcDirPath, "returnedPathsType": "relative to dirPath" })
|
16
16
|
.map(fileRelativePath => {
|
17
|
-
const
|
18
|
-
|
19
|
-
|
20
|
-
|
17
|
+
for (const themeSrcDirBasename of themeSrcDirBasenames) {
|
18
|
+
const split = fileRelativePath.split(themeSrcDirBasename);
|
19
|
+
if (split.length === 2) {
|
20
|
+
return pathJoin(srcDirPath, split[0] + themeSrcDirBasename);
|
21
|
+
}
|
21
22
|
}
|
22
|
-
|
23
|
-
return pathJoin(srcDirPath, split[0] + themeSrcDirBasename);
|
23
|
+
return undefined;
|
24
24
|
})
|
25
25
|
.filter(exclude(undefined))[0];
|
26
26
|
|
@@ -38,7 +38,7 @@ export function getThemeSrcDirPath(params: { projectDirPath: string }) {
|
|
38
38
|
console.error(
|
39
39
|
[
|
40
40
|
"Can't locate your theme source directory. It should be either: ",
|
41
|
-
"src/ or src/keycloak-theme.",
|
41
|
+
"src/ or src/keycloak-theme or src/keycloak_theme.",
|
42
42
|
"Example in the starter: https://github.com/keycloakify/keycloakify-starter/tree/main/src/keycloak-theme"
|
43
43
|
].join("\n")
|
44
44
|
);
|
@@ -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();
|