From 7a0a0465967a3540b8712d5609596c3fc9c09303 Mon Sep 17 00:00:00 2001
From: garronej <joseph.garrone.gj@gmail.com>
Date: Sun, 31 Jul 2022 22:30:32 +0200
Subject: [PATCH] Refactor: Use hook instead of Context for i18n

---
 src/lib/components/Error.tsx                  |  10 +-
 src/lib/components/Info.tsx                   |   8 +-
 src/lib/components/KcApp.tsx                  |  97 ++++++-----
 src/lib/components/Login.tsx                  |   8 +-
 src/lib/components/LoginConfigTotp.tsx        |   9 +-
 src/lib/components/LoginIdpLinkConfirm.tsx    |   8 +-
 src/lib/components/LoginIdpLinkEmail.tsx      |   8 +-
 src/lib/components/LoginOtp.tsx               |   8 +-
 src/lib/components/LoginPageExpired.tsx       |   8 +-
 src/lib/components/LoginResetPassword.tsx     |   8 +-
 src/lib/components/LoginUpdatePassword.tsx    |   8 +-
 src/lib/components/LoginUpdateProfile.tsx     |   8 +-
 src/lib/components/LoginVerifyEmail.tsx       |   8 +-
 src/lib/components/LogoutConfirm.tsx          |   9 +-
 src/lib/components/Register.tsx               |   8 +-
 src/lib/components/RegisterUserProfile.tsx    |  17 +-
 src/lib/components/Template.tsx               |   7 +-
 src/lib/components/Terms.tsx                  |  31 +++-
 src/lib/getKcContext/KcContextBase.ts         |   4 +-
 src/lib/i18n/index.ts                         |   8 -
 src/lib/i18n/{createI18nApi.tsx => index.tsx} | 155 +++++++++---------
 src/lib/useFormValidationSlice.tsx            |  25 +--
 22 files changed, 238 insertions(+), 222 deletions(-)
 delete mode 100644 src/lib/i18n/index.ts
 rename src/lib/i18n/{createI18nApi.tsx => index.tsx} (60%)

