From 56d6d8001a0d5d3bd428a17259bf9aa38d4fe026 Mon Sep 17 00:00:00 2001
From: Joseph Garrone <joseph.garrone.gj@gmail.com>
Date: Tue, 28 May 2024 00:23:48 +0200
Subject: [PATCH] Fix #549 after test

---
 .../ftl_object_to_js_code_declaring_an_object.ftl          | 2 +-
 src/login/i18n/i18n.tsx                                    | 6 +++---
 src/login/kcContext/KcContext.ts                           | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl b/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
index 87deb552..cf96ef8a 100644
--- a/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
+++ b/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
@@ -193,7 +193,7 @@ function decodeHtmlEntities(htmlStr){
         decodeHtmlEntities.element = element;
     }
     element.innerHTML = htmlStr;
-    return textarea.value;
+    return element.value;
 }
 
 })();
diff --git a/src/login/i18n/i18n.tsx b/src/login/i18n/i18n.tsx
index 7b39e676..f6d5d5c3 100644
--- a/src/login/i18n/i18n.tsx
+++ b/src/login/i18n/i18n.tsx
@@ -12,7 +12,7 @@ export type KcContextLike = {
         currentLanguageTag: string;
         supported: { languageTag: string; url: string; label: string }[];
     };
-    __localizationRealmOverridesUserProfile: Record<string, string>;
+    __localizationRealmOverridesUserProfile?: Record<string, string>;
 };
 
 assert<KcContext extends KcContextLike ? true : false>();
@@ -145,7 +145,7 @@ export function createUseI18n<ExtraMessageKey extends string = never>(extraMessa
 function createI18nTranslationFunctions<MessageKey extends string>(params: {
     fallbackMessages: Record<MessageKey, string>;
     messages: Record<MessageKey, string>;
-    __localizationRealmOverridesUserProfile: Record<string, string>;
+    __localizationRealmOverridesUserProfile: Record<string, string> | undefined;
 }): Pick<GenericI18n<MessageKey>, "msg" | "msgStr" | "advancedMsg" | "advancedMsgStr"> {
     const { fallbackMessages, messages, __localizationRealmOverridesUserProfile } = params;
 
@@ -203,7 +203,7 @@ function createI18nTranslationFunctions<MessageKey extends string>(params: {
     function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): JSX.Element | string {
         const { key, args, doRenderAsHtml } = props;
 
-        if (key in __localizationRealmOverridesUserProfile) {
+        if (__localizationRealmOverridesUserProfile !== undefined && key in __localizationRealmOverridesUserProfile) {
             const resolvedMessage = __localizationRealmOverridesUserProfile[key];
 
             return doRenderAsHtml ? (
diff --git a/src/login/kcContext/KcContext.ts b/src/login/kcContext/KcContext.ts
index 53963577..eac734bc 100644
--- a/src/login/kcContext/KcContext.ts
+++ b/src/login/kcContext/KcContext.ts
@@ -144,7 +144,7 @@ export declare namespace KcContext {
             tabId: string;
             ssoLoginInOtherTabsUrl: string;
         };
-        __localizationRealmOverridesUserProfile: Record<string, string>;
+        __localizationRealmOverridesUserProfile?: Record<string, string>;
     };
 
     export type SamlPostForm = Common & {
@@ -757,9 +757,8 @@ export type PasswordPolicies = {
 };
 
 assert<
-    KcContext.Common extends Record<
-        typeof nameOfTheLocalizationRealmOverridesUserProfileProperty,
-        unknown
+    KcContext.Common extends Partial<
+        Record<typeof nameOfTheLocalizationRealmOverridesUserProfileProperty, unknown>
     >
         ? true
         : false