keycloakify 10.0.0-rc.3 → 10.0.0-rc.30

package/src/login/i18n/baseMessages/lt.ts

@@ -193,7 +193,16 @@ const messages= {
   "clientNotFoundMessage": "Nenurodytas klientas.",
   "clientDisabledMessage": "Kliento galiojimas išjungtas.",
   "invalidParameterMessage": "Neteisingas parametras: {0}",
-  "alreadyLoggedIn": "Jūs jau esate prisijungę."
+  "alreadyLoggedIn": "Jūs jau esate prisijungę.",
+  "shouldBeEqual": "{0} turėtų būti lygus {1}",
+  "shouldBeDifferent": "{0} turėtų skirtis nuo {1}",
+  "shouldMatchPattern": "Šablonas turėtų atitikti: `/{0}/`",
+  "mustBeAnInteger": "Turi būti sveikasis skaičius",
+  "notAValidOption": "Netinkama parinktis",
+  "selectAnOption": "Pasirinkite parinktį",
+  "remove": "Pašalinti",
+  "addValue": "Pridėti reikšmę",
+  "languages": "Kalbos"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/lv.ts

@@ -204,7 +204,16 @@ const messages= {
   "console-verify-email": "Jums ir jāapstiprina e-pasta adrese. E-pasts tika nosūtīts uz {0}, kas satur apstiprinājuma kodu. Lūdzu ievadiet šo kodu ievadlaukā zemāk.",
   "console-email-code": "E-pasta kods:",
   "console-accept-terms": "Piekrist noteikumiem? [y/n]:",
-  "console-accept": "y"
+  "console-accept": "y",
+  "shouldBeEqual": "{0} jābūt vienādam ar {1}",
+  "shouldBeDifferent": "{0} jābūt atšķirīgam no {1}",
+  "shouldMatchPattern": "Mustrim jāsakrīt: `/{0}/`",
+  "mustBeAnInteger": "Jābūt veselam skaitlim",
+  "notAValidOption": "Nav derīga opcija",
+  "selectAnOption": "Izvēlieties opciju",
+  "remove": "Noņemt",
+  "addValue": "Pievienot vērtību",
+  "languages": "Valodas"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/nl.ts

@@ -275,7 +275,16 @@ const messages= {
   "idp-email-verification-display-name": "E-mail Verificatie",
   "idp-email-verification-help-text": "Bevestig uw account per e-mail.",
   "idp-username-password-form-display-name": "Gebruikersnaam en wachtwoord",
-  "idp-username-password-form-help-text": "Bevestig uw account door in te loggen."
+  "idp-username-password-form-help-text": "Bevestig uw account door in te loggen.",
+  "shouldBeEqual": "{0} moet gelijk zijn aan {1}",
+  "shouldBeDifferent": "{0} moet verschillen van {1}",
+  "shouldMatchPattern": "Patroon moet overeenkomen: `/{0}/`",
+  "mustBeAnInteger": "Moet een geheel getal zijn",
+  "notAValidOption": "Geen geldige optie",
+  "selectAnOption": "Selecteer een optie",
+  "remove": "Verwijderen",
+  "addValue": "Waarde toevoegen",
+  "languages": "Talen"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/no.ts

@@ -192,7 +192,16 @@ const messages= {
   "clientNotFoundMessage": "Klient ikke funnet.",
   "clientDisabledMessage": "Klient deaktivert.",
   "invalidParameterMessage": "Ugyldig parameter: {0}",
-  "alreadyLoggedIn": "Du er allerede innlogget."
+  "alreadyLoggedIn": "Du er allerede innlogget.",
+  "shouldBeEqual": "{0} skal være lik {1}",
+  "shouldBeDifferent": "{0} skal være forskjellig fra {1}",
+  "shouldMatchPattern": "Mønsteret skal matche: `/{0}/`",
+  "mustBeAnInteger": "Må være et heltall",
+  "notAValidOption": "Ikke et gyldig alternativ",
+  "selectAnOption": "Velg et alternativ",
+  "remove": "Fjern",
+  "addValue": "Legg til verdi",
+  "languages": "Språk"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/pl.ts

@@ -282,7 +282,16 @@ const messages= {
   "console-email-code": "Kod z e-mail:",
   "console-accept-terms": "Akceptujesz warunki? [t/n]:",
   "console-accept": "t",
-  "readOnlyUsernameMessage": "Zmiana nazwy użytkownika nie jest możliwa, ponieważ edycja konta jest zablokowana."
+  "readOnlyUsernameMessage": "Zmiana nazwy użytkownika nie jest możliwa, ponieważ edycja konta jest zablokowana.",
+  "shouldBeEqual": "{0} powinno być równe {1}",
+  "shouldBeDifferent": "{0} powinno być różne od {1}",
+  "shouldMatchPattern": "Wzór pow inien pasować: `/{0}/`",
+  "mustBeAnInteger": "Musi być liczbą całkowitą",
+  "notAValidOption": "Nieprawidłowa opcja",
+  "selectAnOption": "Wybierz opcję",
+  "remove": "Usuń",
+  "addValue": "Dodaj wartość",
+  "languages": "Języki"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/pt-BR.ts

@@ -336,7 +336,16 @@ const messages= {
   "frontchannel-logout.message": "Você está saindo dos seguintes aplicativos",
   "logoutConfirmTitle": "Saindo",
   "logoutConfirmHeader": "Você realmente deseja sair?",
-  "doLogout": "Sair"
+  "doLogout": "Sair",
+  "shouldBeEqual": "{0} deve ser igual a {1}",
+  "shouldBeDifferent": "{0} deve ser diferente de {1}",
+  "shouldMatchPattern": "O padrão deve corresponder: `/{0}/`",
+  "mustBeAnInteger": "Deve ser um número inteiro",
+  "notAValidOption": "Não é uma opção válida",
+  "selectAnOption": "Selecione uma opção",
+  "remove": "Remover",
+  "addValue": "Adicionar valor",
+  "languages": "Idiomas"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/ru.ts

@@ -210,7 +210,16 @@ const messages= {
   "clientNotFoundMessage": "Клиент не найден.",
   "clientDisabledMessage": "Клиент отключен.",
   "invalidParameterMessage": "Неверный параметр: {0}",
-  "alreadyLoggedIn": "Вы уже вошли."
+  "alreadyLoggedIn": "Вы уже вошли.",
+  "shouldBeEqual": "{0} должно быть равно {1}",
+  "shouldBeDifferent": "{0} должно отличаться от {1}",
+  "shouldMatchPattern": "Шаблон должен соответствовать: `/{0}/`",
+  "mustBeAnInteger": "Должно быть целым числом",
+  "notAValidOption": "Недопустимый вариант",
+  "selectAnOption": "Выберите вариант",
+  "remove": "Удалить",
+  "addValue": "Добавить значение",
+  "languages": "Языки"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/sk.ts

@@ -437,7 +437,16 @@ const messages= {
   "logoutConfirmTitle": "Odhlásenie",
   "logoutConfirmHeader": "Chcete sa odhlásiť?",
   "doLogout": "Odhlásiť",
-  "readOnlyUsernameMessage": "Nemôžete aktualizovať svoje používateľské meno, pretože je iba na čítanie."
+  "readOnlyUsernameMessage": "Nemôžete aktualizovať svoje používateľské meno, pretože je iba na čítanie.",
+  "shouldBeEqual": "{0} by mal byť rovnaký ako {1}",
+  "shouldBeDifferent": "{0} by mal byť odlišný od {1}",
+  "shouldMatchPattern": "Vzor by mal zodpovedať: `/{0}/`",
+  "mustBeAnInteger": "Musí byť celé číslo",
+  "notAValidOption": "Nie je platná možnosť",
+  "selectAnOption": "Vyberte možnosť",
+  "remove": "Odstrániť",
+  "addValue": "Pridať hodnotu",
+  "languages": "Jazyky"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/sv.ts

@@ -191,7 +191,16 @@ const messages= {
   "clientDisabledMessage": "Klienten är inaktiverad.",
   "invalidParameterMessage": "Ogiltig parameter: {0}",
   "alreadyLoggedIn": "Du är redan inloggad.",
-  "loginAccountTitle": "Logga in till ditt konto"
+  "loginAccountTitle": "Logga in till ditt konto",
+  "shouldBeEqual": "{0} bör vara lika med {1}",
+  "shouldBeDifferent": "{0} bör vara annorlunda än {1}",
+  "shouldMatchPattern": "Mönstret bör matcha: `/{0}/`",
+  "mustBeAnInteger": "Måste vara ett heltal",
+  "notAValidOption": "Inte ett giltigt alternativ",
+  "selectAnOption": "Välj ett alternativ",
+  "remove": "Ta bort",
+  "addValue": "Lägg till värde",
+  "languages": "Språk"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/th.ts

@@ -433,7 +433,16 @@ const messages= {
   "logoutConfirmTitle": "กำลังออกจากระบบ",
   "logoutConfirmHeader": "คุณต้องการออกจากระบบหรือไม่?",
   "doLogout": "ออกจากระบบ",
-  "readOnlyUsernameMessage": "คุณไม่สามารถปรับปรุงชื่อผู้ใช้งานของคุณเนื่องจากเป็นข้อมูลแบบอ่านอย่างเดียว"
+  "readOnlyUsernameMessage": "คุณไม่สามารถปรับปรุงชื่อผู้ใช้งานของคุณเนื่องจากเป็นข้อมูลแบบอ่านอย่างเดียว",
+  "shouldBeEqual": "{0} ควรเท่ากับ {1}",
+  "shouldBeDifferent": "{0} ควรแตกต่างจาก {1}",
+  "shouldMatchPattern": "รูปแบบควรตรงกับ: `/{0}/`",
+  "mustBeAnInteger": "ต้องเป็นจำนวนเต็ม",
+  "notAValidOption": "ไม่ใช่ตัวเลือกที่ถูกต้อง",
+  "selectAnOption": "เลือกตัวเลือก",
+  "remove": "ลบ",
+  "addValue": "เพิ่มค่า",
+  "languages": "ภาษา"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/tr.ts

@@ -260,7 +260,16 @@ const messages= {
   "console-email-code": "E-posta Kodu:",
   "console-accept-terms": "Şartları kabul et? [e/h]:",
   "console-accept": "e",
-  "readOnlyUsernameMessage": "Yazma korumalı olduğundan kullanıcı adınızı değiştiremezsiniz."
+  "readOnlyUsernameMessage": "Yazma korumalı olduğundan kullanıcı adınızı değiştiremezsiniz.",
+  "shouldBeEqual": "{0} {1} eşit olmalıdır",
+  "shouldBeDifferent": "{0} {1} farklı olmalıdır",
+  "shouldMatchPattern": "Desen eşleşmelidir: `/{0}/`",
+  "mustBeAnInteger": "Tam sayı olmalıdır",
+  "notAValidOption": "Geçerli bir seçenek değil",
+  "selectAnOption": "Bir seçenek seçin",
+  "remove": "Kaldır",
+  "addValue": "Değer ekle",
+  "languages": "Diller"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/uk.ts

@@ -432,7 +432,16 @@ const messages= {
   "logoutConfirmTitle": "Вихід",
   "logoutConfirmHeader": "Ви бажаєте вийти?",
   "doLogout": "Вийти",
-  "readOnlyUsernameMessage": "Ви не можете оновити своє ім'я користувача, оскільки воно доступне лише для читання."
+  "readOnlyUsernameMessage": "Ви не можете оновити своє ім'я користувача, оскільки воно доступне лише для читання.",
+  "shouldBeEqual": "{0} повинно бути рівним {1}",
+  "shouldBeDifferent": "{0} повинно відрізнятися від {1}",
+  "shouldMatchPattern": "Шаблон повинен відповідати: `/{0}/`",
+  "mustBeAnInteger": "Повинно бути цілим числом",
+  "notAValidOption": "Не є дійсною опцією",
+  "selectAnOption": "Виберіть опцію",
+  "remove": "Видалити",
+  "addValue": "Додати значення",
+  "languages": "Мови"
 };
 
 export default messages;

package/src/login/i18n/baseMessages/zh-CN.ts

@@ -346,7 +346,7 @@ const messages= {
   "locale_nl": "Nederlands",
   "locale_no": "Norsk",
   "locale_pl": "Polski",
-  "locale_pt_BR": "Português (Brasil)",
+  "locale_pt-BR": "Português (Brasil)",
   "locale_ru": "Русский",
   "locale_sk": "Slovenčina",
   "locale_sv": "Svenska",
@@ -461,7 +461,16 @@ const messages= {
   "logoutConfirmTitle": "注销",
   "logoutConfirmHeader": "您确定要注销吗？",
   "doLogout": "注销",
-  "readOnlyUsernameMessage": "由于用户名是只读的，您无法更新用户名。"
+  "readOnlyUsernameMessage": "由于用户名是只读的，您无法更新用户名。",
+  "shouldBeEqual": "{0} 应该等于 {1}",
+  "shouldBeDifferent": "{0} 应该不同于 {1}",
+  "shouldMatchPattern": "模式应匹配: `/{0}/`",
+  "mustBeAnInteger": "必须是整数",
+  "notAValidOption": "不是有效选项",
+  "selectAnOption": "选择一个选项",
+  "remove": "移除",
+  "addValue": "添加值",
+  "languages": "语言"
 };
 
 export default messages;

package/src/login/i18n/i18n.tsx

@@ -1,11 +1,10 @@
-import "minimal-polyfills/Object.fromEntries";
-//NOTE for later: https://github.com/remarkjs/react-markdown/blob/236182ecf30bd89c1e5a7652acaf8d0bf81e6170/src/renderers.js#L7-L35
+import "keycloakify/tools/Object.fromEntries";
 import { useEffect, useState, useRef } from "react";
+import { assert } from "tsafe/assert";
 import fallbackMessages from "./baseMessages/en";
 import { getMessages } from "./baseMessages";
-import { assert } from "tsafe/assert";
-import type { KcContext } from "../kcContext/KcContext";
-import { Markdown } from "keycloakify/tools/Markdown";
+import type { KcContext } from "../KcContext";
+import { Reflect } from "tsafe/Reflect";
 
 export const fallbackLanguageTag = "en";
 
@@ -14,11 +13,12 @@ export type KcContextLike = {
         currentLanguageTag: string;
         supported: { languageTag: string; url: string; label: string }[];
     };
+    __localizationRealmOverridesUserProfile?: Record<string, string>;
 };
 
 assert<KcContext extends KcContextLike ? true : false>();
 
-export type MessageKey = keyof typeof fallbackMessages | keyof (typeof keycloakifyExtraMessages)[typeof fallbackLanguageTag];
+export type MessageKey = keyof typeof fallbackMessages;
 
 export type GenericI18n<MessageKey extends string> = {
     /**
@@ -53,16 +53,31 @@ export type GenericI18n<MessageKey extends string> = {
      */
     msgStr: (key: MessageKey, ...args: (string | undefined)[]) => string;
     /**
+     * This is meant to be used when the key argument is variable, something that might have been configured by the user
+     * in the Keycloak admin for example.
+     *
      * Examples assuming currentLanguageTag === "en"
-     * advancedMsg("${access-denied} foo bar") === <span>${msgStr("access-denied")} foo bar<span> === <span>Access denied foo bar</span>
+     * {
+     *   en: {
+     *     "access-denied": "Access denied",
+     *     "foo": "Foo {0} {1}",
+     *     "bar": "Bar {0}"
+     *   }
+     * }
+     *
+     * advancedMsg("${access-denied} foo bar") === <span>{msgStr("access-denied")} foo bar<span> === <span>Access denied foo bar</span>
      * advancedMsg("${access-denied}") === advancedMsg("access-denied") === msg("access-denied") === <span>Access denied</span>
      * advancedMsg("${not-a-message-key}") === advancedMsg(not-a-message-key") === <span>not-a-message-key</span>
+     * advancedMsg("${bar}", "<strong>c</strong>")
+     *    === <span>{msgStr("bar", "<strong>XXX</strong>")}<span>
+     *    === <span>Bar &lt;strong&gt;XXX&lt;/strong&gt;</span> (The html in the arg is partially escaped for security reasons, it might be untrusted)
+     * advancedMsg("${foo} xx ${bar}", "a", "b", "c")
+     *    === <span>{msgStr("foo", "a", "b")} xx {msgStr("bar")}<span>
+     *    === <span>Foo a b xx Bar {0}</span> (The substitution are only applied in the first message)
      */
     advancedMsg: (key: string, ...args: (string | undefined)[]) => JSX.Element;
     /**
-     * Examples assuming currentLanguageTag === "en"
-     * advancedMsg("${access-denied} foo bar") === msg("access-denied") + " foo bar" === "Access denied foo bar"
-     * advancedMsg("${not-a-message-key}") === advancedMsg(not-a-message-key") === "not-a-message-key"
+     * See advancedMsg() but instead of returning a JSX.Element it returns a string.
      */
     advancedMsgStr: (key: string, ...args: (string | undefined)[]) => string;
 };
@@ -91,19 +106,18 @@ export function createUseI18n<ExtraMessageKey extends string = never>(extraMessa
 
                 setI18n({
                     ...createI18nTranslationFunctions({
-                        "fallbackMessages": {
+                        fallbackMessages: {
                             ...fallbackMessages,
-                            ...(keycloakifyExtraMessages[fallbackLanguageTag] ?? {}),
                             ...(extraMessages[fallbackLanguageTag] ?? {})
                         } as any,
-                        "messages": {
+                        messages: {
                             ...(await getMessages(currentLanguageTag)),
-                            ...((keycloakifyExtraMessages as any)[currentLanguageTag] ?? {}),
                             ...(extraMessages[currentLanguageTag] ?? {})
-                        } as any
+                        } as any,
+                        __localizationRealmOverridesUserProfile: kcContext.__localizationRealmOverridesUserProfile
                     }),
                     currentLanguageTag,
-                    "getChangeLocalUrl": newLanguageTag => {
+                    getChangeLocalUrl: newLanguageTag => {
                         const { locale } = kcContext;
 
                         assert(locale !== undefined, "Internationalization not enabled");
@@ -114,7 +128,7 @@ export function createUseI18n<ExtraMessageKey extends string = never>(extraMessa
 
                         return targetSupportedLocale.url;
                     },
-                    "labelBySupportedLanguageTag": Object.fromEntries(
+                    labelBySupportedLanguageTag: Object.fromEntries(
                         (kcContext.locale?.supported ?? []).map(({ languageTag, label }) => [languageTag, label])
                     )
                 });
@@ -124,17 +138,21 @@ export function createUseI18n<ExtraMessageKey extends string = never>(extraMessa
         return i18n ?? null;
     }
 
-    return { useI18n };
+    return {
+        useI18n,
+        ofTypeI18n: Reflect<GenericI18n<MessageKey | ExtraMessageKey>>()
+    };
 }
 
 function createI18nTranslationFunctions<MessageKey extends string>(params: {
     fallbackMessages: Record<MessageKey, string>;
     messages: Record<MessageKey, string>;
+    __localizationRealmOverridesUserProfile: Record<string, string> | undefined;
 }): Pick<GenericI18n<MessageKey>, "msg" | "msgStr" | "advancedMsg" | "advancedMsgStr"> {
-    const { fallbackMessages, messages } = params;
+    const { fallbackMessages, messages, __localizationRealmOverridesUserProfile } = params;
 
-    function resolveMsg(props: { key: string; args: (string | undefined)[]; doRenderMarkdown: boolean }): string | JSX.Element | undefined {
-        const { key, args, doRenderMarkdown } = props;
+    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] ?? (fallbackMessages as any)[key];
 
@@ -163,70 +181,82 @@ function createI18nTranslationFunctions<MessageKey extends string>(params: {
                     return;
                 }
 
-                messageWithArgsInjected = messageWithArgsInjected.replace(new RegExp(`\\{${i + startIndex}\\}`, "g"), arg);
+                messageWithArgsInjected = messageWithArgsInjected.replace(
+                    new RegExp(`\\{${i + startIndex}\\}`, "g"),
+                    arg.replace(/</g, "&lt;").replace(/>/g, "&gt;")
+                );
             });
 
             return messageWithArgsInjected;
         })();
 
-        return doRenderMarkdown ? (
-            <Markdown allowDangerousHtml renderers={{ "paragraph": "span" }}>
-                {messageWithArgsInjectedIfAny}
-            </Markdown>
+        return doRenderAsHtml ? (
+            <span
+                // NOTE: The message is trusted. The arguments are not but are escaped.
+                dangerouslySetInnerHTML={{
+                    __html: messageWithArgsInjectedIfAny
+                }}
+            />
         ) : (
             messageWithArgsInjectedIfAny
         );
     }
 
-    function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[]; doRenderMarkdown: boolean }): JSX.Element | string {
-        const { key, args, doRenderMarkdown } = props;
+    function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): JSX.Element | string {
+        const { key, args, doRenderAsHtml } = props;
+
+        if (__localizationRealmOverridesUserProfile !== undefined && key in __localizationRealmOverridesUserProfile) {
+            const resolvedMessage = __localizationRealmOverridesUserProfile[key];
+
+            return doRenderAsHtml ? (
+                <span
+                    // NOTE: The message is trusted. The arguments are not but are escaped.
+                    dangerouslySetInnerHTML={{
+                        __html: resolvedMessage
+                    }}
+                />
+            ) : (
+                resolvedMessage
+            );
+        }
+
+        if (!/\$\{[^}]+\}/.test(key)) {
+            const resolvedMessage = resolveMsg({ key, args, doRenderAsHtml });
+
+            if (resolvedMessage === undefined) {
+                return doRenderAsHtml ? <span dangerouslySetInnerHTML={{ __html: key }} /> : key;
+            }
+
+            return resolvedMessage;
+        }
 
-        const match = key.match(/^\$\{([^{]+)\}$/);
+        let isFirstMatch = true;
 
-        const keyUnwrappedFromCurlyBraces = match === null ? key : match[1];
+        const resolvedComplexMessage = key.replace(/\$\{([^}]+)\}/g, (...[, key_i]) => {
+            const replaceBy = resolveMsg({ key: key_i, args: isFirstMatch ? args : [], doRenderAsHtml: false }) ?? key_i;
 
-        const out = resolveMsg({
-            "key": keyUnwrappedFromCurlyBraces,
-            args,
-            doRenderMarkdown
+            isFirstMatch = false;
+
+            return replaceBy;
         });
 
-        return (out !== undefined ? out : doRenderMarkdown ? <span>{keyUnwrappedFromCurlyBraces}</span> : keyUnwrappedFromCurlyBraces) as any;
+        return doRenderAsHtml ? <span dangerouslySetInnerHTML={{ __html: resolvedComplexMessage }} /> : resolvedComplexMessage;
     }
 
     return {
-        "msgStr": (key, ...args) => resolveMsg({ key, args, "doRenderMarkdown": false }) as string,
-        "msg": (key, ...args) => resolveMsg({ key, args, "doRenderMarkdown": true }) as JSX.Element,
-        "advancedMsg": (key, ...args) => resolveMsgAdvanced({ key, args, "doRenderMarkdown": true }) as JSX.Element,
-        "advancedMsgStr": (key, ...args) => resolveMsgAdvanced({ key, args, "doRenderMarkdown": false }) as string
+        msgStr: (key, ...args) => resolveMsg({ key, args, doRenderAsHtml: false }) as string,
+        msg: (key, ...args) => resolveMsg({ key, args, doRenderAsHtml: true }) as JSX.Element,
+        advancedMsg: (key, ...args) =>
+            resolveMsgAdvanced({
+                key,
+                args,
+                doRenderAsHtml: true
+            }) as JSX.Element,
+        advancedMsgStr: (key, ...args) =>
+            resolveMsgAdvanced({
+                key,
+                args,
+                doRenderAsHtml: false
+            }) as string
     };
 }
-
-const keycloakifyExtraMessages = {
-    "en": {
-        "shouldBeEqual": "{0} should be equal to {1}",
-        "shouldBeDifferent": "{0} should be different to {1}",
-        "shouldMatchPattern": "Pattern should match: `/{0}/`",
-        "mustBeAnInteger": "Must be an integer",
-        "notAValidOption": "Not a valid option",
-        "selectAnOption": "Select an option",
-        "remove": "Remove",
-        "addValue": "Add value"
-    },
-    "fr": {
-        /* spell-checker: disable */
-        "shouldBeEqual": "{0} doit être égal à {1}",
-        "shouldBeDifferent": "{0} doit être différent de {1}",
-        "shouldMatchPattern": "Dois respecter le schéma: `/{0}/`",
-        "mustBeAnInteger": "Doit être un nombre entier",
-        "notAValidOption": "N'est pas une option valide",
-
-        "logoutConfirmTitle": "Déconnexion",
-        "logoutConfirmHeader": "Êtes-vous sûr(e) de vouloir vous déconnecter ?",
-        "doLogout": "Se déconnecter",
-        "selectAnOption": "Sélectionner une option",
-        "remove": "Supprimer",
-        "addValue": "Ajouter une valeur"
-        /* spell-checker: enable */
-    }
-};

package/src/login/i18n/index.ts

@@ -1 +1,2 @@
-export type { I18n } from "./i18n";
+export type { I18n, MessageKey } from "./i18n";
+export { createUseI18n, fallbackLanguageTag } from "./i18n";

package/src/login/index.ts

@@ -1,11 +1,5 @@
-import Fallback from "keycloakify/login/Fallback";
-
-export default Fallback;
-
-export { useDownloadTerms } from "keycloakify/login/lib/useDownloadTerms";
-export { getKcContext } from "keycloakify/login/kcContext/getKcContext";
-export { createGetKcContext } from "keycloakify/login/kcContext/createGetKcContext";
-export type { LoginThemePageId as PageId } from "keycloakify/bin/keycloakify/generateFtl";
-export { createUseI18n } from "keycloakify/login/i18n/i18n";
-
+export type { ExtendKcContext, Attribute } from "keycloakify/login/KcContext";
 export type { PageProps } from "keycloakify/login/pages/PageProps";
+export { createGetKcContextMock } from "keycloakify/login/KcContext";
+export { useDownloadTerms } from "keycloakify/login/lib/useDownloadTerms";
+export { createUseI18n } from "keycloakify/login/i18n";

package/src/login/lib/useDownloadTerms.ts

@@ -1,14 +1,13 @@
-import { useEffect } from "react";
-import { memoize } from "keycloakify/tools/memoize";
-import { fallbackLanguageTag } from "keycloakify/login/i18n/i18n";
-import { useConst } from "keycloakify/tools/useConst";
-import { useConstCallback } from "keycloakify/tools/useConstCallback";
+import { fallbackLanguageTag } from "keycloakify/login/i18n";
 import { assert } from "tsafe/assert";
-import { Evt } from "evt";
-import { useRerenderOnStateChange } from "evt/hooks/useRerenderOnStateChange";
-import { KcContext } from "../kcContext";
+import {
+    createStatefulObservable,
+    useRerenderOnChange
+} from "keycloakify/tools/StatefulObservable";
+import { useOnFistMount } from "keycloakify/tools/useOnFirstMount";
+import { KcContext } from "../KcContext";
 
-const evtTermsMarkdown = Evt.create<string | undefined>(undefined);
+const obsTermsMarkdown = createStatefulObservable<string | undefined>(() => undefined);
 
 export type KcContextLike = {
     pageId: string;
@@ -25,33 +24,24 @@ export function useDownloadTerms(params: {
     kcContext: KcContextLike;
     downloadTermMarkdown: (params: { currentLanguageTag: string }) => Promise<string>;
 }) {
-    const { kcContext } = params;
+    const { kcContext, downloadTermMarkdown } = params;
 
-    const { downloadTermMarkdownMemoized } = (function useClosure() {
-        const { downloadTermMarkdown } = params;
-
-        const downloadTermMarkdownConst = useConstCallback(downloadTermMarkdown);
-
-        const downloadTermMarkdownMemoized = useConst(() =>
-            memoize((currentLanguageTag: string) => downloadTermMarkdownConst({ currentLanguageTag }))
-        );
-
-        return { downloadTermMarkdownMemoized };
-    })();
-
-    useEffect(() => {
+    useOnFistMount(async () => {
         if (kcContext.pageId === "terms.ftl" || kcContext.termsAcceptanceRequired) {
-            downloadTermMarkdownMemoized(kcContext.locale?.currentLanguageTag ?? fallbackLanguageTag).then(
-                thermMarkdown => (evtTermsMarkdown.state = thermMarkdown)
-            );
+            const termsMarkdown = await downloadTermMarkdown({
+                currentLanguageTag:
+                    kcContext.locale?.currentLanguageTag ?? fallbackLanguageTag
+            });
+
+            obsTermsMarkdown.current = termsMarkdown;
         }
-    }, []);
+    });
 }
 
 export function useTermsMarkdown() {
-    useRerenderOnStateChange(evtTermsMarkdown);
+    useRerenderOnChange(obsTermsMarkdown);
 
-    const termsMarkdown = evtTermsMarkdown.state;
+    const termsMarkdown = obsTermsMarkdown.current;
 
     return { termsMarkdown };
 }