diff --git a/src/lib/components/Error.tsx b/src/lib/components/Error.tsx
index f26677ee..04124c1b 100644
--- a/src/lib/components/Error.tsx
+++ b/src/lib/components/Error.tsx
@@ -2,16 +2,16 @@ import React, { memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
-
-const Error = memo(({ kcContext, ...props }: { kcContext: KcContextBase.Error } & KcProps) => {
-    const { msg } = useI18n();
+import type { I18n } from "../i18n";
 
+const Error = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Error; i18n: I18n } & KcProps) => {
     const { message, client } = kcContext;
 
+    const { msg } = i18n;
+
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             displayMessage={false}
             headerNode={msg("errorTitle")}
diff --git a/src/lib/components/Info.tsx b/src/lib/components/Info.tsx
index 052c6dda..d6a297d3 100644
--- a/src/lib/components/Info.tsx
+++ b/src/lib/components/Info.tsx
@@ -3,10 +3,10 @@ import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import { assert } from "../tools/assert";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
+import type { I18n } from "../i18n";
 
-const Info = memo(({ kcContext, ...props }: { kcContext: KcContextBase.Info } & KcProps) => {
-    const { msg, msgStr } = useI18n();
+const Info = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Info; i18n: I18n } & KcProps) => {
+    const { msgStr, msg } = i18n;
 
     assert(kcContext.message !== undefined);
 
@@ -14,7 +14,7 @@ const Info = memo(({ kcContext, ...props }: { kcContext: KcContextBase.Info } &
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             displayMessage={false}
             headerNode={messageHeader !== undefined ? <>{messageHeader}</> : <>{message.summary}</>}
diff --git a/src/lib/components/KcApp.tsx b/src/lib/components/KcApp.tsx
index f3d9c9fe..084aa5bf 100644
--- a/src/lib/components/KcApp.tsx
+++ b/src/lib/components/KcApp.tsx
@@ -1,7 +1,8 @@
 import React, { lazy, memo, Suspense } from "react";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { KcProps } from "./KcProps";
-import { I18nProvider } from "../i18n";
+import { __unsafe_useI18n as useI18n } from "../i18n";
+import type { I18n } from "../i18n";
 
 const Login = lazy(() => import("./Login"));
 const Register = lazy(() => import("./Register"));
@@ -20,48 +21,60 @@ const LoginIdpLinkEmail = lazy(() => import("./LoginIdpLinkEmail"));
 const LoginConfigTotp = lazy(() => import("./LoginConfigTotp"));
 const LogoutConfirm = lazy(() => import("./LogoutConfirm"));
 
-const KcApp = memo(({ kcContext, ...props }: { kcContext: KcContextBase } & KcProps) => {
+const KcApp = memo(({ kcContext, i18n: userProvidedI18n, ...props }: { kcContext: KcContextBase; i18n?: I18n } & KcProps) => {
+    const i18n = (function useClosure() {
+        const i18n = useI18n({
+            kcContext,
+            "extraMessages": {},
+            "doSkip": userProvidedI18n !== undefined,
+        });
+
+        return userProvidedI18n ?? i18n;
+    })();
+
+    if (i18n === undefined) {
+        return null;
+    }
+
     return (
-        <I18nProvider kcContext={kcContext}>
-            <Suspense>
-                {(() => {
-                    switch (kcContext.pageId) {
-                        case "login.ftl":
-                            return <Login {...{ kcContext, ...props }} />;
-                        case "register.ftl":
-                            return <Register {...{ kcContext, ...props }} />;
-                        case "register-user-profile.ftl":
-                            return <RegisterUserProfile {...{ kcContext, ...props }} />;
-                        case "info.ftl":
-                            return <Info {...{ kcContext, ...props }} />;
-                        case "error.ftl":
-                            return <Error {...{ kcContext, ...props }} />;
-                        case "login-reset-password.ftl":
-                            return <LoginResetPassword {...{ kcContext, ...props }} />;
-                        case "login-verify-email.ftl":
-                            return <LoginVerifyEmail {...{ kcContext, ...props }} />;
-                        case "terms.ftl":
-                            return <Terms {...{ kcContext, ...props }} />;
-                        case "login-otp.ftl":
-                            return <LoginOtp {...{ kcContext, ...props }} />;
-                        case "login-update-password.ftl":
-                            return <LoginUpdatePassword {...{ kcContext, ...props }} />;
-                        case "login-update-profile.ftl":
-                            return <LoginUpdateProfile {...{ kcContext, ...props }} />;
-                        case "login-idp-link-confirm.ftl":
-                            return <LoginIdpLinkConfirm {...{ kcContext, ...props }} />;
-                        case "login-idp-link-email.ftl":
-                            return <LoginIdpLinkEmail {...{ kcContext, ...props }} />;
-                        case "login-page-expired.ftl":
-                            return <LoginPageExpired {...{ kcContext, ...props }} />;
-                        case "login-config-totp.ftl":
-                            return <LoginConfigTotp {...{ kcContext, ...props }} />;
-                        case "logout-confirm.ftl":
-                            return <LogoutConfirm {...{ kcContext, ...props }} />;
-                    }
-                })()}
-            </Suspense>
-        </I18nProvider>
+        <Suspense>
+            {(() => {
+                switch (kcContext.pageId) {
+                    case "login.ftl":
+                        return <Login {...{ kcContext, i18n, ...props }} />;
+                    case "register.ftl":
+                        return <Register {...{ kcContext, i18n, ...props }} />;
+                    case "register-user-profile.ftl":
+                        return <RegisterUserProfile {...{ kcContext, i18n, ...props }} />;
+                    case "info.ftl":
+                        return <Info {...{ kcContext, i18n, ...props }} />;
+                    case "error.ftl":
+                        return <Error {...{ kcContext, i18n, ...props }} />;
+                    case "login-reset-password.ftl":
+                        return <LoginResetPassword {...{ kcContext, i18n, ...props }} />;
+                    case "login-verify-email.ftl":
+                        return <LoginVerifyEmail {...{ kcContext, i18n, ...props }} />;
+                    case "terms.ftl":
+                        return <Terms {...{ kcContext, i18n, ...props }} />;
+                    case "login-otp.ftl":
+                        return <LoginOtp {...{ kcContext, i18n, ...props }} />;
+                    case "login-update-password.ftl":
+                        return <LoginUpdatePassword {...{ kcContext, i18n, ...props }} />;
+                    case "login-update-profile.ftl":
+                        return <LoginUpdateProfile {...{ kcContext, i18n, ...props }} />;
+                    case "login-idp-link-confirm.ftl":
+                        return <LoginIdpLinkConfirm {...{ kcContext, i18n, ...props }} />;
+                    case "login-idp-link-email.ftl":
+                        return <LoginIdpLinkEmail {...{ kcContext, i18n, ...props }} />;
+                    case "login-page-expired.ftl":
+                        return <LoginPageExpired {...{ kcContext, i18n, ...props }} />;
+                    case "login-config-totp.ftl":
+                        return <LoginConfigTotp {...{ kcContext, i18n, ...props }} />;
+                    case "logout-confirm.ftl":
+                        return <LogoutConfirm {...{ kcContext, i18n, ...props }} />;
+                }
+            })()}
+        </Suspense>
     );
 });
 
diff --git a/src/lib/components/Login.tsx b/src/lib/components/Login.tsx
index f3ceb90c..fcf7f774 100644
--- a/src/lib/components/Login.tsx
+++ b/src/lib/components/Login.tsx
@@ -5,12 +5,12 @@ import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "tss-react";
 import { useConstCallback } from "powerhooks/useConstCallback";
 import type { FormEventHandler } from "react";
-import { useI18n } from "../i18n";
+import type { I18n } from "../i18n";
 
-const Login = memo(({ kcContext, ...props }: { kcContext: KcContextBase.Login } & KcProps) => {
+const Login = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Login; i18n: I18n } & KcProps) => {
     const { social, realm, url, usernameEditDisabled, login, auth, registrationDisabled } = kcContext;
 
-    const { msg, msgStr } = useI18n();
+    const { msg, msgStr } = i18n;
 
     const { cx } = useCssAndCx();
 
@@ -32,7 +32,7 @@ const Login = memo(({ kcContext, ...props }: { kcContext: KcContextBase.Login }
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             displayInfo={social.displayInfo}
             displayWide={realm.password && social.providers !== undefined}
diff --git a/src/lib/components/LoginConfigTotp.tsx b/src/lib/components/LoginConfigTotp.tsx
index bc592d23..e5774eb5 100644
--- a/src/lib/components/LoginConfigTotp.tsx
+++ b/src/lib/components/LoginConfigTotp.tsx
@@ -2,15 +2,16 @@ import React, { memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
 import { useCssAndCx } from "tss-react";
+import type { I18n } from "../i18n";
 
-const LoginConfigTotp = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginConfigTotp } & KcProps) => {
+const LoginConfigTotp = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginConfigTotp; i18n: I18n } & KcProps) => {
     const { url, isAppInitiatedAction, totp, mode, messagesPerField } = kcContext;
 
     const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = useI18n();
+    const { msg, msgStr } = i18n;
+
     const algToKeyUriAlg: Record<KcContextBase.LoginConfigTotp["totp"]["policy"]["algorithm"], string> = {
         HmacSHA1: "SHA1",
         HmacSHA256: "SHA256",
@@ -19,7 +20,7 @@ const LoginConfigTotp = memo(({ kcContext, ...props }: { kcContext: KcContextBas
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             headerNode={msg("loginTotpTitle")}
             formNode={
diff --git a/src/lib/components/LoginIdpLinkConfirm.tsx b/src/lib/components/LoginIdpLinkConfirm.tsx
index c3802416..8966a149 100644
--- a/src/lib/components/LoginIdpLinkConfirm.tsx
+++ b/src/lib/components/LoginIdpLinkConfirm.tsx
@@ -2,19 +2,19 @@ import React, { memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
 import { useCssAndCx } from "tss-react";
+import type { I18n } from "../i18n";
 
-const LoginIdpLinkConfirm = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginIdpLinkConfirm } & KcProps) => {
+const LoginIdpLinkConfirm = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginIdpLinkConfirm; i18n: I18n } & KcProps) => {
     const { url, idpAlias } = kcContext;
 
-    const { msg } = useI18n();
+    const { msg } = i18n;
 
     const { cx } = useCssAndCx();
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             headerNode={msg("confirmLinkIdpTitle")}
             formNode={
diff --git a/src/lib/components/LoginIdpLinkEmail.tsx b/src/lib/components/LoginIdpLinkEmail.tsx
index 46159d5c..04a971e2 100644
--- a/src/lib/components/LoginIdpLinkEmail.tsx
+++ b/src/lib/components/LoginIdpLinkEmail.tsx
@@ -2,16 +2,16 @@ import React, { memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
+import type { I18n } from "../i18n";
 
-const LoginIdpLinkEmail = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginIdpLinkEmail } & KcProps) => {
+const LoginIdpLinkEmail = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginIdpLinkEmail; i18n: I18n } & KcProps) => {
     const { url, realm, brokerContext, idpAlias } = kcContext;
 
-    const { msg } = useI18n();
+    const { msg } = i18n;
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             headerNode={msg("emailLinkIdpTitle", idpAlias)}
             formNode={
diff --git a/src/lib/components/LoginOtp.tsx b/src/lib/components/LoginOtp.tsx
index b8dda8cc..2e314aee 100644
--- a/src/lib/components/LoginOtp.tsx
+++ b/src/lib/components/LoginOtp.tsx
@@ -2,17 +2,17 @@ import React, { useEffect, memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
 import { headInsert } from "../tools/headInsert";
 import { pathJoin } from "../../bin/tools/pathJoin";
 import { useCssAndCx } from "tss-react";
+import type { I18n } from "../i18n";
 
-const LoginOtp = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginOtp } & KcProps) => {
+const LoginOtp = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginOtp; i18n: I18n } & KcProps) => {
     const { otpLogin, url } = kcContext;
 
     const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = useI18n();
+    const { msg, msgStr } = i18n;
 
     useEffect(() => {
         let isCleanedUp = false;
@@ -33,7 +33,7 @@ const LoginOtp = memo(({ kcContext, ...props }: { kcContext: KcContextBase.Login
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             headerNode={msg("doLogIn")}
             formNode={
diff --git a/src/lib/components/LoginPageExpired.tsx b/src/lib/components/LoginPageExpired.tsx
index 9ea0f74e..2d751108 100644
--- a/src/lib/components/LoginPageExpired.tsx
+++ b/src/lib/components/LoginPageExpired.tsx
@@ -2,16 +2,16 @@ import React, { memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
+import type { I18n } from "../i18n";
 
-const LoginPageExpired = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginPageExpired } & KcProps) => {
+const LoginPageExpired = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginPageExpired; i18n: I18n } & KcProps) => {
     const { url } = kcContext;
 
-    const { msg } = useI18n();
+    const { msg } = i18n;
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             displayMessage={false}
             headerNode={msg("pageExpiredTitle")}
diff --git a/src/lib/components/LoginResetPassword.tsx b/src/lib/components/LoginResetPassword.tsx
index d0336921..6b4816a1 100644
--- a/src/lib/components/LoginResetPassword.tsx
+++ b/src/lib/components/LoginResetPassword.tsx
@@ -2,19 +2,19 @@ import React, { memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
 import { useCssAndCx } from "tss-react";
+import type { I18n } from "../i18n";
 
-const LoginResetPassword = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginResetPassword } & KcProps) => {
+const LoginResetPassword = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginResetPassword; i18n: I18n } & KcProps) => {
     const { url, realm, auth } = kcContext;
 
-    const { msg, msgStr } = useI18n();
+    const { msg, msgStr } = i18n;
 
     const { cx } = useCssAndCx();
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             displayMessage={false}
             headerNode={msg("emailForgotTitle")}
diff --git a/src/lib/components/LoginUpdatePassword.tsx b/src/lib/components/LoginUpdatePassword.tsx
index c4d41016..7dc6cd29 100644
--- a/src/lib/components/LoginUpdatePassword.tsx
+++ b/src/lib/components/LoginUpdatePassword.tsx
@@ -2,19 +2,19 @@ import React, { memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
 import { useCssAndCx } from "tss-react";
+import type { I18n } from "../i18n";
 
-const LoginUpdatePassword = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginUpdatePassword } & KcProps) => {
+const LoginUpdatePassword = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginUpdatePassword; i18n: I18n } & KcProps) => {
     const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = useI18n();
+    const { msg, msgStr } = i18n;
 
     const { url, messagesPerField, isAppInitiatedAction, username } = kcContext;
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             headerNode={msg("updatePasswordTitle")}
             formNode={
diff --git a/src/lib/components/LoginUpdateProfile.tsx b/src/lib/components/LoginUpdateProfile.tsx
index 53633b5d..bd534fa3 100644
--- a/src/lib/components/LoginUpdateProfile.tsx
+++ b/src/lib/components/LoginUpdateProfile.tsx
@@ -2,19 +2,19 @@ import React, { memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
 import { useCssAndCx } from "tss-react";
+import type { I18n } from "../i18n";
 
-const LoginUpdateProfile = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginUpdateProfile } & KcProps) => {
+const LoginUpdateProfile = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginUpdateProfile; i18n: I18n } & KcProps) => {
     const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = useI18n();
+    const { msg, msgStr } = i18n;
 
     const { url, user, messagesPerField, isAppInitiatedAction } = kcContext;
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             headerNode={msg("loginProfileTitle")}
             formNode={
diff --git a/src/lib/components/LoginVerifyEmail.tsx b/src/lib/components/LoginVerifyEmail.tsx
index 5eb902d9..048da566 100644
--- a/src/lib/components/LoginVerifyEmail.tsx
+++ b/src/lib/components/LoginVerifyEmail.tsx
@@ -2,16 +2,16 @@ import React, { memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
+import type { I18n } from "../i18n";
 
-const LoginVerifyEmail = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LoginVerifyEmail } & KcProps) => {
-    const { msg } = useI18n();
+const LoginVerifyEmail = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginVerifyEmail; i18n: I18n } & KcProps) => {
+    const { msg } = i18n;
 
     const { url, user } = kcContext;
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             displayMessage={false}
             headerNode={msg("emailVerifyTitle")}
diff --git a/src/lib/components/LogoutConfirm.tsx b/src/lib/components/LogoutConfirm.tsx
index b1c69cf1..08941903 100644
--- a/src/lib/components/LogoutConfirm.tsx
+++ b/src/lib/components/LogoutConfirm.tsx
@@ -1,21 +1,20 @@
 import React, { memo } from "react";
 import { useCssAndCx } from "tss-react";
-
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
+import type { I18n } from "../i18n";
 
-const LogoutConfirm = memo(({ kcContext, ...props }: { kcContext: KcContextBase.LogoutConfirm } & KcProps) => {
+const LogoutConfirm = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LogoutConfirm; i18n: I18n } & KcProps) => {
     const { url, client, logoutConfirm } = kcContext;
 
     const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = useI18n();
+    const { msg, msgStr } = i18n;
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             displayMessage={false}
             headerNode={msg("logoutConfirmTitle")}
diff --git a/src/lib/components/Register.tsx b/src/lib/components/Register.tsx
index ca3cd85f..58a1836e 100644
--- a/src/lib/components/Register.tsx
+++ b/src/lib/components/Register.tsx
@@ -2,19 +2,19 @@ import React, { memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
 import { useCssAndCx } from "tss-react";
+import type { I18n } from "../i18n";
 
-const Register = memo(({ kcContext, ...props }: { kcContext: KcContextBase.Register } & KcProps) => {
+const Register = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Register; i18n: I18n } & KcProps) => {
     const { url, messagesPerField, register, realm, passwordRequired, recaptchaRequired, recaptchaSiteKey } = kcContext;
 
-    const { msg, msgStr } = useI18n();
+    const { msg, msgStr } = i18n;
 
     const { cx } = useCssAndCx();
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             headerNode={msg("registerTitle")}
             formNode={
diff --git a/src/lib/components/RegisterUserProfile.tsx b/src/lib/components/RegisterUserProfile.tsx
index a22ed3c8..becbec09 100644
--- a/src/lib/components/RegisterUserProfile.tsx
+++ b/src/lib/components/RegisterUserProfile.tsx
@@ -2,16 +2,16 @@ import React, { useMemo, memo, useEffect, useState, Fragment } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase, Attribute } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
 import { useCssAndCx } from "tss-react";
 import type { ReactComponent } from "../tools/ReactComponent";
 import { useCallbackFactory } from "powerhooks/useCallbackFactory";
 import { useFormValidationSlice } from "../useFormValidationSlice";
+import type { I18n } from "../i18n";
 
-const RegisterUserProfile = memo(({ kcContext, ...props_ }: { kcContext: KcContextBase.RegisterUserProfile } & KcProps) => {
+const RegisterUserProfile = memo(({ kcContext, i18n, ...props_ }: { kcContext: KcContextBase.RegisterUserProfile; i18n: I18n } & KcProps) => {
     const { url, messagesPerField, recaptchaRequired, recaptchaSiteKey } = kcContext;
 
-    const { msg, msgStr } = useI18n();
+    const { msg, msgStr } = i18n;
 
     const { cx, css } = useCssAndCx();
 
@@ -27,14 +27,14 @@ const RegisterUserProfile = memo(({ kcContext, ...props_ }: { kcContext: KcConte
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             displayMessage={messagesPerField.exists("global")}
             displayRequiredFields={true}
             doFetchDefaultThemeResources={true}
             headerNode={msg("registerTitle")}
             formNode={
                 <form id="kc-register-form" className={cx(props.kcFormClass)} action={url.registrationAction} method="post">
-                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} {...props} />
+                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
                     {recaptchaRequired && (
                         <div className="form-group">
                             <div className={cx(props.kcInputWrapperClass)}>
@@ -66,15 +66,15 @@ const RegisterUserProfile = memo(({ kcContext, ...props_ }: { kcContext: KcConte
     );
 });
 
-type UserProfileFormFieldsProps = { kcContext: KcContextBase.RegisterUserProfile } & KcProps &
+type UserProfileFormFieldsProps = { kcContext: KcContextBase.RegisterUserProfile; i18n: I18n } & KcProps &
     Partial<Record<"BeforeField" | "AfterField", ReactComponent<{ attribute: Attribute }>>> & {
         onIsFormSubmittableValueChange: (isFormSubmittable: boolean) => void;
     };
 
-const UserProfileFormFields = memo(({ kcContext, onIsFormSubmittableValueChange, ...props }: UserProfileFormFieldsProps) => {
+const UserProfileFormFields = memo(({ kcContext, onIsFormSubmittableValueChange, i18n, ...props }: UserProfileFormFieldsProps) => {
     const { cx, css } = useCssAndCx();
 
-    const { advancedMsg } = useI18n();
+    const { advancedMsg } = i18n;
 
     const {
         formValidationState: { fieldStateByAttributeName, isFormSubmittable },
@@ -82,6 +82,7 @@ const UserProfileFormFields = memo(({ kcContext, onIsFormSubmittableValueChange,
         attributesWithPassword,
     } = useFormValidationSlice({
         kcContext,
+        i18n,
     });
 
     useEffect(() => {
diff --git a/src/lib/components/Template.tsx b/src/lib/components/Template.tsx
index 04122636..16f518b5 100644
--- a/src/lib/components/Template.tsx
+++ b/src/lib/components/Template.tsx
@@ -8,7 +8,7 @@ import { pathJoin } from "../../bin/tools/pathJoin";
 import { useConstCallback } from "powerhooks/useConstCallback";
 import type { KcTemplateProps } from "./KcProps";
 import { useCssAndCx } from "tss-react";
-import { useI18n } from "../i18n";
+import type { I18n } from "../i18n";
 
 export type TemplateProps = {
     displayInfo?: boolean;
@@ -24,7 +24,7 @@ export type TemplateProps = {
      * to avoid pulling the default theme assets.
      */
     doFetchDefaultThemeResources: boolean;
-} & { kcContext: KcContextBase } & KcTemplateProps;
+} & { kcContext: KcContextBase; i18n: I18n } & KcTemplateProps;
 
 const Template = memo((props: TemplateProps) => {
     const {
@@ -38,6 +38,7 @@ const Template = memo((props: TemplateProps) => {
         formNode,
         infoNode = null,
         kcContext,
+        i18n,
         doFetchDefaultThemeResources,
     } = props;
 
@@ -47,7 +48,7 @@ const Template = memo((props: TemplateProps) => {
         console.log("Rendering this page with react using keycloakify");
     }, []);
 
-    const { msg, changeLocale, labelBySupportedLanguageTag, currentLanguageTag } = useI18n();
+    const { msg, changeLocale, labelBySupportedLanguageTag, currentLanguageTag } = i18n;
 
     const onChangeLanguageClickFactory = useCallbackFactory(([kcLanguageTag]: [string]) => changeLocale(kcLanguageTag));
 
diff --git a/src/lib/components/Terms.tsx b/src/lib/components/Terms.tsx
index 543c758a..7f057a93 100644
--- a/src/lib/components/Terms.tsx
+++ b/src/lib/components/Terms.tsx
@@ -2,23 +2,36 @@ import React, { useEffect, memo } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useI18n } from "../i18n";
 import { useCssAndCx } from "tss-react";
 import { Evt } from "evt";
 import { useRerenderOnStateChange } from "evt/hooks";
+import { assert } from "tsafe/assert";
+import { fallbackLanguageTag } from "../i18n";
+import type { I18n } from "../i18n";
 
 export const evtTermMarkdown = Evt.create<string | undefined>(undefined);
 
-/** Allow to avoid bundling the terms and download it on demand*/
-export function useDownloadTerms(params: { downloadTermMarkdown: (params: { currentLanguageTag: string }) => Promise<string> }) {
-    const { downloadTermMarkdown } = params;
+export type KcContextLike = {
+    locale?: {
+        currentLanguageTag: string;
+    };
+};
 
-    const { currentLanguageTag } = useI18n();
+assert<KcContextBase extends KcContextLike ? true : false>();
+
+/** Allow to avoid bundling the terms and download it on demand*/
+export function useDownloadTerms(params: {
+    kcContext: KcContextLike;
+    downloadTermMarkdown: (params: { currentLanguageTag: string }) => Promise<string>;
+}) {
+    const { kcContext, downloadTermMarkdown } = params;
 
     useEffect(() => {
         let isMounted = true;
 
-        downloadTermMarkdown({ currentLanguageTag }).then(thermMarkdown => {
+        downloadTermMarkdown({
+            "currentLanguageTag": kcContext.locale?.currentLanguageTag ?? fallbackLanguageTag,
+        }).then(thermMarkdown => {
             if (!isMounted) {
                 return;
             }
@@ -32,8 +45,8 @@ export function useDownloadTerms(params: { downloadTermMarkdown: (params: { curr
     }, []);
 }
 
-const Terms = memo(({ kcContext, ...props }: { kcContext: KcContextBase.Terms } & KcProps) => {
-    const { msg, msgStr } = useI18n();
+const Terms = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Terms; i18n: I18n } & KcProps) => {
+    const { msg, msgStr } = i18n;
 
     useRerenderOnStateChange(evtTermMarkdown);
 
@@ -47,7 +60,7 @@ const Terms = memo(({ kcContext, ...props }: { kcContext: KcContextBase.Terms }
 
     return (
         <Template
-            {...{ kcContext, ...props }}
+            {...{ kcContext, i18n, ...props }}
             doFetchDefaultThemeResources={true}
             displayMessage={false}
             headerNode={msg("termsTitle")}
diff --git a/src/lib/getKcContext/KcContextBase.ts b/src/lib/getKcContext/KcContextBase.ts
index 8822b5a9..34cb3b4c 100644
--- a/src/lib/getKcContext/KcContextBase.ts
+++ b/src/lib/getKcContext/KcContextBase.ts
@@ -1,7 +1,7 @@
 import type { PageId } from "../../bin/build-keycloak-theme/generateFtl";
 import { assert } from "tsafe/assert";
 import type { Equals } from "tsafe";
-import type { BaseMessageKey } from "../i18n/createI18nApi";
+import type { MessageKeyBase } from "../i18n";
 
 type ExtractAfterStartingWith<Prefix extends string, StrEnum> = StrEnum extends `${Prefix}${infer U}` ? U : never;
 
@@ -153,7 +153,7 @@ export declare namespace KcContextBase {
     export type Info = Common & {
         pageId: "info.ftl";
         messageHeader?: string;
-        requiredActions?: ExtractAfterStartingWith<"requiredAction.", BaseMessageKey>[];
+        requiredActions?: ExtractAfterStartingWith<"requiredAction.", MessageKeyBase>[];
         skipLink: boolean;
         pageRedirectUri?: string;
         actionUri?: string;
diff --git a/src/lib/i18n/index.ts b/src/lib/i18n/index.ts
deleted file mode 100644
index 3d609c04..00000000
--- a/src/lib/i18n/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createI18nApi } from "./createI18nApi";
-import type { I18n } from "./createI18nApi";
-
-export const { I18nProvider, useI18n } = createI18nApi({
-    "extraMessages": {},
-});
-
-export type MessageKey = ReturnType<typeof useI18n> extends I18n<infer U> ? U : never;
diff --git a/src/lib/i18n/createI18nApi.tsx b/src/lib/i18n/index.tsx
similarity index 60%
rename from src/lib/i18n/createI18nApi.tsx
rename to src/lib/i18n/index.tsx
index 8988b530..315a8783 100644
--- a/src/lib/i18n/createI18nApi.tsx
+++ b/src/lib/i18n/index.tsx
@@ -1,15 +1,25 @@
 import "minimal-polyfills/Object.fromEntries";
 //NOTE for later: https://github.com/remarkjs/react-markdown/blob/236182ecf30bd89c1e5a7652acaf8d0bf81e6170/src/renderers.js#L7-L35
-import React, { createContext, useContext, useEffect, useState, memo } from "react";
-import type { ReactNode } from "react";
+import React, { useEffect, useState } from "react";
 import ReactMarkdown from "react-markdown";
 import type baseMessages from "./generated_messages/18.0.1/login/en";
 import { assert } from "tsafe/assert";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 
-const fallbackLanguageTag = "en";
+export const fallbackLanguageTag = "en";
 
-export type I18n<MessageKey extends string> = {
+export type KcContextLike = {
+    locale?: {
+        currentLanguageTag: string;
+        supported: { languageTag: string; url: string; label: string }[];
+    };
+};
+
+assert<KcContextBase extends KcContextLike ? true : false>();
+
+export type MessageKeyBase = keyof typeof baseMessages | keyof typeof keycloakifyExtraMessages[typeof fallbackLanguageTag];
+
+export type I18n<MessageKey extends string = MessageKeyBase> = {
     msgStr: (key: MessageKey, ...args: (string | undefined)[]) => string;
     msg: (key: MessageKey, ...args: (string | undefined)[]) => JSX.Element;
     /** advancedMsg("${access-denied}") === advancedMsg("access-denied") === msg("access-denied") */
@@ -22,102 +32,85 @@ export type I18n<MessageKey extends string> = {
     labelBySupportedLanguageTag: Record<string, string>;
 };
 
-export type KcContextLike = {
-    locale?: {
-        currentLanguageTag: string;
-        supported: { languageTag: string; url: string; label: string }[];
-    };
-};
-
-assert<KcContextBase extends KcContextLike ? true : false>();
-
-export type I18nProviderProps = {
-    children: ReactNode;
-    fallback?: ReactNode;
+export function __unsafe_useI18n<ExtraMessageKey extends string = never>(params: {
     kcContext: KcContextLike;
-};
-
-const allExtraMessages: { [languageTag: string]: { [key: string]: string } } = {};
-
-export function createI18nApi<ExtraMessageKey extends string = never>(params: {
     extraMessages: { [languageTag: string]: { [key in ExtraMessageKey]: string } };
-}) {
-    Object.assign(allExtraMessages, params.extraMessages);
+    doSkip: boolean;
+}): I18n<MessageKeyBase | ExtraMessageKey> | undefined {
+    const { kcContext, extraMessages, doSkip } = params;
 
-    type MessageKey = ExtraMessageKey | keyof typeof baseMessages | keyof typeof keycloakifyExtraMessages[typeof fallbackLanguageTag];
+    const [i18n, setI18n] = useState<I18n<ExtraMessageKey | MessageKeyBase> | undefined>(undefined);
 
-    const context = createContext<I18n<MessageKey> | undefined>(undefined);
+    useEffect(() => {
+        if (doSkip) {
+            return;
+        }
 
-    function useI18n(): I18n<MessageKey> {
-        const i18n = useContext(context);
+        let isMounted = true;
 
-        assert(i18n !== undefined, "Now Wrapped in <I18nProvider>");
+        (async () => {
+            const { currentLanguageTag = fallbackLanguageTag } = kcContext.locale ?? {};
 
-        return i18n;
-    }
+            const [fallbackMessages, messages] = await Promise.all([
+                import("./generated_messages/18.0.1/login/en"),
+                import(`./generated_kcMessages/18.0.1/login/${currentLanguageTag}`),
+            ]);
 
-    const I18nProvider = memo((props: I18nProviderProps) => {
-        const { children, fallback, kcContext } = props;
+            if (!isMounted) {
+                return;
+            }
 
-        const [i18n, setI18n] = useState<I18n<MessageKey> | undefined>(undefined);
+            setI18n({
+                ...createI18nTranslationFunctions({
+                    "fallbackMessages": {
+                        ...fallbackMessages,
+                        ...(keycloakifyExtraMessages[fallbackLanguageTag] ?? {}),
+                        ...(extraMessages[fallbackLanguageTag] ?? {}),
+                    } as any,
+                    "messages": {
+                        ...messages,
+                        ...((keycloakifyExtraMessages as any)[currentLanguageTag] ?? {}),
+                        ...(extraMessages[currentLanguageTag] ?? {}),
+                    } as any,
+                }),
+                currentLanguageTag,
+                "changeLocale": newLanguageTag => {
+                    const { locale } = kcContext;
 
-        useEffect(() => {
-            let isMounted = true;
+                    assert(locale !== undefined, "Internationalization not enabled");
 
-            (async () => {
-                const { currentLanguageTag = fallbackLanguageTag } = kcContext.locale ?? {};
+                    const targetSupportedLocale = locale.supported.find(({ languageTag }) => languageTag === newLanguageTag);
 
-                const [fallbackMessages, messages] = await Promise.all([
-                    import("./generated_messages/18.0.1/login/en"),
-                    import(`./generated_kcMessages/18.0.1/login/${currentLanguageTag}`),
-                ]);
+                    assert(targetSupportedLocale !== undefined, `${newLanguageTag} need to be enabled in Keycloak admin`);
 
-                if (!isMounted) {
-                    return;
-                }
+                    window.location.href = targetSupportedLocale.url;
 
-                setI18n({
-                    ...createI18nTranslationFunctions({
-                        "fallbackMessages": {
-                            ...fallbackMessages,
-                            ...(keycloakifyExtraMessages[fallbackLanguageTag] ?? {}),
-                            ...(allExtraMessages[fallbackLanguageTag] ?? {}),
-                        } as any,
-                        "messages": {
-                            ...messages,
-                            ...((keycloakifyExtraMessages as any)[currentLanguageTag] ?? {}),
-                            ...(allExtraMessages[currentLanguageTag] ?? {}),
-                        } as any,
-                    }),
-                    currentLanguageTag,
-                    "changeLocale": newLanguageTag => {
-                        const { locale } = kcContext;
+                    assert(false, "never");
+                },
+                "labelBySupportedLanguageTag": Object.fromEntries(
+                    (kcContext.locale?.supported ?? []).map(({ languageTag, label }) => [languageTag, label]),
+                ),
+            });
+        })();
 
-                        assert(locale !== undefined, "Internationalization not enabled");
+        return () => {
+            isMounted = false;
+        };
+    }, []);
 
-                        const targetSupportedLocale = locale.supported.find(({ languageTag }) => languageTag === newLanguageTag);
+    return i18n;
+}
 
-                        assert(targetSupportedLocale !== undefined, `${newLanguageTag} need to be enabled in Keycloak admin`);
+const useI18n_private = __unsafe_useI18n;
 
-                        window.location.href = targetSupportedLocale.url;
-
-                        assert(false, "never");
-                    },
-                    "labelBySupportedLanguageTag": Object.fromEntries(
-                        (kcContext.locale?.supported ?? []).map(({ languageTag, label }) => [languageTag, label]),
-                    ),
-                });
-            })();
-
-            return () => {
-                isMounted = false;
-            };
-        }, []);
-
-        return <context.Provider value={i18n}>{i18n === undefined ? fallback ?? null : children}</context.Provider>;
+export function useI18n<ExtraMessageKey extends string = never>(params: {
+    kcContext: KcContextLike;
+    extraMessages: { [languageTag: string]: { [key in ExtraMessageKey]: string } };
+}): I18n<MessageKeyBase | ExtraMessageKey> | undefined {
+    return useI18n_private({
+        ...params,
+        "doSkip": false,
     });
-
-    return { useI18n, I18nProvider };
 }
 
 function createI18nTranslationFunctions<MessageKey extends string>(params: {
diff --git a/src/lib/useFormValidationSlice.tsx b/src/lib/useFormValidationSlice.tsx
index f4a7bf8c..49c0b688 100644
--- a/src/lib/useFormValidationSlice.tsx
+++ b/src/lib/useFormValidationSlice.tsx
@@ -1,8 +1,7 @@
 import "./tools/Array.prototype.every";
 import React, { useMemo, useReducer, Fragment } from "react";
 import type { KcContextBase, Validators, Attribute } from "./getKcContext/KcContextBase";
-import { useI18n } from "./i18n";
-import type { MessageKey } from "./i18n";
+import type { I18n, MessageKeyBase } from "./i18n";
 import { useConstCallback } from "powerhooks/useConstCallback";
 import { id } from "tsafe/id";
 import { emailRegexp } from "./tools/emailRegExp";
@@ -15,15 +14,16 @@ export function useGetErrors(params: {
             attributes: { name: string; value?: string; validators: Validators }[];
         };
     };
+    i18n: I18n;
 }) {
-    const { kcContext } = params;
+    const { kcContext, i18n } = params;
 
     const {
         messagesPerField,
         profile: { attributes },
     } = kcContext;
 
-    const { msg, msgStr, advancedMsg, advancedMsgStr } = useI18n();
+    const { msg, msgStr, advancedMsg, advancedMsgStr } = i18n;
 
     const getErrors = useConstCallback((params: { name: string; fieldValueByAttributeName: Record<string, { value: string }> }) => {
         const { name, fieldValueByAttributeName } = params;
@@ -134,7 +134,7 @@ export function useGetErrors(params: {
 
             const msgArg = [
                 errorMessageKey ??
-                    id<MessageKey>(
+                    id<MessageKeyBase>(
                         (() => {
                             switch (shouldBe) {
                                 case "equal":
@@ -175,7 +175,7 @@ export function useGetErrors(params: {
                 break scope;
             }
 
-            const msgArgs = [errorMessageKey ?? id<MessageKey>("shouldMatchPattern"), pattern] as const;
+            const msgArgs = [errorMessageKey ?? id<MessageKeyBase>("shouldMatchPattern"), pattern] as const;
 
             errors.push({
                 validatorName,
@@ -207,7 +207,7 @@ export function useGetErrors(params: {
                 break scope;
             }
 
-            const msgArgs = [id<MessageKey>("invalidEmailMessage")] as const;
+            const msgArgs = [id<MessageKeyBase>("invalidEmailMessage")] as const;
 
             errors.push({
                 validatorName,
@@ -287,7 +287,7 @@ export function useGetErrors(params: {
                 break scope;
             }
 
-            const msgArgs = [id<MessageKey>("notAValidOption")] as const;
+            const msgArgs = [id<MessageKeyBase>("notAValidOption")] as const;
 
             errors.push({
                 validatorName,
@@ -315,6 +315,7 @@ export function useFormValidationSlice(params: {
     };
     /** NOTE: Try to avoid passing a new ref every render for better performances. */
     passwordValidators?: Validators;
+    i18n: I18n;
 }) {
     const {
         kcContext,
@@ -324,6 +325,7 @@ export function useFormValidationSlice(params: {
                 "min": "4",
             },
         },
+        i18n,
     } = params;
 
     const attributesWithPassword = useMemo(
@@ -342,7 +344,7 @@ export function useFormValidationSlice(params: {
                                         curr,
                                         id<Attribute>({
                                             "name": "password",
-                                            "displayName": id<`\${${MessageKey}}`>("${password}"),
+                                            "displayName": id<`\${${MessageKeyBase}}`>("${password}"),
                                             "required": true,
                                             "readOnly": false,
                                             "validators": passwordValidators,
@@ -352,7 +354,7 @@ export function useFormValidationSlice(params: {
                                         }),
                                         id<Attribute>({
                                             "name": "password-confirm",
-                                            "displayName": id<`\${${MessageKey}}`>("${passwordConfirm}"),
+                                            "displayName": id<`\${${MessageKeyBase}}`>("${passwordConfirm}"),
                                             "required": true,
                                             "readOnly": false,
                                             "validators": {
@@ -360,7 +362,7 @@ export function useFormValidationSlice(params: {
                                                     "name": "password",
                                                     "ignore.empty.value": true,
                                                     "shouldBe": "equal",
-                                                    "error-message": id<`\${${MessageKey}}`>("${invalidPasswordConfirmMessage}"),
+                                                    "error-message": id<`\${${MessageKeyBase}}`>("${invalidPasswordConfirmMessage}"),
                                                 },
                                             },
                                             "annotations": {},
@@ -382,6 +384,7 @@ export function useFormValidationSlice(params: {
                 "attributes": attributesWithPassword,
             },
         },
+        i18n,
     });
 
     const initialInternalState = useMemo(