keycloakify 11.3.27 → 11.3.29
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/i18n/noJsx/getI18n.js +4 -5
- package/account/i18n/noJsx/getI18n.js.map +1 -1
- package/account/i18n/withJsx/useI18n.js +15 -4
- package/account/i18n/withJsx/useI18n.js.map +1 -1
- package/login/i18n/noJsx/getI18n.js +4 -5
- package/login/i18n/noJsx/getI18n.js.map +1 -1
- package/login/i18n/withJsx/useI18n.js +15 -4
- package/login/i18n/withJsx/useI18n.js.map +1 -1
- package/login/pages/LoginConfigTotp.js +1 -1
- package/login/pages/LoginConfigTotp.js.map +1 -1
- package/package.json +5 -1
- package/src/account/i18n/noJsx/getI18n.tsx +4 -5
- package/src/account/i18n/withJsx/useI18n.tsx +18 -4
- package/src/login/i18n/noJsx/getI18n.tsx +4 -5
- package/src/login/i18n/withJsx/useI18n.tsx +18 -4
- package/src/login/pages/LoginConfigTotp.tsx +18 -20
- package/src/tools/extractLastParenthesisContent.ts +43 -0
- package/tools/extractLastParenthesisContent.d.ts +6 -0
- package/tools/extractLastParenthesisContent.js +36 -0
- package/tools/extractLastParenthesisContent.js.map +1 -0
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import "../../../tools/Object.fromEntries";
|
|
2
2
|
import { assert, is } from "tsafe/assert";
|
|
3
|
+
import { extractLastParenthesisContent } from "../../../tools/extractLastParenthesisContent";
|
|
3
4
|
import messages_defaultSet_fallbackLanguage from "../messages_defaultSet/en";
|
|
4
5
|
import { fetchMessages_defaultSet } from "../messages_defaultSet";
|
|
5
6
|
import { FALLBACK_LANGUAGE_TAG } from "../../../bin/shared/constants";
|
|
@@ -90,11 +91,9 @@ export function createGetI18n(params) {
|
|
|
90
91
|
if (supportedEntry === undefined) {
|
|
91
92
|
break from_server;
|
|
92
93
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
if (match !== null) {
|
|
97
|
-
return match[1];
|
|
94
|
+
const lastParenthesisContent = extractLastParenthesisContent(supportedEntry.label);
|
|
95
|
+
if (lastParenthesisContent !== undefined) {
|
|
96
|
+
return lastParenthesisContent;
|
|
98
97
|
}
|
|
99
98
|
return supportedEntry.label;
|
|
100
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getI18n.js","sourceRoot":"","sources":["../../../src/account/i18n/noJsx/getI18n.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getI18n.js","sourceRoot":"","sources":["../../../src/account/i18n/noJsx/getI18n.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,19 @@ export function createUseI18n(params) {
|
|
|
9
9
|
const cache = new WeakMap();
|
|
10
10
|
function renderHtmlString(params) {
|
|
11
11
|
const { htmlString, msgKey } = params;
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
const htmlString_sanitized = kcSanitize(htmlString);
|
|
13
|
+
const Element = (() => {
|
|
14
|
+
if (htmlString_sanitized.includes("<") && htmlString_sanitized.includes(">")) {
|
|
15
|
+
for (const tagName of ["div", "section", "article", "ul", "ol"]) {
|
|
16
|
+
if (htmlString_sanitized.includes(`<${tagName}`)) {
|
|
17
|
+
return "div";
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return "span";
|
|
22
|
+
})();
|
|
23
|
+
return (_jsx(Element, { "data-kc-msg": msgKey, dangerouslySetInnerHTML: {
|
|
24
|
+
__html: htmlString_sanitized
|
|
14
25
|
} }));
|
|
15
26
|
}
|
|
16
27
|
function withJsx(i18n_noJsx) {
|
|
@@ -28,14 +39,14 @@ export function createUseI18n(params) {
|
|
|
28
39
|
return { withJsx };
|
|
29
40
|
})();
|
|
30
41
|
add_style: {
|
|
31
|
-
const attributeName = "data-kc-
|
|
42
|
+
const attributeName = "data-kc-msg";
|
|
32
43
|
// Check if already exists in head
|
|
33
44
|
if (document.querySelector(`style[${attributeName}]`) !== null) {
|
|
34
45
|
break add_style;
|
|
35
46
|
}
|
|
36
47
|
const styleElement = document.createElement("style");
|
|
37
48
|
styleElement.attributes.setNamedItem(document.createAttribute(attributeName));
|
|
38
|
-
styleElement.textContent = `[
|
|
49
|
+
styleElement.textContent = `div[${attributeName}] { display: inline-block; }`;
|
|
39
50
|
document.head.prepend(styleElement);
|
|
40
51
|
}
|
|
41
52
|
const { getI18n } = createGetI18n({ extraLanguageTranslations, messagesByLanguageTag_themeDefined });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useI18n.js","sourceRoot":"","sources":["../../../src/account/i18n/withJsx/useI18n.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAsB,MAAM,kBAAkB,CAAC;AAErE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAaxC,MAAM,UAAU,aAAa,CAI3B,MAYD;IACG,MAAM,EAAE,yBAAyB,EAAE,kCAAkC,EAAE,GAAG,MAAM,CAAC;IAUjF,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE;QACtB,MAAM,KAAK,GAAG,IAAI,OAAO,EAAoF,CAAC;QAE9G,SAAS,gBAAgB,CAAC,MAA8C;YACpE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"useI18n.js","sourceRoot":"","sources":["../../../src/account/i18n/withJsx/useI18n.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import "../../../tools/Object.fromEntries";
|
|
2
2
|
import { assert, is } from "tsafe/assert";
|
|
3
|
+
import { extractLastParenthesisContent } from "../../../tools/extractLastParenthesisContent";
|
|
3
4
|
import messages_defaultSet_fallbackLanguage from "../messages_defaultSet/en";
|
|
4
5
|
import { fetchMessages_defaultSet } from "../messages_defaultSet";
|
|
5
6
|
import { FALLBACK_LANGUAGE_TAG } from "../../../bin/shared/constants";
|
|
@@ -90,11 +91,9 @@ export function createGetI18n(params) {
|
|
|
90
91
|
if (supportedEntry === undefined) {
|
|
91
92
|
break from_server;
|
|
92
93
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
if (match !== null) {
|
|
97
|
-
return match[1];
|
|
94
|
+
const lastParenthesisContent = extractLastParenthesisContent(supportedEntry.label);
|
|
95
|
+
if (lastParenthesisContent !== undefined) {
|
|
96
|
+
return lastParenthesisContent;
|
|
98
97
|
}
|
|
99
98
|
return supportedEntry.label;
|
|
100
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getI18n.js","sourceRoot":"","sources":["../../../src/login/i18n/noJsx/getI18n.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getI18n.js","sourceRoot":"","sources":["../../../src/login/i18n/noJsx/getI18n.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,19 @@ export function createUseI18n(params) {
|
|
|
9
9
|
const cache = new WeakMap();
|
|
10
10
|
function renderHtmlString(params) {
|
|
11
11
|
const { htmlString, msgKey } = params;
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
const htmlString_sanitized = kcSanitize(htmlString);
|
|
13
|
+
const Element = (() => {
|
|
14
|
+
if (htmlString_sanitized.includes("<") && htmlString_sanitized.includes(">")) {
|
|
15
|
+
for (const tagName of ["div", "section", "article", "ul", "ol"]) {
|
|
16
|
+
if (htmlString_sanitized.includes(`<${tagName}`)) {
|
|
17
|
+
return "div";
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return "span";
|
|
22
|
+
})();
|
|
23
|
+
return (_jsx(Element, { "data-kc-msg": msgKey, dangerouslySetInnerHTML: {
|
|
24
|
+
__html: htmlString_sanitized
|
|
14
25
|
} }));
|
|
15
26
|
}
|
|
16
27
|
function withJsx(i18n_noJsx) {
|
|
@@ -28,14 +39,14 @@ export function createUseI18n(params) {
|
|
|
28
39
|
return { withJsx };
|
|
29
40
|
})();
|
|
30
41
|
add_style: {
|
|
31
|
-
const attributeName = "data-kc-
|
|
42
|
+
const attributeName = "data-kc-msg";
|
|
32
43
|
// Check if already exists in head
|
|
33
44
|
if (document.querySelector(`style[${attributeName}]`) !== null) {
|
|
34
45
|
break add_style;
|
|
35
46
|
}
|
|
36
47
|
const styleElement = document.createElement("style");
|
|
37
48
|
styleElement.attributes.setNamedItem(document.createAttribute(attributeName));
|
|
38
|
-
styleElement.textContent = `[
|
|
49
|
+
styleElement.textContent = `div[${attributeName}] { display: inline-block; }`;
|
|
39
50
|
document.head.prepend(styleElement);
|
|
40
51
|
}
|
|
41
52
|
const { getI18n } = createGetI18n({ extraLanguageTranslations, messagesByLanguageTag_themeDefined });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useI18n.js","sourceRoot":"","sources":["../../../src/login/i18n/withJsx/useI18n.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAsB,MAAM,kBAAkB,CAAC;AAErE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAaxC,MAAM,UAAU,aAAa,CAI3B,MAYD;IACG,MAAM,EAAE,yBAAyB,EAAE,kCAAkC,EAAE,GAAG,MAAM,CAAC;IAUjF,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE;QACtB,MAAM,KAAK,GAAG,IAAI,OAAO,EAAoF,CAAC;QAE9G,SAAS,gBAAgB,CAAC,MAA8C;YACpE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"useI18n.js","sourceRoot":"","sources":["../../../src/login/i18n/withJsx/useI18n.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export default function LoginConfigTotp(props) {
|
|
|
9
9
|
});
|
|
10
10
|
const { url, isAppInitiatedAction, totp, mode, messagesPerField } = kcContext;
|
|
11
11
|
const { msg, msgStr, advancedMsg } = i18n;
|
|
12
|
-
return (_jsx(Template, Object.assign({ kcContext: kcContext, i18n: i18n, doUseDefaultCss: doUseDefaultCss, classes: classes, headerNode: msg("loginTotpTitle"), displayMessage: !messagesPerField.existsError("totp", "userLabel") }, { children: _jsxs(_Fragment, { children: [_jsxs("ol", Object.assign({ id: "kc-totp-settings" }, { children: [_jsxs("li", { children: [_jsx("p", { children: msg("loginTotpStep1") }), _jsx("ul", Object.assign({ id: "kc-totp-supported-apps" }, { children: totp.supportedApplications.map(app => (_jsx("li", { children: advancedMsg(app) }, app))) }))] }), mode == "manual" ? (_jsxs(_Fragment, { children: [_jsxs("li", { children: [_jsx("p", { children: msg("loginTotpManualStep2") }), _jsx("p", { children: _jsx("span", Object.assign({ id: "kc-totp-secret-key" }, { children: totp.totpSecretEncoded })) }), _jsx("p", { children: _jsx("a", Object.assign({ href: totp.qrUrl, id: "mode-barcode" }, { children: msg("loginTotpScanBarcode") })) })] }), _jsxs("li", { children: [_jsx("p", { children: msg("loginTotpManualStep3") }),
|
|
12
|
+
return (_jsx(Template, Object.assign({ kcContext: kcContext, i18n: i18n, doUseDefaultCss: doUseDefaultCss, classes: classes, headerNode: msg("loginTotpTitle"), displayMessage: !messagesPerField.existsError("totp", "userLabel") }, { children: _jsxs(_Fragment, { children: [_jsxs("ol", Object.assign({ id: "kc-totp-settings" }, { children: [_jsxs("li", { children: [_jsx("p", { children: msg("loginTotpStep1") }), _jsx("ul", Object.assign({ id: "kc-totp-supported-apps" }, { children: totp.supportedApplications.map(app => (_jsx("li", { children: advancedMsg(app) }, app))) }))] }), mode == "manual" ? (_jsxs(_Fragment, { children: [_jsxs("li", { children: [_jsx("p", { children: msg("loginTotpManualStep2") }), _jsx("p", { children: _jsx("span", Object.assign({ id: "kc-totp-secret-key" }, { children: totp.totpSecretEncoded })) }), _jsx("p", { children: _jsx("a", Object.assign({ href: totp.qrUrl, id: "mode-barcode" }, { children: msg("loginTotpScanBarcode") })) })] }), _jsxs("li", { children: [_jsx("p", { children: msg("loginTotpManualStep3") }), _jsxs("ul", { children: [_jsxs("li", Object.assign({ id: "kc-totp-type" }, { children: [msg("loginTotpType"), ": ", msg(`loginTotp.${totp.policy.type}`)] })), _jsxs("li", Object.assign({ id: "kc-totp-algorithm" }, { children: [msg("loginTotpAlgorithm"), ": ", totp.policy.getAlgorithmKey()] })), _jsxs("li", Object.assign({ id: "kc-totp-digits" }, { children: [msg("loginTotpDigits"), ": ", totp.policy.digits] })), totp.policy.type === "totp" ? (_jsxs("li", Object.assign({ id: "kc-totp-period" }, { children: [msg("loginTotpInterval"), ": ", totp.policy.period] }))) : (_jsxs("li", Object.assign({ id: "kc-totp-counter" }, { children: [msg("loginTotpCounter"), ": ", totp.policy.initialCounter] })))] })] })] })) : (_jsxs("li", { children: [_jsx("p", { children: msg("loginTotpStep2") }), _jsx("img", { id: "kc-totp-secret-qr-code", src: `data:image/png;base64, ${totp.totpSecretQrCode}`, alt: "Figure: Barcode" }), _jsx("br", {}), _jsx("p", { children: _jsx("a", Object.assign({ href: totp.manualUrl, id: "mode-manual" }, { children: msg("loginTotpUnableToScan") })) })] })), _jsxs("li", { children: [_jsx("p", { children: msg("loginTotpStep3") }), _jsx("p", { children: msg("loginTotpStep3DeviceName") })] })] })), _jsxs("form", Object.assign({ action: url.loginAction, className: kcClsx("kcFormClass"), id: "kc-totp-settings-form", method: "post" }, { children: [_jsxs("div", Object.assign({ className: kcClsx("kcFormGroupClass") }, { children: [_jsxs("div", Object.assign({ className: kcClsx("kcInputWrapperClass") }, { children: [_jsx("label", Object.assign({ htmlFor: "totp", className: kcClsx("kcLabelClass") }, { children: msg("authenticatorCode") })), " ", _jsx("span", Object.assign({ className: "required" }, { children: "*" }))] })), _jsxs("div", Object.assign({ className: kcClsx("kcInputWrapperClass") }, { children: [_jsx("input", { type: "text", id: "totp", name: "totp", autoComplete: "off", className: kcClsx("kcInputClass"), "aria-invalid": messagesPerField.existsError("totp") }), messagesPerField.existsError("totp") && (_jsx("span", { id: "input-error-otp-code", className: kcClsx("kcInputErrorMessageClass"), "aria-live": "polite", dangerouslySetInnerHTML: {
|
|
13
13
|
__html: kcSanitize(messagesPerField.get("totp"))
|
|
14
14
|
} }))] })), _jsx("input", { type: "hidden", id: "totpSecret", name: "totpSecret", value: totp.totpSecret }), mode && _jsx("input", { type: "hidden", id: "mode", value: mode })] })), _jsxs("div", Object.assign({ className: kcClsx("kcFormGroupClass") }, { children: [_jsxs("div", Object.assign({ className: kcClsx("kcInputWrapperClass") }, { children: [_jsx("label", Object.assign({ htmlFor: "userLabel", className: kcClsx("kcLabelClass") }, { children: msg("loginTotpDeviceName") })), " ", totp.otpCredentials.length >= 1 && _jsx("span", Object.assign({ className: "required" }, { children: "*" }))] })), _jsxs("div", Object.assign({ className: kcClsx("kcInputWrapperClass") }, { children: [_jsx("input", { type: "text", id: "userLabel", name: "userLabel", autoComplete: "off", className: kcClsx("kcInputClass"), "aria-invalid": messagesPerField.existsError("userLabel") }), messagesPerField.existsError("userLabel") && (_jsx("span", { id: "input-error-otp-label", className: kcClsx("kcInputErrorMessageClass"), "aria-live": "polite", dangerouslySetInnerHTML: {
|
|
15
15
|
__html: kcSanitize(messagesPerField.get("userLabel"))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginConfigTotp.js","sourceRoot":"","sources":["../../src/login/pages/LoginConfigTotp.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAKxD,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,KAA+E;IACnH,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAEtE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;QACzB,eAAe;QACf,OAAO;KACV,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,GAAG,SAAS,CAAC;IAE9E,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAE1C,OAAO,CACH,KAAC,QAAQ,kBACL,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,GAAG,CAAC,gBAAgB,CAAC,EACjC,cAAc,EAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,gBAElE,8BACI,4BAAI,EAAE,EAAC,kBAAkB,iBACrB,yBACI,sBAAI,GAAG,CAAC,gBAAgB,CAAC,GAAK,EAE9B,2BAAI,EAAE,EAAC,wBAAwB,gBAC1B,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CACnC,uBAAe,WAAW,CAAC,GAAG,CAAC,IAAtB,GAAG,CAAyB,CACxC,CAAC,IACD,IACJ,EAEJ,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,CAChB,8BACI,yBACI,sBAAI,GAAG,CAAC,sBAAsB,CAAC,GAAK,EACpC,sBACI,6BAAM,EAAE,EAAC,oBAAoB,gBAAE,IAAI,CAAC,iBAAiB,IAAQ,GAC7D,EACJ,sBACI,0BAAG,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,EAAC,cAAc,gBACjC,GAAG,CAAC,sBAAsB,CAAC,IAC5B,GACJ,IACH,EACL,yBACI,sBAAI,GAAG,CAAC,sBAAsB,CAAC,GAAK,EACpC,
|
|
1
|
+
{"version":3,"file":"LoginConfigTotp.js","sourceRoot":"","sources":["../../src/login/pages/LoginConfigTotp.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "keycloakify",
|
|
3
|
-
"version": "11.3.
|
|
3
|
+
"version": "11.3.29",
|
|
4
4
|
"description": "Framework to create custom Keycloak UIs",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -867,6 +867,7 @@
|
|
|
867
867
|
"src/tools/clsx_withTransform.ts",
|
|
868
868
|
"src/tools/deepAssign.ts",
|
|
869
869
|
"src/tools/emailRegExp.ts",
|
|
870
|
+
"src/tools/extractLastParenthesisContent.ts",
|
|
870
871
|
"src/tools/formatNumber.ts",
|
|
871
872
|
"src/tools/pathBasename.ts",
|
|
872
873
|
"src/tools/structuredCloneButFunctions.ts",
|
|
@@ -975,6 +976,9 @@
|
|
|
975
976
|
"tools/emailRegExp.d.ts",
|
|
976
977
|
"tools/emailRegExp.js",
|
|
977
978
|
"tools/emailRegExp.js.map",
|
|
979
|
+
"tools/extractLastParenthesisContent.d.ts",
|
|
980
|
+
"tools/extractLastParenthesisContent.js",
|
|
981
|
+
"tools/extractLastParenthesisContent.js.map",
|
|
978
982
|
"tools/formatNumber.d.ts",
|
|
979
983
|
"tools/formatNumber.js",
|
|
980
984
|
"tools/formatNumber.js.map",
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import "keycloakify/tools/Object.fromEntries";
|
|
2
2
|
import { assert, is } from "tsafe/assert";
|
|
3
|
+
import { extractLastParenthesisContent } from "keycloakify/tools/extractLastParenthesisContent";
|
|
3
4
|
import messages_defaultSet_fallbackLanguage from "../messages_defaultSet/en";
|
|
4
5
|
import { fetchMessages_defaultSet } from "../messages_defaultSet";
|
|
5
6
|
import type { KcContext } from "../../KcContext";
|
|
@@ -168,12 +169,10 @@ export function createGetI18n<
|
|
|
168
169
|
break from_server;
|
|
169
170
|
}
|
|
170
171
|
|
|
171
|
-
|
|
172
|
-
// from "Espagnol (Español)" we want to extract "Español"
|
|
173
|
-
const match = supportedEntry.label.match(/[^(]+\(([^)]+)\)/);
|
|
172
|
+
const lastParenthesisContent = extractLastParenthesisContent(supportedEntry.label);
|
|
174
173
|
|
|
175
|
-
if (
|
|
176
|
-
return
|
|
174
|
+
if (lastParenthesisContent !== undefined) {
|
|
175
|
+
return lastParenthesisContent;
|
|
177
176
|
}
|
|
178
177
|
|
|
179
178
|
return supportedEntry.label;
|
|
@@ -47,11 +47,25 @@ export function createUseI18n<
|
|
|
47
47
|
|
|
48
48
|
function renderHtmlString(params: { htmlString: string; msgKey: string }): JSX.Element {
|
|
49
49
|
const { htmlString, msgKey } = params;
|
|
50
|
+
|
|
51
|
+
const htmlString_sanitized = kcSanitize(htmlString);
|
|
52
|
+
|
|
53
|
+
const Element = (() => {
|
|
54
|
+
if (htmlString_sanitized.includes("<") && htmlString_sanitized.includes(">")) {
|
|
55
|
+
for (const tagName of ["div", "section", "article", "ul", "ol"]) {
|
|
56
|
+
if (htmlString_sanitized.includes(`<${tagName}`)) {
|
|
57
|
+
return "div";
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return "span";
|
|
62
|
+
})();
|
|
63
|
+
|
|
50
64
|
return (
|
|
51
|
-
<
|
|
65
|
+
<Element
|
|
52
66
|
data-kc-msg={msgKey}
|
|
53
67
|
dangerouslySetInnerHTML={{
|
|
54
|
-
__html:
|
|
68
|
+
__html: htmlString_sanitized
|
|
55
69
|
}}
|
|
56
70
|
/>
|
|
57
71
|
);
|
|
@@ -83,7 +97,7 @@ export function createUseI18n<
|
|
|
83
97
|
})();
|
|
84
98
|
|
|
85
99
|
add_style: {
|
|
86
|
-
const attributeName = "data-kc-
|
|
100
|
+
const attributeName = "data-kc-msg";
|
|
87
101
|
|
|
88
102
|
// Check if already exists in head
|
|
89
103
|
if (document.querySelector(`style[${attributeName}]`) !== null) {
|
|
@@ -92,7 +106,7 @@ export function createUseI18n<
|
|
|
92
106
|
|
|
93
107
|
const styleElement = document.createElement("style");
|
|
94
108
|
styleElement.attributes.setNamedItem(document.createAttribute(attributeName));
|
|
95
|
-
styleElement.textContent = `[
|
|
109
|
+
styleElement.textContent = `div[${attributeName}] { display: inline-block; }`;
|
|
96
110
|
document.head.prepend(styleElement);
|
|
97
111
|
}
|
|
98
112
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import "keycloakify/tools/Object.fromEntries";
|
|
2
2
|
import { assert, is } from "tsafe/assert";
|
|
3
|
+
import { extractLastParenthesisContent } from "keycloakify/tools/extractLastParenthesisContent";
|
|
3
4
|
import messages_defaultSet_fallbackLanguage from "../messages_defaultSet/en";
|
|
4
5
|
import { fetchMessages_defaultSet } from "../messages_defaultSet";
|
|
5
6
|
import type { KcContext } from "../../KcContext";
|
|
@@ -168,12 +169,10 @@ export function createGetI18n<
|
|
|
168
169
|
break from_server;
|
|
169
170
|
}
|
|
170
171
|
|
|
171
|
-
|
|
172
|
-
// from "Espagnol (Español)" we want to extract "Español"
|
|
173
|
-
const match = supportedEntry.label.match(/[^(]+\(([^)]+)\)/);
|
|
172
|
+
const lastParenthesisContent = extractLastParenthesisContent(supportedEntry.label);
|
|
174
173
|
|
|
175
|
-
if (
|
|
176
|
-
return
|
|
174
|
+
if (lastParenthesisContent !== undefined) {
|
|
175
|
+
return lastParenthesisContent;
|
|
177
176
|
}
|
|
178
177
|
|
|
179
178
|
return supportedEntry.label;
|
|
@@ -47,11 +47,25 @@ export function createUseI18n<
|
|
|
47
47
|
|
|
48
48
|
function renderHtmlString(params: { htmlString: string; msgKey: string }): JSX.Element {
|
|
49
49
|
const { htmlString, msgKey } = params;
|
|
50
|
+
|
|
51
|
+
const htmlString_sanitized = kcSanitize(htmlString);
|
|
52
|
+
|
|
53
|
+
const Element = (() => {
|
|
54
|
+
if (htmlString_sanitized.includes("<") && htmlString_sanitized.includes(">")) {
|
|
55
|
+
for (const tagName of ["div", "section", "article", "ul", "ol"]) {
|
|
56
|
+
if (htmlString_sanitized.includes(`<${tagName}`)) {
|
|
57
|
+
return "div";
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return "span";
|
|
62
|
+
})();
|
|
63
|
+
|
|
50
64
|
return (
|
|
51
|
-
<
|
|
65
|
+
<Element
|
|
52
66
|
data-kc-msg={msgKey}
|
|
53
67
|
dangerouslySetInnerHTML={{
|
|
54
|
-
__html:
|
|
68
|
+
__html: htmlString_sanitized
|
|
55
69
|
}}
|
|
56
70
|
/>
|
|
57
71
|
);
|
|
@@ -83,7 +97,7 @@ export function createUseI18n<
|
|
|
83
97
|
})();
|
|
84
98
|
|
|
85
99
|
add_style: {
|
|
86
|
-
const attributeName = "data-kc-
|
|
100
|
+
const attributeName = "data-kc-msg";
|
|
87
101
|
|
|
88
102
|
// Check if already exists in head
|
|
89
103
|
if (document.querySelector(`style[${attributeName}]`) !== null) {
|
|
@@ -92,7 +106,7 @@ export function createUseI18n<
|
|
|
92
106
|
|
|
93
107
|
const styleElement = document.createElement("style");
|
|
94
108
|
styleElement.attributes.setNamedItem(document.createAttribute(attributeName));
|
|
95
|
-
styleElement.textContent = `[
|
|
109
|
+
styleElement.textContent = `div[${attributeName}] { display: inline-block; }`;
|
|
96
110
|
document.head.prepend(styleElement);
|
|
97
111
|
}
|
|
98
112
|
|
|
@@ -52,28 +52,26 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
|
|
|
52
52
|
</li>
|
|
53
53
|
<li>
|
|
54
54
|
<p>{msg("loginTotpManualStep3")}</p>
|
|
55
|
-
<
|
|
56
|
-
<
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
55
|
+
<ul>
|
|
56
|
+
<li id="kc-totp-type">
|
|
57
|
+
{msg("loginTotpType")}: {msg(`loginTotp.${totp.policy.type}`)}
|
|
58
|
+
</li>
|
|
59
|
+
<li id="kc-totp-algorithm">
|
|
60
|
+
{msg("loginTotpAlgorithm")}: {totp.policy.getAlgorithmKey()}
|
|
61
|
+
</li>
|
|
62
|
+
<li id="kc-totp-digits">
|
|
63
|
+
{msg("loginTotpDigits")}: {totp.policy.digits}
|
|
64
|
+
</li>
|
|
65
|
+
{totp.policy.type === "totp" ? (
|
|
66
|
+
<li id="kc-totp-period">
|
|
67
|
+
{msg("loginTotpInterval")}: {totp.policy.period}
|
|
62
68
|
</li>
|
|
63
|
-
|
|
64
|
-
|
|
69
|
+
) : (
|
|
70
|
+
<li id="kc-totp-counter">
|
|
71
|
+
{msg("loginTotpCounter")}: {totp.policy.initialCounter}
|
|
65
72
|
</li>
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
{msg("loginTotpInterval")}: {totp.policy.period}
|
|
69
|
-
</li>
|
|
70
|
-
) : (
|
|
71
|
-
<li id="kc-totp-counter">
|
|
72
|
-
{msg("loginTotpCounter")}: {totp.policy.initialCounter}
|
|
73
|
-
</li>
|
|
74
|
-
)}
|
|
75
|
-
</ul>
|
|
76
|
-
</p>
|
|
73
|
+
)}
|
|
74
|
+
</ul>
|
|
77
75
|
</li>
|
|
78
76
|
</>
|
|
79
77
|
) : (
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* "Hello (world)" => "world"
|
|
3
|
+
* "Hello (world) (foo)" => "foo"
|
|
4
|
+
* "Hello (world (foo))" => "world (foo)"
|
|
5
|
+
*/
|
|
6
|
+
export function extractLastParenthesisContent(str: string): string | undefined {
|
|
7
|
+
const chars: string[] = [];
|
|
8
|
+
|
|
9
|
+
for (const char of str) {
|
|
10
|
+
chars.push(char);
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
const extractedChars: string[] = [];
|
|
14
|
+
let openingCount = 0;
|
|
15
|
+
|
|
16
|
+
loop_through_char: for (let i = chars.length - 1; i >= 0; i--) {
|
|
17
|
+
const char = chars[i];
|
|
18
|
+
|
|
19
|
+
if (i === chars.length - 1) {
|
|
20
|
+
if (char !== ")") {
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
continue;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
switch (char) {
|
|
28
|
+
case ")":
|
|
29
|
+
openingCount++;
|
|
30
|
+
break;
|
|
31
|
+
case "(":
|
|
32
|
+
if (openingCount === 0) {
|
|
33
|
+
return extractedChars.join("");
|
|
34
|
+
}
|
|
35
|
+
openingCount--;
|
|
36
|
+
break;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
extractedChars.unshift(char);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
return undefined;
|
|
43
|
+
}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* "Hello (world)" => "world"
|
|
3
|
+
* "Hello (world) (foo)" => "foo"
|
|
4
|
+
* "Hello (world (foo))" => "world (foo)"
|
|
5
|
+
*/
|
|
6
|
+
export function extractLastParenthesisContent(str) {
|
|
7
|
+
const chars = [];
|
|
8
|
+
for (const char of str) {
|
|
9
|
+
chars.push(char);
|
|
10
|
+
}
|
|
11
|
+
const extractedChars = [];
|
|
12
|
+
let openingCount = 0;
|
|
13
|
+
loop_through_char: for (let i = chars.length - 1; i >= 0; i--) {
|
|
14
|
+
const char = chars[i];
|
|
15
|
+
if (i === chars.length - 1) {
|
|
16
|
+
if (char !== ")") {
|
|
17
|
+
return undefined;
|
|
18
|
+
}
|
|
19
|
+
continue;
|
|
20
|
+
}
|
|
21
|
+
switch (char) {
|
|
22
|
+
case ")":
|
|
23
|
+
openingCount++;
|
|
24
|
+
break;
|
|
25
|
+
case "(":
|
|
26
|
+
if (openingCount === 0) {
|
|
27
|
+
return extractedChars.join("");
|
|
28
|
+
}
|
|
29
|
+
openingCount--;
|
|
30
|
+
break;
|
|
31
|
+
}
|
|
32
|
+
extractedChars.unshift(char);
|
|
33
|
+
}
|
|
34
|
+
return undefined;
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=extractLastParenthesisContent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"extractLastParenthesisContent.js","sourceRoot":"","sources":["../src/tools/extractLastParenthesisContent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,6BAA6B,CAAC,GAAW;IACrD,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE;QACpB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACpB;IAED,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,iBAAiB,EAAE,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3D,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAEtB,IAAI,CAAC,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,IAAI,IAAI,KAAK,GAAG,EAAE;gBACd,OAAO,SAAS,CAAC;aACpB;YAED,SAAS;SACZ;QAED,QAAQ,IAAI,EAAE;YACV,KAAK,GAAG;gBACJ,YAAY,EAAE,CAAC;gBACf,MAAM;YACV,KAAK,GAAG;gBACJ,IAAI,YAAY,KAAK,CAAC,EAAE;oBACpB,OAAO,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBAClC;gBACD,YAAY,EAAE,CAAC;gBACf,MAAM;SACb;QAED,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KAChC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC"}
|