keycloakify 10.0.0-rc.77 → 10.0.0-rc.79

package/login/lib/useDownloadTerms.d.ts

@@ -1,4 +1,5 @@
-export type KcContextLike = {
+/// <reference types="react" />
+export type KcContextLike_useDownloadTerms = {
     pageId: string;
     locale?: {
         currentLanguageTag: string;
@@ -7,7 +8,7 @@ export type KcContextLike = {
 };
 /** Allow to avoid bundling the terms and download it on demand*/
 export declare function useDownloadTerms(params: {
-    kcContext: KcContextLike;
+    kcContext: KcContextLike_useDownloadTerms;
     downloadTermsMarkdown: (params: {
         currentLanguageTag: string;
     }) => Promise<{
@@ -17,10 +18,10 @@ export declare function useDownloadTerms(params: {
 }): void;
 export declare function useTermsMarkdown(): {
     isDownloadComplete: false;
+    ReactMarkdown?: undefined;
     termsMarkdown?: undefined;
-    termsLanguageTag?: undefined;
 } | {
     isDownloadComplete: boolean;
+    ReactMarkdown: (props: Readonly<import("react-markdown/lib").Options>) => JSX.Element;
     termsMarkdown: string;
-    termsLanguageTag: string | undefined;
 };

package/login/lib/useDownloadTerms.js

@@ -1,3 +1,5 @@
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState, useEffect } from "react";
 import { fallbackLanguageTag } from "../../login/i18n";
 import { assert } from "tsafe/assert";
 import { createStatefulObservable, useRerenderOnChange } from "../../tools/StatefulObservable";
@@ -10,9 +12,28 @@ export function useDownloadTerms(params) {
     useOnFistMount(async () => {
         var _a, _b;
         if (kcContext.pageId === "terms.ftl" || kcContext.termsAcceptanceRequired) {
-            obs.current = await downloadTermsMarkdown({
-                currentLanguageTag: (_b = (_a = kcContext.locale) === null || _a === void 0 ? void 0 : _a.currentLanguageTag) !== null && _b !== void 0 ? _b : fallbackLanguageTag
-            });
+            const currentLanguageTag = (_b = (_a = kcContext.locale) === null || _a === void 0 ? void 0 : _a.currentLanguageTag) !== null && _b !== void 0 ? _b : fallbackLanguageTag;
+            const [ReactMarkdown_base, { termsMarkdown, termsLanguageTag }] = await Promise.all([
+                import("../../tools/react-markdown").then(_ => _.default),
+                downloadTermsMarkdown({ currentLanguageTag })
+            ]);
+            const htmlLang = termsLanguageTag !== currentLanguageTag ? termsLanguageTag : undefined;
+            const ReactMarkdown = htmlLang === undefined
+                ? ReactMarkdown_base
+                : props => {
+                    const [anchor, setAnchor] = useState(null);
+                    useEffect(() => {
+                        if (anchor === null) {
+                            return;
+                        }
+                        const parent = anchor.parentElement;
+                        assert(parent !== null);
+                        parent.setAttribute("lang", htmlLang);
+                        anchor.remove();
+                    }, [anchor]);
+                    return (_jsxs(_Fragment, { children: [_jsx(ReactMarkdown_base, Object.assign({}, props)), _jsx("div", { ref: setAnchor, style: { display: "none" }, "aria-hidden": true })] }));
+                };
+            obs.current = { ReactMarkdown, termsMarkdown };
         }
     });
 }
@@ -21,7 +42,7 @@ export function useTermsMarkdown() {
     if (obs.current === undefined) {
         return { isDownloadComplete: false };
     }
-    const { termsMarkdown, termsLanguageTag } = obs.current;
-    return { isDownloadComplete: true, termsMarkdown, termsLanguageTag };
+    const { ReactMarkdown, termsMarkdown } = obs.current;
+    return { isDownloadComplete: true, ReactMarkdown, termsMarkdown };
 }
 //# sourceMappingURL=useDownloadTerms.js.map

package/login/lib/useDownloadTerms.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDownloadTerms.js","sourceRoot":"","sources":["../../src/login/lib/useDownloadTerms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EACH,wBAAwB,EACxB,mBAAmB,EACtB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAGnE,MAAM,GAAG,GAAG,wBAAwB,CAMlC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;AAUnB,MAAM,EAAkD,CAAC;AAEzD,iEAAiE;AACjE,MAAM,UAAU,gBAAgB,CAAC,MAKhC;IACG,MAAM,EAAE,SAAS,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAAC;IAEpD,cAAc,CAAC,KAAK,IAAI,EAAE;;QACtB,IAAI,SAAS,CAAC,MAAM,KAAK,WAAW,IAAI,SAAS,CAAC,uBAAuB,EAAE;YACvE,GAAG,CAAC,OAAO,GAAG,MAAM,qBAAqB,CAAC;gBACtC,kBAAkB,EACd,MAAA,MAAA,SAAS,CAAC,MAAM,0CAAE,kBAAkB,mCAAI,mBAAmB;aAClE,CAAC,CAAC;SACN;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC5B,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAEzB,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS,EAAE;QAC3B,OAAO,EAAE,kBAAkB,EAAE,KAAc,EAAE,CAAC;KACjD;IAED,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IAExD,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC;AACzE,CAAC"}
+{"version":3,"file":"useDownloadTerms.js","sourceRoot":"","sources":["../../src/login/lib/useDownloadTerms.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AACrG,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAInE,MAAM,GAAG,GAAG,wBAAwB,CAMlC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;AAUnB,MAAM,EAAmE,CAAC;AAE1E,iEAAiE;AACjE,MAAM,UAAU,gBAAgB,CAAC,MAGhC;IACG,MAAM,EAAE,SAAS,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAAC;IAEpD,cAAc,CAAC,KAAK,IAAI,EAAE;;QACtB,IAAI,SAAS,CAAC,MAAM,KAAK,WAAW,IAAI,SAAS,CAAC,uBAAuB,EAAE;YACvE,MAAM,kBAAkB,GAAG,MAAA,MAAA,SAAS,CAAC,MAAM,0CAAE,kBAAkB,mCAAI,mBAAmB,CAAC;YAEvF,MAAM,CAAC,kBAAkB,EAAE,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChF,MAAM,CAAC,4BAA4B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;gBACzD,qBAAqB,CAAC,EAAE,kBAAkB,EAAE,CAAC;aACvC,CAAC,CAAC;YAEZ,MAAM,QAAQ,GAAG,gBAAgB,KAAK,kBAAkB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC;YAExF,MAAM,aAAa,GACf,QAAQ,KAAK,SAAS;gBAClB,CAAC,CAAC,kBAAkB;gBACpB,CAAC,CAAC,KAAK,CAAC,EAAE;oBACJ,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAwB,IAAI,CAAC,CAAC;oBAElE,SAAS,CAAC,GAAG,EAAE;wBACX,IAAI,MAAM,KAAK,IAAI,EAAE;4BACjB,OAAO;yBACV;wBAED,MAAM,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC;wBAEpC,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;wBAExB,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;wBAEtC,MAAM,CAAC,MAAM,EAAE,CAAC;oBACpB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;oBAEb,OAAO,CACH,8BACI,KAAC,kBAAkB,oBAAK,KAAK,EAAI,EACjC,cAAK,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAgB,IAChE,CACN,CAAC;gBACN,CAAC,CAAC;YAEZ,GAAG,CAAC,OAAO,GAAG,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC;SAClD;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC5B,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAEzB,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS,EAAE;QAC3B,OAAO,EAAE,kBAAkB,EAAE,KAAc,EAAE,CAAC;KACjD;IAED,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;IAErD,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC;AACtE,CAAC"}

package/login/pages/Register.js

@@ -1,6 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState } from "react";
-import { Markdown } from "../../tools/Markdown";
 import { useTermsMarkdown } from "../../login/lib/useDownloadTerms";
 import { getKcClsx } from "../../login/lib/kcClsx";
 export default function Register(props) {
@@ -16,12 +15,14 @@ export default function Register(props) {
 }
 function TermsAcceptance(props) {
     const { i18n, kcClsx, messagesPerField } = props;
-    const { msg } = i18n;
-    // NOTE: Refer to https://docs.keycloakify.dev/terms-and-conditions to load your terms and conditions.
-    const { termsMarkdown } = useTermsMarkdown();
-    if (termsMarkdown === undefined) {
+    const { msg, msgStr } = i18n;
+    return (_jsxs(_Fragment, { children: [_jsx("div", Object.assign({ className: "form-group" }, { children: _jsxs("div", Object.assign({ className: kcClsx("kcInputWrapperClass") }, { children: [msg("termsTitle"), _jsx("div", Object.assign({ id: "kc-registration-terms-text" }, { children: msgStr("termsText") ? msg("termsText") : _jsx(TermsMarkdown, {}) }))] })) })), _jsxs("div", Object.assign({ className: "form-group" }, { children: [_jsxs("div", Object.assign({ className: kcClsx("kcLabelWrapperClass") }, { children: [_jsx("input", { type: "checkbox", id: "termsAccepted", name: "termsAccepted", className: kcClsx("kcCheckboxInputClass"), "aria-invalid": messagesPerField.existsError("termsAccepted") }), _jsx("label", Object.assign({ htmlFor: "termsAccepted", className: kcClsx("kcLabelClass") }, { children: msg("acceptTerms") }))] })), messagesPerField.existsError("termsAccepted") && (_jsx("div", Object.assign({ className: kcClsx("kcLabelWrapperClass") }, { children: _jsx("span", Object.assign({ id: "input-error-terms-accepted", className: kcClsx("kcInputErrorMessageClass"), "aria-live": "polite" }, { children: messagesPerField.get("termsAccepted") })) })))] }))] }));
+}
+function TermsMarkdown() {
+    const { isDownloadComplete, termsMarkdown, ReactMarkdown } = useTermsMarkdown();
+    if (!isDownloadComplete) {
         return null;
     }
-    return (_jsxs(_Fragment, { children: [_jsx("div", Object.assign({ className: "form-group" }, { children: _jsxs("div", Object.assign({ className: kcClsx("kcInputWrapperClass") }, { children: [msg("termsTitle"), _jsx("div", Object.assign({ id: "kc-registration-terms-text" }, { children: _jsx(Markdown, { children: termsMarkdown }) }))] })) })), _jsxs("div", Object.assign({ className: "form-group" }, { children: [_jsxs("div", Object.assign({ className: kcClsx("kcLabelWrapperClass") }, { children: [_jsx("input", { type: "checkbox", id: "termsAccepted", name: "termsAccepted", className: kcClsx("kcCheckboxInputClass"), "aria-invalid": messagesPerField.existsError("termsAccepted") }), _jsx("label", Object.assign({ htmlFor: "termsAccepted", className: kcClsx("kcLabelClass") }, { children: msg("acceptTerms") }))] })), messagesPerField.existsError("termsAccepted") && (_jsx("div", Object.assign({ className: kcClsx("kcLabelWrapperClass") }, { children: _jsx("span", Object.assign({ id: "input-error-terms-accepted", className: kcClsx("kcInputErrorMessageClass"), "aria-live": "polite" }, { children: messagesPerField.get("termsAccepted") })) })))] }))] }));
+    return _jsx(ReactMarkdown, { children: termsMarkdown });
 }
 //# sourceMappingURL=Register.js.map

package/login/pages/Register.js.map

@@ -1 +1 @@
-{"version":3,"file":"Register.js","sourceRoot":"","sources":["../../src/login/pages/Register.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Register.js","sourceRoot":"","sources":["../../src/login/pages/Register.tsx"],"names":[],"mappings":"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"}

package/login/pages/Terms.d.ts

@@ -4,4 +4,4 @@ import type { KcContext } from "../KcContext";
 import type { I18n } from "../i18n";
 export default function Terms(props: PageProps<Extract<KcContext, {
     pageId: "terms.ftl";
-}>, I18n>): JSX.Element | null;
+}>, I18n>): JSX.Element;

package/login/pages/Terms.js

@@ -1,5 +1,4 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Markdown } from "../../tools/Markdown";
 import { getKcClsx } from "../../login/lib/kcClsx";
 import { useTermsMarkdown } from "../../login/lib/useDownloadTerms";
 export default function Terms(props) {
@@ -9,11 +8,14 @@ export default function Terms(props) {
         classes
     });
     const { msg, msgStr } = i18n;
-    const { locale, url } = kcContext;
-    const { isDownloadComplete, termsMarkdown, termsLanguageTag } = useTermsMarkdown();
+    const { url } = kcContext;
+    return (_jsxs(Template, Object.assign({ kcContext: kcContext, i18n: i18n, doUseDefaultCss: doUseDefaultCss, classes: classes, displayMessage: false, headerNode: msg("termsTitle") }, { children: [_jsx("div", Object.assign({ id: "kc-terms-text" }, { children: msgStr("termsText") ? msg("termsText") : _jsx(TermsMarkdown, {}) })), _jsxs("form", Object.assign({ className: "form-actions", action: url.loginAction, method: "POST" }, { children: [_jsx("input", { className: kcClsx("kcButtonClass", "kcButtonClass", "kcButtonClass", "kcButtonPrimaryClass", "kcButtonLargeClass"), name: "accept", id: "kc-accept", type: "submit", value: msgStr("doAccept") }), _jsx("input", { className: kcClsx("kcButtonClass", "kcButtonDefaultClass", "kcButtonLargeClass"), name: "cancel", id: "kc-decline", type: "submit", value: msgStr("doDecline") })] })), _jsx("div", { className: "clearfix" })] })));
+}
+function TermsMarkdown() {
+    const { isDownloadComplete, termsMarkdown, ReactMarkdown } = useTermsMarkdown();
     if (!isDownloadComplete) {
         return null;
     }
-    return (_jsxs(Template, Object.assign({ kcContext: kcContext, i18n: i18n, doUseDefaultCss: doUseDefaultCss, classes: classes, displayMessage: false, headerNode: msg("termsTitle") }, { children: [_jsx("div", Object.assign({ id: "kc-terms-text", lang: termsLanguageTag !== (locale === null || locale === void 0 ? void 0 : locale.currentLanguageTag) ? termsLanguageTag : undefined }, { children: _jsx(Markdown, { children: termsMarkdown }) })), _jsxs("form", Object.assign({ className: "form-actions", action: url.loginAction, method: "POST" }, { children: [_jsx("input", { className: kcClsx("kcButtonClass", "kcButtonClass", "kcButtonClass", "kcButtonPrimaryClass", "kcButtonLargeClass"), name: "accept", id: "kc-accept", type: "submit", value: msgStr("doAccept") }), _jsx("input", { className: kcClsx("kcButtonClass", "kcButtonDefaultClass", "kcButtonLargeClass"), name: "cancel", id: "kc-decline", type: "submit", value: msgStr("doDecline") })] })), _jsx("div", { className: "clearfix" })] })));
+    return _jsx(ReactMarkdown, { children: termsMarkdown });
 }
 //# sourceMappingURL=Terms.js.map

package/login/pages/Terms.js.map

@@ -1 +1 @@
-{"version":3,"file":"Terms.js","sourceRoot":"","sources":["../../src/login/pages/Terms.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAK1E,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,KAAmE;IAC7F,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,MAAM,EAAE,GAAG,IAAI,CAAC;IAE7B,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAElC,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAEnF,IAAI,CAAC,kBAAkB,EAAE;QACrB,OAAO,IAAI,CAAC;KACf;IAED,OAAO,CACH,MAAC,QAAQ,kBACL,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,KAAK,EACrB,UAAU,EAAE,GAAG,CAAC,YAAY,CAAC,iBAE7B,4BAAK,EAAE,EAAC,eAAe,EAAC,IAAI,EAAE,gBAAgB,MAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAA,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,gBACxG,KAAC,QAAQ,cAAE,aAAa,GAAY,IAClC,EACN,8BAAM,SAAS,EAAC,cAAc,EAAC,MAAM,EAAE,GAAG,CAAC,WAAW,EAAE,MAAM,EAAC,MAAM,iBACjE,gBACI,SAAS,EAAE,MAAM,CAAC,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,sBAAsB,EAAE,oBAAoB,CAAC,EAClH,IAAI,EAAC,QAAQ,EACb,EAAE,EAAC,WAAW,EACd,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,GAC3B,EACF,gBACI,SAAS,EAAE,MAAM,CAAC,eAAe,EAAE,sBAAsB,EAAE,oBAAoB,CAAC,EAChF,IAAI,EAAC,QAAQ,EACb,EAAE,EAAC,YAAY,EACf,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,GAC5B,KACC,EACP,cAAK,SAAS,EAAC,UAAU,GAAG,KACrB,CACd,CAAC;AACN,CAAC"}
+{"version":3,"file":"Terms.js","sourceRoot":"","sources":["../../src/login/pages/Terms.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAK1E,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,KAAmE;IAC7F,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,MAAM,EAAE,GAAG,IAAI,CAAC;IAE7B,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;IAE1B,OAAO,CACH,MAAC,QAAQ,kBACL,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,KAAK,EACrB,UAAU,EAAE,GAAG,CAAC,YAAY,CAAC,iBAE7B,4BAAK,EAAE,EAAC,eAAe,gBAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAC,aAAa,KAAG,IAAO,EAC1F,8BAAM,SAAS,EAAC,cAAc,EAAC,MAAM,EAAE,GAAG,CAAC,WAAW,EAAE,MAAM,EAAC,MAAM,iBACjE,gBACI,SAAS,EAAE,MAAM,CAAC,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,sBAAsB,EAAE,oBAAoB,CAAC,EAClH,IAAI,EAAC,QAAQ,EACb,EAAE,EAAC,WAAW,EACd,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,GAC3B,EACF,gBACI,SAAS,EAAE,MAAM,CAAC,eAAe,EAAE,sBAAsB,EAAE,oBAAoB,CAAC,EAChF,IAAI,EAAC,QAAQ,EACb,EAAE,EAAC,YAAY,EACf,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,GAC5B,KACC,EACP,cAAK,SAAS,EAAC,UAAU,GAAG,KACrB,CACd,CAAC;AACN,CAAC;AAED,SAAS,aAAa;IAClB,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAEhF,IAAI,CAAC,kBAAkB,EAAE;QACrB,OAAO,IAAI,CAAC;KACf;IAED,OAAO,KAAC,aAAa,cAAE,aAAa,GAAiB,CAAC;AAC1D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.77",
+    "version": "10.0.0-rc.79",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",
@@ -136,6 +136,9 @@
         "account/i18n/index.d.ts",
         "account/i18n/index.js",
         "account/i18n/index.js.map",
+        "account/i18n/useI18n.d.ts",
+        "account/i18n/useI18n.js",
+        "account/i18n/useI18n.js.map",
         "account/index.d.ts",
         "account/index.js",
         "account/index.js.map",
@@ -289,6 +292,9 @@
         "login/i18n/index.d.ts",
         "login/i18n/index.js",
         "login/i18n/index.js.map",
+        "login/i18n/useI18n.d.ts",
+        "login/i18n/useI18n.js",
+        "login/i18n/useI18n.js.map",
         "login/index.d.ts",
         "login/index.js",
         "login/index.js.map",
@@ -444,6 +450,7 @@
         "src/account/i18n/baseMessages/zh-CN.ts",
         "src/account/i18n/i18n.tsx",
         "src/account/i18n/index.ts",
+        "src/account/i18n/useI18n.ts",
         "src/account/index.ts",
         "src/account/lib/kcClsx.ts",
         "src/account/pages/Account.tsx",
@@ -572,9 +579,10 @@
         "src/login/i18n/baseMessages/zh-CN.ts",
         "src/login/i18n/i18n.tsx",
         "src/login/i18n/index.ts",
+        "src/login/i18n/useI18n.ts",
         "src/login/index.ts",
         "src/login/lib/kcClsx.ts",
-        "src/login/lib/useDownloadTerms.ts",
+        "src/login/lib/useDownloadTerms.tsx",
         "src/login/lib/useUserProfileForm.tsx",
         "src/login/pages/Code.tsx",
         "src/login/pages/DeleteAccountConfirm.tsx",
@@ -616,7 +624,6 @@
         "src/tools/ExtractAfterStartingWith.ts",
         "src/tools/HTMLElement.prototype.prepend.ts",
         "src/tools/LazyOrNot.ts",
-        "src/tools/Markdown.ts",
         "src/tools/Object.fromEntries.ts",
         "src/tools/StatefulObservable/README.md",
         "src/tools/StatefulObservable/StatefulObservable.ts",
@@ -632,6 +639,7 @@
         "src/tools/emailRegExp.ts",
         "src/tools/formatNumber.ts",
         "src/tools/pathBasename.ts",
+        "src/tools/react-markdown.ts",
         "src/tools/structuredCloneButFunctions.ts",
         "src/tools/useConst.ts",
         "src/tools/useConstCallback.ts",
@@ -699,9 +707,6 @@
         "tools/LazyOrNot.d.ts",
         "tools/LazyOrNot.js",
         "tools/LazyOrNot.js.map",
-        "tools/Markdown.d.ts",
-        "tools/Markdown.js",
-        "tools/Markdown.js.map",
         "tools/Object.fromEntries.d.ts",
         "tools/Object.fromEntries.js",
         "tools/Object.fromEntries.js.map",
@@ -744,6 +749,9 @@
         "tools/pathBasename.d.ts",
         "tools/pathBasename.js",
         "tools/pathBasename.js.map",
+        "tools/react-markdown.d.ts",
+        "tools/react-markdown.js",
+        "tools/react-markdown.js.map",
         "tools/structuredCloneButFunctions.d.ts",
         "tools/structuredCloneButFunctions.js",
         "tools/structuredCloneButFunctions.js.map",
@@ -824,7 +832,7 @@
         "react": "*"
     },
     "dependencies": {
-        "react-markdown": "^5.0.3",
+        "react-markdown": "^9.0.1",
         "tsafe": "^1.6.6"
     },
     "devDependencies": {

package/src/account/Template.tsx

@@ -13,7 +13,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
 
     const { kcClsx } = getKcClsx({ doUseDefaultCss, classes });
 
-    const { msg, msgStr, getChangeLocalUrl, labelBySupportedLanguageTag, currentLanguageTag } = i18n;
+    const { msg, msgStr, getChangeLocaleUrl, labelBySupportedLanguageTag, currentLanguageTag } = i18n;
 
     const { locale, url, features, realm, message, referrer } = kcContext;
 
@@ -79,7 +79,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
                                             <ul>
                                                 {locale.supported.map(({ languageTag }) => (
                                                     <li key={languageTag} className="kc-dropdown-item">
-                                                        <a href={getChangeLocalUrl(languageTag)}>{labelBySupportedLanguageTag[languageTag]}</a>
+                                                        <a href={getChangeLocaleUrl(languageTag)}>{labelBySupportedLanguageTag[languageTag]}</a>
                                                     </li>
                                                 ))}
                                             </ul>

package/src/account/i18n/i18n.tsx

@@ -1,10 +1,8 @@
 import "keycloakify/tools/Object.fromEntries";
-import { useEffect, useState } from "react";
 import { assert } from "tsafe/assert";
 import messages_fallbackLanguage from "./baseMessages/en";
 import { getMessages } from "./baseMessages";
 import type { KcContext } from "../KcContext";
-import { Reflect } from "tsafe/Reflect";
 
 export const fallbackLanguageTag = "en";
 
@@ -30,7 +28,7 @@ export type GenericI18n<MessageKey extends string> = {
      * Redirect to this url to change the language.
      * After reload currentLanguageTag === newLanguageTag
      */
-    getChangeLocalUrl: (newLanguageTag: string) => string;
+    getChangeLocaleUrl: (newLanguageTag: string) => string;
     /**
      * e.g. "en" => "English", "fr" => "Français", ...
      *
@@ -88,7 +86,9 @@ export type GenericI18n<MessageKey extends string> = {
     isFetchingTranslations: boolean;
 };
 
-function createGetI18n<ExtraMessageKey extends string = never>(extraMessages: { [languageTag: string]: { [key in ExtraMessageKey]: string } }) {
+export function createGetI18n<ExtraMessageKey extends string = never>(messageBundle: {
+    [languageTag: string]: { [key in ExtraMessageKey]: string };
+}) {
     type I18n = GenericI18n<MessageKey | ExtraMessageKey>;
 
     type Result = { i18n: I18n; prI18n_currentLanguage: Promise<I18n> | undefined };
@@ -108,9 +108,9 @@ function createGetI18n<ExtraMessageKey extends string = never>(extraMessages: {
             return cachedResult;
         }
 
-        const partialI18n: Pick<I18n, "currentLanguageTag" | "getChangeLocalUrl" | "labelBySupportedLanguageTag"> = {
+        const partialI18n: Pick<I18n, "currentLanguageTag" | "getChangeLocaleUrl" | "labelBySupportedLanguageTag"> = {
             currentLanguageTag: kcContext.locale?.currentLanguageTag ?? fallbackLanguageTag,
-            getChangeLocalUrl: newLanguageTag => {
+            getChangeLocaleUrl: newLanguageTag => {
                 const { locale } = kcContext;
 
                 assert(locale !== undefined, "Internationalization not enabled");
@@ -126,8 +126,8 @@ function createGetI18n<ExtraMessageKey extends string = never>(extraMessages: {
 
         const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey, ExtraMessageKey>({
             messages_fallbackLanguage,
-            extraMessages_fallbackLanguage: extraMessages[fallbackLanguageTag],
-            extraMessages: extraMessages[partialI18n.currentLanguageTag]
+            messageBundle_fallbackLanguage: messageBundle[fallbackLanguageTag],
+            messageBundle_currentLanguage: messageBundle[partialI18n.currentLanguageTag]
         });
 
         const isCurrentLanguageFallbackLanguage = partialI18n.currentLanguageTag === fallbackLanguageTag;
@@ -135,17 +135,19 @@ function createGetI18n<ExtraMessageKey extends string = never>(extraMessages: {
         const result: Result = {
             i18n: {
                 ...partialI18n,
-                ...createI18nTranslationFunctions({ messages: undefined }),
+                ...createI18nTranslationFunctions({
+                    messages_currentLanguage: isCurrentLanguageFallbackLanguage ? messages_fallbackLanguage : undefined
+                }),
                 isFetchingTranslations: !isCurrentLanguageFallbackLanguage
             },
             prI18n_currentLanguage: isCurrentLanguageFallbackLanguage
                 ? undefined
                 : (async () => {
-                      const messages = await getMessages(partialI18n.currentLanguageTag);
+                      const messages_currentLanguage = await getMessages(partialI18n.currentLanguageTag);
 
                       const i18n_currentLanguage: I18n = {
                           ...partialI18n,
-                          ...createI18nTranslationFunctions({ messages }),
+                          ...createI18nTranslationFunctions({ messages_currentLanguage }),
                           isFetchingTranslations: false
                       };
 
@@ -168,66 +170,30 @@ function createGetI18n<ExtraMessageKey extends string = never>(extraMessages: {
     return { getI18n };
 }
 
-export function createUseI18n<ExtraMessageKey extends string = never>(extraMessages: {
-    [languageTag: string]: { [key in ExtraMessageKey]: string };
-}) {
-    type I18n = GenericI18n<MessageKey | ExtraMessageKey>;
-
-    const { getI18n } = createGetI18n(extraMessages);
-
-    function useI18n(params: { kcContext: KcContextLike }): { i18n: I18n } {
-        const { kcContext } = params;
-
-        const { i18n, prI18n_currentLanguage } = getI18n({ kcContext });
-
-        const [i18n_toReturn, setI18n_toReturn] = useState<I18n>(i18n);
-
-        useEffect(() => {
-            let isActive = true;
-
-            prI18n_currentLanguage?.then(i18n => {
-                if (!isActive) {
-                    return;
-                }
-
-                setI18n_toReturn(i18n);
-            });
-
-            return () => {
-                isActive = false;
-            };
-        }, []);
-
-        return { i18n: i18n_toReturn };
-    }
-
-    return { useI18n, ofTypeI18n: Reflect<I18n>() };
-}
-
 function createI18nTranslationFunctionsFactory<MessageKey extends string, ExtraMessageKey extends string>(params: {
     messages_fallbackLanguage: Record<MessageKey, string>;
-    extraMessages_fallbackLanguage: Record<ExtraMessageKey, string> | undefined;
-    extraMessages: Partial<Record<ExtraMessageKey, string>> | undefined;
+    messageBundle_fallbackLanguage: Record<ExtraMessageKey, string> | undefined;
+    messageBundle_currentLanguage: Partial<Record<ExtraMessageKey, string>> | undefined;
 }) {
-    const { extraMessages } = params;
+    const { messageBundle_currentLanguage } = params;
 
     const messages_fallbackLanguage = {
         ...params.messages_fallbackLanguage,
-        ...params.extraMessages_fallbackLanguage
+        ...params.messageBundle_fallbackLanguage
     };
 
     function createI18nTranslationFunctions(params: {
-        messages: Partial<Record<MessageKey, string>> | undefined;
+        messages_currentLanguage: Partial<Record<MessageKey, string>> | undefined;
     }): Pick<GenericI18n<MessageKey | ExtraMessageKey>, "msg" | "msgStr" | "advancedMsg" | "advancedMsgStr"> {
-        const messages = {
-            ...params.messages,
-            ...extraMessages
+        const messages_currentLanguage = {
+            ...params.messages_currentLanguage,
+            ...messageBundle_currentLanguage
         };
 
         function resolveMsg(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): string | JSX.Element | undefined {
             const { key, args, doRenderAsHtml } = props;
 
-            const messageOrUndefined: string | undefined = (messages as any)[key] ?? (messages_fallbackLanguage as any)[key];
+            const messageOrUndefined: string | undefined = (messages_currentLanguage as any)[key] ?? (messages_fallbackLanguage as any)[key];
 
             if (messageOrUndefined === undefined) {
                 return undefined;

package/src/account/i18n/index.ts

@@ -1,5 +1,5 @@
 import type { GenericI18n, MessageKey, KcContextLike } from "./i18n";
 export type { MessageKey, KcContextLike };
 export type I18n = GenericI18n<MessageKey>;
-export { createUseI18n } from "./i18n";
+export { createUseI18n } from "./useI18n";
 export { fallbackLanguageTag } from "./i18n";

package/src/account/i18n/useI18n.ts

@@ -0,0 +1,44 @@
+import { useEffect, useState } from "react";
+import {
+    createGetI18n,
+    type GenericI18n,
+    type MessageKey,
+    type KcContextLike
+} from "./i18n";
+import { Reflect } from "tsafe/Reflect";
+
+export function createUseI18n<ExtraMessageKey extends string = never>(extraMessages: {
+    [languageTag: string]: { [key in ExtraMessageKey]: string };
+}) {
+    type I18n = GenericI18n<MessageKey | ExtraMessageKey>;
+
+    const { getI18n } = createGetI18n(extraMessages);
+
+    function useI18n(params: { kcContext: KcContextLike }): { i18n: I18n } {
+        const { kcContext } = params;
+
+        const { i18n, prI18n_currentLanguage } = getI18n({ kcContext });
+
+        const [i18n_toReturn, setI18n_toReturn] = useState<I18n>(i18n);
+
+        useEffect(() => {
+            let isActive = true;
+
+            prI18n_currentLanguage?.then(i18n => {
+                if (!isActive) {
+                    return;
+                }
+
+                setI18n_toReturn(i18n);
+            });
+
+            return () => {
+                isActive = false;
+            };
+        }, []);
+
+        return { i18n: i18n_toReturn };
+    }
+
+    return { useI18n, ofTypeI18n: Reflect<I18n>() };
+}

package/src/bin/keycloakify/generateFtl/generateFtl.ts

@@ -8,8 +8,7 @@ import { assert } from "tsafe/assert";
 import {
     type ThemeType,
     basenameOfTheKeycloakifyResourcesDir,
-    resources_common,
-    nameOfTheLocalizationRealmOverridesUserProfileProperty
+    resources_common
 } from "../../shared/constants";
 import { getThisCodebaseRootDirPath } from "../../tools/getThisCodebaseRootDirPath";
 
@@ -119,10 +118,6 @@ export function generateFtlFilesCodeFactory(params: {
         .replace("KEYCLOAKIFY_THEME_TYPE_dExKd3xEdr", themeType)
         .replace("KEYCLOAKIFY_THEME_NAME_cXxKd3xEer", themeName)
         .replace("RESOURCES_COMMON_cLsLsMrtDkpVv", resources_common)
-        .replace(
-            "lOCALIZATION_REALM_OVERRIDES_USER_PROFILE_PROPERTY_KEY_aaGLsPgGIdeeX",
-            nameOfTheLocalizationRealmOverridesUserProfileProperty
-        )
         .replace(
             "USER_DEFINED_EXCLUSIONS_eKsaY4ZsZ4eMr2",
             buildContext.kcContextExclusionsFtlCode ?? ""

package/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl

@@ -33,8 +33,9 @@ kcContext.pageId = "${pageId}";
 if( kcContext.url && kcContext.url.resourcesPath ){
     kcContext.url.resourcesCommonPath = kcContext.url.resourcesPath + "/" + "RESOURCES_COMMON_cLsLsMrtDkpVv";
 }
+kcContext["x-keycloakify"] = {};
 <#if profile?? && profile.attributes??>
-    kcContext.lOCALIZATION_REALM_OVERRIDES_USER_PROFILE_PROPERTY_KEY_aaGLsPgGIdeeX = {
+    kcContext["x-keycloakify"].realmMessageBundleUserProfile = {
         <#list profile.attributes as attribute>
             <#if attribute.annotations?? && attribute.displayName??>
                 "${attribute.displayName}": decodeHtmlEntities("${advancedMsg(attribute.displayName)?js_string}"),
@@ -61,6 +62,9 @@ if( kcContext.url && kcContext.url.resourcesPath ){
         </#list>
     };
 </#if>
+<#if pageId == "terms.ftl" || termsAcceptanceRequired?? && termsAcceptanceRequired>
+    kcContext["x-keycloakify"].realmMessageBundleTermsText= decodeHtmlEntities("${msg("termsText")?js_string}");
+</#if>
 attributes_to_attributesByName: {
     if( !kcContext.profile ){
         break attributes_to_attributesByName;
@@ -198,6 +202,9 @@ function decodeHtmlEntities(htmlStr){
                     ) || (
                         key == "execution" &&
                         are_same_path(path, [])
+                    ) || (
+                        key == "entity" &&
+                        are_same_path(path, ["user"])
                     )
                 >
                     <#-- <#local out_seq += ["/*" + path?join(".") + "." + key + " excluded*/"]> -->

package/src/bin/keycloakify/generateResources/generateMessageProperties.ts

@@ -9,6 +9,8 @@ import * as babelParser from "@babel/parser";
 import babelGenerate from "@babel/generator";
 import * as babelTypes from "@babel/types";
 import { escapeStringForPropertiesFile } from "../../tools/escapeStringForPropertiesFile";
+import { getThisCodebaseRootDirPath } from "../../tools/getThisCodebaseRootDirPath";
+import * as fs from "fs";
 
 export function generateMessageProperties(params: {
     themeSrcDirPath: string;
@@ -39,10 +41,6 @@ export function generateMessageProperties(params: {
         readFileSync(file).toString("utf8").includes("createUseI18n")
     );
 
-    if (files.length === 0) {
-        return [];
-    }
-
     const extraMessages = files
         .map(file => {
             const root = recast.parse(readFileSync(file).toString("utf8"), {
@@ -99,15 +97,28 @@ export function generateMessageProperties(params: {
             return extraMessages;
         });
 
-    const languageTags = extraMessages
-        .map(extraMessage => Object.keys(extraMessage))
-        .flat()
-        .reduce(...removeDuplicates<string>());
+    const languageTags = [
+        ...extraMessages.map(extraMessage => Object.keys(extraMessage)).flat(),
+        ...fs
+            .readdirSync(
+                pathJoin(
+                    getThisCodebaseRootDirPath(),
+                    "src",
+                    themeType,
+                    "i18n",
+                    "baseMessages"
+                )
+            )
+            .filter(baseName => baseName !== "index.ts")
+            .map(baseName => baseName.replace(/\.ts$/, ""))
+    ].reduce(...removeDuplicates<string>());
 
     const keyValueMapByLanguageTag: Record<string, Record<string, string>> = {};
 
     for (const languageTag of languageTags) {
-        const keyValueMap: Record<string, string> = {};
+        const keyValueMap: Record<string, string> = {
+            termsText: ""
+        };
 
         for (const extraMessage of extraMessages) {
             const keyValueMap_i = extraMessage[languageTag];
@@ -152,14 +163,9 @@ export function generateMessageProperties(params: {
 
         out.push({
             languageTag,
-            propertiesFileSource: [
-                "# This file was generated by keycloakify",
-                "",
-                "parent=base",
-                "",
-                propertiesFileSource,
-                ""
-            ].join("\n")
+            propertiesFileSource: ["", "parent=base", "", propertiesFileSource, ""].join(
+                "\n"
+            )
         });
     }
 

package/src/bin/shared/constants.ts

@@ -1,5 +1,3 @@
-export const nameOfTheLocalizationRealmOverridesUserProfileProperty =
-    "__localizationRealmOverridesUserProfile";
 export const keycloak_resources = "keycloak-resources";
 export const resources_common = "resources-common";
 export const lastKeycloakVersionWithAccountV1 = "21.1.2";