Update dependency tss-react to ^4.3.3

README.md

@@ -49,6 +49,12 @@
 
 # Changelog highlights
 
+## 6.4.0
+
+-   You can now optionally pass a `doFetchDefaultThemeResources: boolean` prop to every page component and the default `<KcApp />`
+    This enables you to prevent the default CSS and JS that comes with the builtin Keycloak theme to be downloaded.  
+    You'll get [a black slate](https://user-images.githubusercontent.com/6702424/192619083-4baa5df4-4a21-4ec7-8e28-d200d1208299.png).
+
 ## 6.0.0
 
 -   Bundle size drastically reduced, locals and component dynamically loaded.

package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "6.3.5",
+    "version": "6.4.3",
     "description": "Keycloak theme generator for Reacts app",
     "repository": {
         "type": "git",
@@ -77,16 +77,16 @@
         "@octokit/rest": "^18.12.0",
         "cheerio": "^1.0.0-rc.5",
         "cli-select": "^1.1.2",
-        "evt": "^2.4.1",
+        "evt": "^2.4.4",
         "memoizee": "^0.4.15",
         "minimal-polyfills": "^2.2.2",
         "minimist": "^1.2.6",
         "path-browserify": "^1.0.1",
-        "powerhooks": "^0.20.16",
+        "powerhooks": "^0.20.20",
         "react-markdown": "^5.0.3",
         "scripting-tools": "^0.19.13",
-        "tsafe": "^1.0.1",
-        "tss-react": "^4.1.3",
+        "tsafe": "^1.1.1",
+        "tss-react": "^4.3.3",
         "zod": "^3.17.10"
     }
 }

src/lib/components/Error.tsx

@@ -4,31 +4,37 @@ import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const Error = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Error; i18n: I18n } & KcProps) => {
-    const { message, client } = kcContext;
+const Error = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.Error; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { message, client } = kcContext;
 
-    const { msg } = i18n;
+        const { msg } = i18n;
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            displayMessage={false}
-            headerNode={msg("errorTitle")}
-            formNode={
-                <div id="kc-error-message">
-                    <p className="instruction">{message.summary}</p>
-                    {client !== undefined && client.baseUrl !== undefined && (
-                        <p>
-                            <a id="backToApplication" href={client.baseUrl}>
-                                {msg("backToApplication")}
-                            </a>
-                        </p>
-                    )}
-                </div>
-            }
-        />
-    );
-});
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayMessage={false}
+                headerNode={msg("errorTitle")}
+                formNode={
+                    <div id="kc-error-message">
+                        <p className="instruction">{message.summary}</p>
+                        {client !== undefined && client.baseUrl !== undefined && (
+                            <p>
+                                <a id="backToApplication" href={client.baseUrl}>
+                                    {msg("backToApplication")}
+                                </a>
+                            </p>
+                        )}
+                    </div>
+                }
+            />
+        );
+    }
+);
 
 export default Error;

src/lib/components/IdpReviewUserProfile.tsx

@@ -6,41 +6,52 @@ import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
-const IdpReviewUserProfile = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.IdpReviewUserProfile; i18n: I18n } & KcProps) => {
-    const { cx } = useCssAndCx();
+const IdpReviewUserProfile = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.IdpReviewUserProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    const { url } = kcContext;
+        const { url } = kcContext;
 
-    const [isFomSubmittable, setIsFomSubmittable] = useState(false);
+        const [isFomSubmittable, setIsFomSubmittable] = useState(false);
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            headerNode={msg("loginIdpReviewProfileTitle")}
-            formNode={
-                <form id="kc-idp-review-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("loginIdpReviewProfileTitle")}
+                formNode={
+                    <form id="kc-idp-review-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
+                        <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
 
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                            <div className={cx(props.kcFormOptionsWrapperClass)} />
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
+                                <div className={cx(props.kcFormOptionsWrapperClass)} />
+                            </div>
+                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                                <input
+                                    className={cx(
+                                        props.kcButtonClass,
+                                        props.kcButtonPrimaryClass,
+                                        props.kcButtonBlockClass,
+                                        props.kcButtonLargeClass
+                                    )}
+                                    type="submit"
+                                    value={msgStr("doSubmit")}
+                                    disabled={!isFomSubmittable}
+                                />
+                            </div>
                         </div>
-                        <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                            <input
-                                className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
-                                type="submit"
-                                value={msgStr("doSubmit")}
-                                disabled={!isFomSubmittable}
-                            />
-                        </div>
-                    </div>
-                </form>
-            }
-        />
-    );
-});
+                    </form>
+                }
+            />
+        );
+    }
+);
 
 export default IdpReviewUserProfile;

src/lib/components/Info.tsx

@@ -5,47 +5,53 @@ import { assert } from "../tools/assert";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const Info = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Info; i18n: I18n } & KcProps) => {
-    const { msgStr, msg } = i18n;
+const Info = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.Info; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { msgStr, msg } = i18n;
 
-    assert(kcContext.message !== undefined);
+        assert(kcContext.message !== undefined);
 
-    const { messageHeader, message, requiredActions, skipLink, pageRedirectUri, actionUri, client } = kcContext;
+        const { messageHeader, message, requiredActions, skipLink, pageRedirectUri, actionUri, client } = kcContext;
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            displayMessage={false}
-            headerNode={messageHeader !== undefined ? <>{messageHeader}</> : <>{message.summary}</>}
-            formNode={
-                <div id="kc-info-message">
-                    <p className="instruction">
-                        {message.summary}
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayMessage={false}
+                headerNode={messageHeader !== undefined ? <>{messageHeader}</> : <>{message.summary}</>}
+                formNode={
+                    <div id="kc-info-message">
+                        <p className="instruction">
+                            {message.summary}
 
-                        {requiredActions !== undefined && (
-                            <b>{requiredActions.map(requiredAction => msgStr(`requiredAction.${requiredAction}` as const)).join(",")}</b>
-                        )}
-                    </p>
-                    {!skipLink && pageRedirectUri !== undefined ? (
-                        <p>
-                            <a href={pageRedirectUri}>{msg("backToApplication")}</a>
+                            {requiredActions !== undefined && (
+                                <b>{requiredActions.map(requiredAction => msgStr(`requiredAction.${requiredAction}` as const)).join(",")}</b>
+                            )}
                         </p>
-                    ) : actionUri !== undefined ? (
-                        <p>
-                            <a href={actionUri}>{msg("proceedWithAction")}</a>
-                        </p>
-                    ) : (
-                        client.baseUrl !== undefined && (
+                        {!skipLink && pageRedirectUri !== undefined ? (
                             <p>
-                                <a href={client.baseUrl}>{msg("backToApplication")}</a>
+                                <a href={pageRedirectUri}>{msg("backToApplication")}</a>
                             </p>
-                        )
-                    )}
-                </div>
-            }
-        />
-    );
-});
+                        ) : actionUri !== undefined ? (
+                            <p>
+                                <a href={actionUri}>{msg("proceedWithAction")}</a>
+                            </p>
+                        ) : (
+                            client.baseUrl !== undefined && (
+                                <p>
+                                    <a href={client.baseUrl}>{msg("backToApplication")}</a>
+                                </p>
+                            )
+                        )}
+                    </div>
+                }
+            />
+        );
+    }
+);
 
 export default Info;

src/lib/components/KcApp.tsx

@@ -23,67 +23,73 @@ const LogoutConfirm = lazy(() => import("./LogoutConfirm"));
 const UpdateUserProfile = lazy(() => import("./UpdateUserProfile"));
 const IdpReviewUserProfile = lazy(() => import("./IdpReviewUserProfile"));
 
-const KcApp = memo(({ kcContext, i18n: userProvidedI18n, ...kcProps }: { kcContext: KcContextBase; i18n?: I18n } & KcProps) => {
-    const i18n = (function useClosure() {
-        const i18n = useI18n({
-            kcContext,
-            "extraMessages": {},
-            "doSkip": userProvidedI18n !== undefined
-        });
+const KcApp = memo(
+    ({
+        kcContext,
+        i18n: userProvidedI18n,
+        ...kcProps
+    }: { kcContext: KcContextBase; i18n?: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const i18n = (function useClosure() {
+            const i18n = useI18n({
+                kcContext,
+                "extraMessages": {},
+                "doSkip": userProvidedI18n !== undefined
+            });
 
-        return userProvidedI18n ?? i18n;
-    })();
+            return userProvidedI18n ?? i18n;
+        })();
 
-    if (i18n === null) {
-        return null;
+        if (i18n === null) {
+            return null;
+        }
+
+        const props = { i18n, ...kcProps };
+
+        return (
+            <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 }} />;
+                        case "update-user-profile.ftl":
+                            return <UpdateUserProfile {...{ kcContext, ...props }} />;
+                        case "idp-review-user-profile.ftl":
+                            return <IdpReviewUserProfile {...{ kcContext, ...props }} />;
+                    }
+                })()}
+            </Suspense>
+        );
     }
-
-    const props = { i18n, ...kcProps };
-
-    return (
-        <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 }} />;
-                    case "update-user-profile.ftl":
-                        return <UpdateUserProfile {...{ kcContext, ...props }} />;
-                    case "idp-review-user-profile.ftl":
-                        return <IdpReviewUserProfile {...{ kcContext, ...props }} />;
-                }
-            })()}
-        </Suspense>
-    );
-});
+);
 
 export default KcApp;

src/lib/components/Login.tsx

@@ -7,189 +7,197 @@ import { useConstCallback } from "powerhooks/useConstCallback";
 import type { FormEventHandler } from "react";
 import type { I18n } from "../i18n";
 
-const Login = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Login; i18n: I18n } & KcProps) => {
-    const { social, realm, url, usernameEditDisabled, login, auth, registrationDisabled } = kcContext;
+const Login = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.Login; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { social, realm, url, usernameEditDisabled, login, auth, registrationDisabled } = kcContext;
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    const { cx } = useCssAndCx();
+        const { cx } = useCssAndCx();
 
-    const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
+        const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
 
-    const onSubmit = useConstCallback<FormEventHandler<HTMLFormElement>>(e => {
-        e.preventDefault();
+        const onSubmit = useConstCallback<FormEventHandler<HTMLFormElement>>(e => {
+            e.preventDefault();
 
-        setIsLoginButtonDisabled(true);
+            setIsLoginButtonDisabled(true);
 
-        const formElement = e.target as HTMLFormElement;
+            const formElement = e.target as HTMLFormElement;
 
-        //NOTE: Even if we login with email Keycloak expect username and password in
-        //the POST request.
-        formElement.querySelector("input[name='email']")?.setAttribute("name", "username");
+            //NOTE: Even if we login with email Keycloak expect username and password in
+            //the POST request.
+            formElement.querySelector("input[name='email']")?.setAttribute("name", "username");
 
-        formElement.submit();
-    });
+            formElement.submit();
+        });
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            displayInfo={social.displayInfo}
-            displayWide={realm.password && social.providers !== undefined}
-            headerNode={msg("doLogIn")}
-            formNode={
-                <div id="kc-form" className={cx(realm.password && social.providers !== undefined && props.kcContentWrapperClass)}>
-                    <div
-                        id="kc-form-wrapper"
-                        className={cx(realm.password && social.providers && [props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass])}
-                    >
-                        {realm.password && (
-                            <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
-                                <div className={cx(props.kcFormGroupClass)}>
-                                    {(() => {
-                                        const label = !realm.loginWithEmailAllowed
-                                            ? "username"
-                                            : realm.registrationEmailAsUsername
-                                            ? "email"
-                                            : "usernameOrEmail";
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayInfo={social.displayInfo}
+                displayWide={realm.password && social.providers !== undefined}
+                headerNode={msg("doLogIn")}
+                formNode={
+                    <div id="kc-form" className={cx(realm.password && social.providers !== undefined && props.kcContentWrapperClass)}>
+                        <div
+                            id="kc-form-wrapper"
+                            className={cx(
+                                realm.password && social.providers && [props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass]
+                            )}
+                        >
+                            {realm.password && (
+                                <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
+                                    <div className={cx(props.kcFormGroupClass)}>
+                                        {(() => {
+                                            const label = !realm.loginWithEmailAllowed
+                                                ? "username"
+                                                : realm.registrationEmailAsUsername
+                                                ? "email"
+                                                : "usernameOrEmail";
 
-                                        const autoCompleteHelper: typeof label = label === "usernameOrEmail" ? "username" : label;
+                                            const autoCompleteHelper: typeof label = label === "usernameOrEmail" ? "username" : label;
 
-                                        return (
-                                            <>
-                                                <label htmlFor={autoCompleteHelper} className={cx(props.kcLabelClass)}>
-                                                    {msg(label)}
-                                                </label>
-                                                <input
-                                                    tabIndex={1}
-                                                    id={autoCompleteHelper}
-                                                    className={cx(props.kcInputClass)}
-                                                    //NOTE: This is used by Google Chrome auto fill so we use it to tell
-                                                    //the browser how to pre fill the form but before submit we put it back
-                                                    //to username because it is what keycloak expects.
-                                                    name={autoCompleteHelper}
-                                                    defaultValue={login.username ?? ""}
-                                                    type="text"
-                                                    {...(usernameEditDisabled
-                                                        ? { "disabled": true }
-                                                        : {
-                                                              "autoFocus": true,
-                                                              "autoComplete": "off"
-                                                          })}
-                                                />
-                                            </>
-                                        );
-                                    })()}
-                                </div>
-                                <div className={cx(props.kcFormGroupClass)}>
-                                    <label htmlFor="password" className={cx(props.kcLabelClass)}>
-                                        {msg("password")}
-                                    </label>
-                                    <input
-                                        tabIndex={2}
-                                        id="password"
-                                        className={cx(props.kcInputClass)}
-                                        name="password"
-                                        type="password"
-                                        autoComplete="off"
-                                    />
-                                </div>
-                                <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
-                                    <div id="kc-form-options">
-                                        {realm.rememberMe && !usernameEditDisabled && (
-                                            <div className="checkbox">
-                                                <label>
+                                            return (
+                                                <>
+                                                    <label htmlFor={autoCompleteHelper} className={cx(props.kcLabelClass)}>
+                                                        {msg(label)}
+                                                    </label>
                                                     <input
-                                                        tabIndex={3}
-                                                        id="rememberMe"
-                                                        name="rememberMe"
-                                                        type="checkbox"
-                                                        {...(login.rememberMe
-                                                            ? {
-                                                                  "checked": true
-                                                              }
-                                                            : {})}
+                                                        tabIndex={1}
+                                                        id={autoCompleteHelper}
+                                                        className={cx(props.kcInputClass)}
+                                                        //NOTE: This is used by Google Chrome auto fill so we use it to tell
+                                                        //the browser how to pre fill the form but before submit we put it back
+                                                        //to username because it is what keycloak expects.
+                                                        name={autoCompleteHelper}
+                                                        defaultValue={login.username ?? ""}
+                                                        type="text"
+                                                        {...(usernameEditDisabled
+                                                            ? { "disabled": true }
+                                                            : {
+                                                                  "autoFocus": true,
+                                                                  "autoComplete": "off"
+                                                              })}
                                                     />
-                                                    {msg("rememberMe")}
-                                                </label>
-                                            </div>
-                                        )}
+                                                </>
+                                            );
+                                        })()}
                                     </div>
-                                    <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                        {realm.resetPasswordAllowed && (
-                                            <span>
-                                                <a tabIndex={5} href={url.loginResetCredentialsUrl}>
-                                                    {msg("doForgotPassword")}
-                                                </a>
-                                            </span>
-                                        )}
+                                    <div className={cx(props.kcFormGroupClass)}>
+                                        <label htmlFor="password" className={cx(props.kcLabelClass)}>
+                                            {msg("password")}
+                                        </label>
+                                        <input
+                                            tabIndex={2}
+                                            id="password"
+                                            className={cx(props.kcInputClass)}
+                                            name="password"
+                                            type="password"
+                                            autoComplete="off"
+                                        />
                                     </div>
-                                </div>
-                                <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
-                                    <input
-                                        type="hidden"
-                                        id="id-hidden-input"
-                                        name="credentialId"
-                                        {...(auth?.selectedCredential !== undefined
-                                            ? {
-                                                  "value": auth.selectedCredential
-                                              }
-                                            : {})}
-                                    />
-                                    <input
-                                        tabIndex={4}
-                                        className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonPrimaryClass,
-                                            props.kcButtonBlockClass,
-                                            props.kcButtonLargeClass
-                                        )}
-                                        name="login"
-                                        id="kc-login"
-                                        type="submit"
-                                        value={msgStr("doLogIn")}
-                                        disabled={isLoginButtonDisabled}
-                                    />
-                                </div>
-                            </form>
+                                    <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
+                                        <div id="kc-form-options">
+                                            {realm.rememberMe && !usernameEditDisabled && (
+                                                <div className="checkbox">
+                                                    <label>
+                                                        <input
+                                                            tabIndex={3}
+                                                            id="rememberMe"
+                                                            name="rememberMe"
+                                                            type="checkbox"
+                                                            {...(login.rememberMe
+                                                                ? {
+                                                                      "checked": true
+                                                                  }
+                                                                : {})}
+                                                        />
+                                                        {msg("rememberMe")}
+                                                    </label>
+                                                </div>
+                                            )}
+                                        </div>
+                                        <div className={cx(props.kcFormOptionsWrapperClass)}>
+                                            {realm.resetPasswordAllowed && (
+                                                <span>
+                                                    <a tabIndex={5} href={url.loginResetCredentialsUrl}>
+                                                        {msg("doForgotPassword")}
+                                                    </a>
+                                                </span>
+                                            )}
+                                        </div>
+                                    </div>
+                                    <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
+                                        <input
+                                            type="hidden"
+                                            id="id-hidden-input"
+                                            name="credentialId"
+                                            {...(auth?.selectedCredential !== undefined
+                                                ? {
+                                                      "value": auth.selectedCredential
+                                                  }
+                                                : {})}
+                                        />
+                                        <input
+                                            tabIndex={4}
+                                            className={cx(
+                                                props.kcButtonClass,
+                                                props.kcButtonPrimaryClass,
+                                                props.kcButtonBlockClass,
+                                                props.kcButtonLargeClass
+                                            )}
+                                            name="login"
+                                            id="kc-login"
+                                            type="submit"
+                                            value={msgStr("doLogIn")}
+                                            disabled={isLoginButtonDisabled}
+                                        />
+                                    </div>
+                                </form>
+                            )}
+                        </div>
+                        {realm.password && social.providers !== undefined && (
+                            <div id="kc-social-providers" className={cx(props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass)}>
+                                <ul
+                                    className={cx(
+                                        props.kcFormSocialAccountListClass,
+                                        social.providers.length > 4 && props.kcFormSocialAccountDoubleListClass
+                                    )}
+                                >
+                                    {social.providers.map(p => (
+                                        <li key={p.providerId} className={cx(props.kcFormSocialAccountListLinkClass)}>
+                                            <a href={p.loginUrl} id={`zocial-${p.alias}`} className={cx("zocial", p.providerId)}>
+                                                <span>{p.displayName}</span>
+                                            </a>
+                                        </li>
+                                    ))}
+                                </ul>
+                            </div>
                         )}
                     </div>
-                    {realm.password && social.providers !== undefined && (
-                        <div id="kc-social-providers" className={cx(props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass)}>
-                            <ul
-                                className={cx(
-                                    props.kcFormSocialAccountListClass,
-                                    social.providers.length > 4 && props.kcFormSocialAccountDoubleListClass
-                                )}
-                            >
-                                {social.providers.map(p => (
-                                    <li key={p.providerId} className={cx(props.kcFormSocialAccountListLinkClass)}>
-                                        <a href={p.loginUrl} id={`zocial-${p.alias}`} className={cx("zocial", p.providerId)}>
-                                            <span>{p.displayName}</span>
-                                        </a>
-                                    </li>
-                                ))}
-                            </ul>
+                }
+                infoNode={
+                    realm.password &&
+                    realm.registrationAllowed &&
+                    !registrationDisabled && (
+                        <div id="kc-registration">
+                            <span>
+                                {msg("noAccount")}
+                                <a tabIndex={6} href={url.registrationUrl}>
+                                    {msg("doRegister")}
+                                </a>
+                            </span>
                         </div>
-                    )}
-                </div>
-            }
-            infoNode={
-                realm.password &&
-                realm.registrationAllowed &&
-                !registrationDisabled && (
-                    <div id="kc-registration">
-                        <span>
-                            {msg("noAccount")}
-                            <a tabIndex={6} href={url.registrationUrl}>
-                                {msg("doRegister")}
-                            </a>
-                        </span>
-                    </div>
-                )
-            }
-        />
-    );
-});
+                    )
+                }
+            />
+        );
+    }
+);
 
 export default Login;

src/lib/components/LoginConfigTotp.tsx

@@ -5,182 +5,188 @@ import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginConfigTotp = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginConfigTotp; i18n: I18n } & KcProps) => {
-    const { url, isAppInitiatedAction, totp, mode, messagesPerField } = kcContext;
+const LoginConfigTotp = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LoginConfigTotp; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { url, isAppInitiatedAction, totp, mode, messagesPerField } = kcContext;
 
-    const { cx } = useCssAndCx();
+        const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    const algToKeyUriAlg: Record<KcContextBase.LoginConfigTotp["totp"]["policy"]["algorithm"], string> = {
-        HmacSHA1: "SHA1",
-        HmacSHA256: "SHA256",
-        HmacSHA512: "SHA512"
-    };
+        const algToKeyUriAlg: Record<KcContextBase.LoginConfigTotp["totp"]["policy"]["algorithm"], string> = {
+            HmacSHA1: "SHA1",
+            HmacSHA256: "SHA256",
+            HmacSHA512: "SHA512"
+        };
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            headerNode={msg("loginTotpTitle")}
-            formNode={
-                <>
-                    <ol id="kc-totp-settings">
-                        <li>
-                            <p>{msg("loginTotpStep1")}</p>
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("loginTotpTitle")}
+                formNode={
+                    <>
+                        <ol id="kc-totp-settings">
+                            <li>
+                                <p>{msg("loginTotpStep1")}</p>
 
-                            <ul id="kc-totp-supported-apps">
-                                {totp.policy.supportedApplications.map(app => (
-                                    <li>{app}</li>
-                                ))}
-                            </ul>
-                        </li>
+                                <ul id="kc-totp-supported-apps">
+                                    {totp.policy.supportedApplications.map(app => (
+                                        <li>{app}</li>
+                                    ))}
+                                </ul>
+                            </li>
 
-                        {mode && mode == "manual" ? (
-                            <>
+                            {mode && mode == "manual" ? (
+                                <>
+                                    <li>
+                                        <p>{msg("loginTotpManualStep2")}</p>
+                                        <p>
+                                            <span id="kc-totp-secret-key">{totp.totpSecretEncoded}</span>
+                                        </p>
+                                        <p>
+                                            <a href={totp.qrUrl} id="mode-barcode">
+                                                {msg("loginTotpScanBarcode")}
+                                            </a>
+                                        </p>
+                                    </li>
+                                    <li>
+                                        <p>{msg("loginTotpManualStep3")}</p>
+                                        <p>
+                                            <ul>
+                                                <li id="kc-totp-type">
+                                                    {msg("loginTotpType")}: {msg(`loginTotp.${totp.policy.type}`)}
+                                                </li>
+                                                <li id="kc-totp-algorithm">
+                                                    {msg("loginTotpAlgorithm")}: {algToKeyUriAlg?.[totp.policy.algorithm] ?? totp.policy.algorithm}
+                                                </li>
+                                                <li id="kc-totp-digits">
+                                                    {msg("loginTotpDigits")}: {totp.policy.digits}
+                                                </li>
+                                                {totp.policy.type === "totp" ? (
+                                                    <li id="kc-totp-period">
+                                                        {msg("loginTotpInterval")}: {totp.policy.period}
+                                                    </li>
+                                                ) : (
+                                                    <li id="kc-totp-counter">
+                                                        {msg("loginTotpCounter")}: {totp.policy.initialCounter}
+                                                    </li>
+                                                )}
+                                            </ul>
+                                        </p>
+                                    </li>
+                                </>
+                            ) : (
                                 <li>
-                                    <p>{msg("loginTotpManualStep2")}</p>
+                                    <p>{msg("loginTotpStep2")}</p>
+                                    <img id="kc-totp-secret-qr-code" src={`data:image/png;base64, ${totp.totpSecretQrCode}`} alt="Figure: Barcode" />
+                                    <br />
                                     <p>
-                                        <span id="kc-totp-secret-key">{totp.totpSecretEncoded}</span>
-                                    </p>
-                                    <p>
-                                        <a href={totp.qrUrl} id="mode-barcode">
-                                            {msg("loginTotpScanBarcode")}
+                                        <a href={totp.manualUrl} id="mode-manual">
+                                            {msg("loginTotpUnableToScan")}
                                         </a>
                                     </p>
                                 </li>
-                                <li>
-                                    <p>{msg("loginTotpManualStep3")}</p>
-                                    <p>
-                                        <ul>
-                                            <li id="kc-totp-type">
-                                                {msg("loginTotpType")}: {msg(`loginTotp.${totp.policy.type}`)}
-                                            </li>
-                                            <li id="kc-totp-algorithm">
-                                                {msg("loginTotpAlgorithm")}: {algToKeyUriAlg?.[totp.policy.algorithm] ?? totp.policy.algorithm}
-                                            </li>
-                                            <li id="kc-totp-digits">
-                                                {msg("loginTotpDigits")}: {totp.policy.digits}
-                                            </li>
-                                            {totp.policy.type === "totp" ? (
-                                                <li id="kc-totp-period">
-                                                    {msg("loginTotpInterval")}: {totp.policy.period}
-                                                </li>
-                                            ) : (
-                                                <li id="kc-totp-counter">
-                                                    {msg("loginTotpCounter")}: {totp.policy.initialCounter}
-                                                </li>
-                                            )}
-                                        </ul>
-                                    </p>
-                                </li>
-                            </>
-                        ) : (
+                            )}
                             <li>
-                                <p>{msg("loginTotpStep2")}</p>
-                                <img id="kc-totp-secret-qr-code" src={`data:image/png;base64, ${totp.totpSecretQrCode}`} alt="Figure: Barcode" />
-                                <br />
-                                <p>
-                                    <a href={totp.manualUrl} id="mode-manual">
-                                        {msg("loginTotpUnableToScan")}
-                                    </a>
-                                </p>
+                                <p>{msg("loginTotpStep3")}</p>
+                                <p>{msg("loginTotpStep3DeviceName")}</p>
                             </li>
-                        )}
-                        <li>
-                            <p>{msg("loginTotpStep3")}</p>
-                            <p>{msg("loginTotpStep3DeviceName")}</p>
-                        </li>
-                    </ol>
+                        </ol>
 
-                    <form action={url.loginAction} className={cx(props.kcFormClass)} id="kc-totp-settings-form" method="post">
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <label htmlFor="totp" className={cx(props.kcLabelClass)}>
-                                    {msg("authenticatorCode")}
-                                </label>{" "}
-                                <span className="required">*</span>
-                            </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <input
-                                    type="text"
-                                    id="totp"
-                                    name="totp"
-                                    autoComplete="off"
-                                    className={cx(props.kcInputClass)}
-                                    aria-invalid={messagesPerField.existsError("totp")}
-                                />
+                        <form action={url.loginAction} className={cx(props.kcFormClass)} id="kc-totp-settings-form" method="post">
+                            <div className={cx(props.kcFormGroupClass)}>
+                                <div className={cx(props.kcInputWrapperClass)}>
+                                    <label htmlFor="totp" className={cx(props.kcLabelClass)}>
+                                        {msg("authenticatorCode")}
+                                    </label>{" "}
+                                    <span className="required">*</span>
+                                </div>
+                                <div className={cx(props.kcInputWrapperClass)}>
+                                    <input
+                                        type="text"
+                                        id="totp"
+                                        name="totp"
+                                        autoComplete="off"
+                                        className={cx(props.kcInputClass)}
+                                        aria-invalid={messagesPerField.existsError("totp")}
+                                    />
 
-                                {messagesPerField.existsError("totp") && (
-                                    <span id="input-error-otp-code" className={cx(props.kcInputErrorMessageClass)} aria-live="polite">
-                                        {messagesPerField.get("totp")}
-                                    </span>
-                                )}
+                                    {messagesPerField.existsError("totp") && (
+                                        <span id="input-error-otp-code" className={cx(props.kcInputErrorMessageClass)} aria-live="polite">
+                                            {messagesPerField.get("totp")}
+                                        </span>
+                                    )}
+                                </div>
+                                <input type="hidden" id="totpSecret" name="totpSecret" value={totp.totpSecret} />
+                                {mode && <input type="hidden" id="mode" value={mode} />}
                             </div>
-                            <input type="hidden" id="totpSecret" name="totpSecret" value={totp.totpSecret} />
-                            {mode && <input type="hidden" id="mode" value={mode} />}
-                        </div>
 
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <label htmlFor="userLabel" className={cx(props.kcLabelClass)}>
-                                    {msg("loginTotpDeviceName")}
-                                </label>{" "}
-                                {totp.otpCredentials.length >= 1 && <span className="required">*</span>}
+                            <div className={cx(props.kcFormGroupClass)}>
+                                <div className={cx(props.kcInputWrapperClass)}>
+                                    <label htmlFor="userLabel" className={cx(props.kcLabelClass)}>
+                                        {msg("loginTotpDeviceName")}
+                                    </label>{" "}
+                                    {totp.otpCredentials.length >= 1 && <span className="required">*</span>}
+                                </div>
+                                <div className={cx(props.kcInputWrapperClass)}>
+                                    <input
+                                        type="text"
+                                        id="userLabel"
+                                        name="userLabel"
+                                        autoComplete="off"
+                                        className={cx(props.kcInputClass)}
+                                        aria-invalid={messagesPerField.existsError("userLabel")}
+                                    />
+                                    {messagesPerField.existsError("userLabel") && (
+                                        <span id="input-error-otp-label" className={cx(props.kcInputErrorMessageClass)} aria-live="polite">
+                                            {messagesPerField.get("userLabel")}
+                                        </span>
+                                    )}
+                                </div>
                             </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <input
-                                    type="text"
-                                    id="userLabel"
-                                    name="userLabel"
-                                    autoComplete="off"
-                                    className={cx(props.kcInputClass)}
-                                    aria-invalid={messagesPerField.existsError("userLabel")}
-                                />
-                                {messagesPerField.existsError("userLabel") && (
-                                    <span id="input-error-otp-label" className={cx(props.kcInputErrorMessageClass)} aria-live="polite">
-                                        {messagesPerField.get("userLabel")}
-                                    </span>
-                                )}
-                            </div>
-                        </div>
 
-                        {isAppInitiatedAction ? (
-                            <>
+                            {isAppInitiatedAction ? (
+                                <>
+                                    <input
+                                        type="submit"
+                                        className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                        id="saveTOTPBtn"
+                                        value={msgStr("doSubmit")}
+                                    />
+                                    <button
+                                        type="submit"
+                                        className={cx(
+                                            props.kcButtonClass,
+                                            props.kcButtonDefaultClass,
+                                            props.kcButtonLargeClass,
+                                            props.kcButtonLargeClass
+                                        )}
+                                        id="cancelTOTPBtn"
+                                        name="cancel-aia"
+                                        value="true"
+                                    >
+                                        ${msg("doCancel")}
+                                    </button>
+                                </>
+                            ) : (
                                 <input
                                     type="submit"
                                     className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
                                     id="saveTOTPBtn"
                                     value={msgStr("doSubmit")}
                                 />
-                                <button
-                                    type="submit"
-                                    className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonDefaultClass,
-                                        props.kcButtonLargeClass,
-                                        props.kcButtonLargeClass
-                                    )}
-                                    id="cancelTOTPBtn"
-                                    name="cancel-aia"
-                                    value="true"
-                                >
-                                    ${msg("doCancel")}
-                                </button>
-                            </>
-                        ) : (
-                            <input
-                                type="submit"
-                                className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
-                                id="saveTOTPBtn"
-                                value={msgStr("doSubmit")}
-                            />
-                        )}
-                    </form>
-                </>
-            }
-        />
-    );
-});
+                            )}
+                        </form>
+                    </>
+                }
+            />
+        );
+    }
+);
 
 export default LoginConfigTotp;

src/lib/components/LoginIdpLinkConfirm.tsx

@@ -5,44 +5,50 @@ import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginIdpLinkConfirm = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginIdpLinkConfirm; i18n: I18n } & KcProps) => {
-    const { url, idpAlias } = kcContext;
+const LoginIdpLinkConfirm = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LoginIdpLinkConfirm; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { url, idpAlias } = kcContext;
 
-    const { msg } = i18n;
+        const { msg } = i18n;
 
-    const { cx } = useCssAndCx();
+        const { cx } = useCssAndCx();
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            headerNode={msg("confirmLinkIdpTitle")}
-            formNode={
-                <form id="kc-register-form" action={url.loginAction} method="post">
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <button
-                            type="submit"
-                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
-                            name="submitAction"
-                            id="updateProfile"
-                            value="updateProfile"
-                        >
-                            {msg("confirmLinkIdpReviewProfile")}
-                        </button>
-                        <button
-                            type="submit"
-                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
-                            name="submitAction"
-                            id="linkAccount"
-                            value="linkAccount"
-                        >
-                            {msg("confirmLinkIdpContinue", idpAlias)}
-                        </button>
-                    </div>
-                </form>
-            }
-        />
-    );
-});
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("confirmLinkIdpTitle")}
+                formNode={
+                    <form id="kc-register-form" action={url.loginAction} method="post">
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <button
+                                type="submit"
+                                className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
+                                name="submitAction"
+                                id="updateProfile"
+                                value="updateProfile"
+                            >
+                                {msg("confirmLinkIdpReviewProfile")}
+                            </button>
+                            <button
+                                type="submit"
+                                className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
+                                name="submitAction"
+                                id="linkAccount"
+                                value="linkAccount"
+                            >
+                                {msg("confirmLinkIdpContinue", idpAlias)}
+                            </button>
+                        </div>
+                    </form>
+                }
+            />
+        );
+    }
+);
 
 export default LoginIdpLinkConfirm;

src/lib/components/LoginIdpLinkEmail.tsx

@@ -4,31 +4,37 @@ import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LoginIdpLinkEmail = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginIdpLinkEmail; i18n: I18n } & KcProps) => {
-    const { url, realm, brokerContext, idpAlias } = kcContext;
+const LoginIdpLinkEmail = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LoginIdpLinkEmail; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { url, realm, brokerContext, idpAlias } = kcContext;
 
-    const { msg } = i18n;
+        const { msg } = i18n;
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            headerNode={msg("emailLinkIdpTitle", idpAlias)}
-            formNode={
-                <>
-                    <p id="instruction1" className="instruction">
-                        {msg("emailLinkIdp1", idpAlias, brokerContext.username, realm.displayName)}
-                    </p>
-                    <p id="instruction2" className="instruction">
-                        {msg("emailLinkIdp2")} <a href={url.loginAction}>{msg("doClickHere")}</a> {msg("emailLinkIdp3")}
-                    </p>
-                    <p id="instruction3" className="instruction">
-                        {msg("emailLinkIdp4")} <a href={url.loginAction}>{msg("doClickHere")}</a> {msg("emailLinkIdp5")}
-                    </p>
-                </>
-            }
-        />
-    );
-});
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("emailLinkIdpTitle", idpAlias)}
+                formNode={
+                    <>
+                        <p id="instruction1" className="instruction">
+                            {msg("emailLinkIdp1", idpAlias, brokerContext.username, realm.displayName)}
+                        </p>
+                        <p id="instruction2" className="instruction">
+                            {msg("emailLinkIdp2")} <a href={url.loginAction}>{msg("doClickHere")}</a> {msg("emailLinkIdp3")}
+                        </p>
+                        <p id="instruction3" className="instruction">
+                            {msg("emailLinkIdp4")} <a href={url.loginAction}>{msg("doClickHere")}</a> {msg("emailLinkIdp5")}
+                        </p>
+                    </>
+                }
+            />
+        );
+    }
+);
 
 export default LoginIdpLinkEmail;

src/lib/components/LoginOtp.tsx

@@ -7,84 +7,95 @@ import { pathJoin } from "../../bin/tools/pathJoin";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginOtp = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginOtp; i18n: I18n } & KcProps) => {
-    const { otpLogin, url } = kcContext;
+const LoginOtp = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LoginOtp; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { otpLogin, url } = kcContext;
 
-    const { cx } = useCssAndCx();
+        const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    useEffect(() => {
-        let isCleanedUp = false;
+        useEffect(() => {
+            let isCleanedUp = false;
 
-        headInsert({
-            "type": "javascript",
-            "src": pathJoin(kcContext.url.resourcesCommonPath, "node_modules/jquery/dist/jquery.min.js")
-        }).then(() => {
-            if (isCleanedUp) return;
+            headInsert({
+                "type": "javascript",
+                "src": pathJoin(kcContext.url.resourcesCommonPath, "node_modules/jquery/dist/jquery.min.js")
+            }).then(() => {
+                if (isCleanedUp) return;
 
-            evaluateInlineScript();
-        });
+                evaluateInlineScript();
+            });
 
-        return () => {
-            isCleanedUp = true;
-        };
-    }, []);
+            return () => {
+                isCleanedUp = true;
+            };
+        }, []);
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            headerNode={msg("doLogIn")}
-            formNode={
-                <form id="kc-otp-login-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                    {otpLogin.userOtpCredentials.length > 1 && (
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                {otpLogin.userOtpCredentials.map(otpCredential => (
-                                    <div key={otpCredential.id} className={cx(props.kcSelectOTPListClass)}>
-                                        <input type="hidden" value="${otpCredential.id}" />
-                                        <div className={cx(props.kcSelectOTPListItemClass)}>
-                                            <span className={cx(props.kcAuthenticatorOtpCircleClass)} />
-                                            <h2 className={cx(props.kcSelectOTPItemHeadingClass)}>{otpCredential.userLabel}</h2>
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("doLogIn")}
+                formNode={
+                    <form id="kc-otp-login-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
+                        {otpLogin.userOtpCredentials.length > 1 && (
+                            <div className={cx(props.kcFormGroupClass)}>
+                                <div className={cx(props.kcInputWrapperClass)}>
+                                    {otpLogin.userOtpCredentials.map(otpCredential => (
+                                        <div key={otpCredential.id} className={cx(props.kcSelectOTPListClass)}>
+                                            <input type="hidden" value="${otpCredential.id}" />
+                                            <div className={cx(props.kcSelectOTPListItemClass)}>
+                                                <span className={cx(props.kcAuthenticatorOtpCircleClass)} />
+                                                <h2 className={cx(props.kcSelectOTPItemHeadingClass)}>{otpCredential.userLabel}</h2>
+                                            </div>
                                         </div>
-                                    </div>
-                                ))}
+                                    ))}
+                                </div>
+                            </div>
+                        )}
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div className={cx(props.kcLabelWrapperClass)}>
+                                <label htmlFor="otp" className={cx(props.kcLabelClass)}>
+                                    {msg("loginOtpOneTime")}
+                                </label>
+                            </div>
+
+                            <div className={cx(props.kcInputWrapperClass)}>
+                                <input id="otp" name="otp" autoComplete="off" type="text" className={cx(props.kcInputClass)} autoFocus />
                             </div>
                         </div>
-                    )}
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <div className={cx(props.kcLabelWrapperClass)}>
-                            <label htmlFor="otp" className={cx(props.kcLabelClass)}>
-                                {msg("loginOtpOneTime")}
-                            </label>
-                        </div>
 
-                        <div className={cx(props.kcInputWrapperClass)}>
-                            <input id="otp" name="otp" autoComplete="off" type="text" className={cx(props.kcInputClass)} autoFocus />
-                        </div>
-                    </div>
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
+                                <div className={cx(props.kcFormOptionsWrapperClass)} />
+                            </div>
 
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                            <div className={cx(props.kcFormOptionsWrapperClass)} />
+                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                                <input
+                                    className={cx(
+                                        props.kcButtonClass,
+                                        props.kcButtonPrimaryClass,
+                                        props.kcButtonBlockClass,
+                                        props.kcButtonLargeClass
+                                    )}
+                                    name="login"
+                                    id="kc-login"
+                                    type="submit"
+                                    value={msgStr("doLogIn")}
+                                />
+                            </div>
                         </div>
-
-                        <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                            <input
-                                className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
-                                name="login"
-                                id="kc-login"
-                                type="submit"
-                                value={msgStr("doLogIn")}
-                            />
-                        </div>
-                    </div>
-                </form>
-            }
-        />
-    );
-});
+                    </form>
+                }
+            />
+        );
+    }
+);
 
 declare const $: any;
 

src/lib/components/LoginPageExpired.tsx

@@ -4,35 +4,41 @@ import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LoginPageExpired = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginPageExpired; i18n: I18n } & KcProps) => {
-    const { url } = kcContext;
+const LoginPageExpired = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LoginPageExpired; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { url } = kcContext;
 
-    const { msg } = i18n;
+        const { msg } = i18n;
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            displayMessage={false}
-            headerNode={msg("pageExpiredTitle")}
-            formNode={
-                <>
-                    <p id="instruction1" className="instruction">
-                        {msg("pageExpiredMsg1")}
-                        <a id="loginRestartLink" href={url.loginRestartFlowUrl}>
-                            {msg("doClickHere")}
-                        </a>{" "}
-                        .<br />
-                        {msg("pageExpiredMsg2")}{" "}
-                        <a id="loginContinueLink" href={url.loginAction}>
-                            {msg("doClickHere")}
-                        </a>{" "}
-                        .
-                    </p>
-                </>
-            }
-        />
-    );
-});
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayMessage={false}
+                headerNode={msg("pageExpiredTitle")}
+                formNode={
+                    <>
+                        <p id="instruction1" className="instruction">
+                            {msg("pageExpiredMsg1")}
+                            <a id="loginRestartLink" href={url.loginRestartFlowUrl}>
+                                {msg("doClickHere")}
+                            </a>{" "}
+                            .<br />
+                            {msg("pageExpiredMsg2")}{" "}
+                            <a id="loginContinueLink" href={url.loginAction}>
+                                {msg("doClickHere")}
+                            </a>{" "}
+                            .
+                        </p>
+                    </>
+                }
+            />
+        );
+    }
+);
 
 export default LoginPageExpired;

src/lib/components/LoginResetPassword.tsx

@@ -5,64 +5,75 @@ import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginResetPassword = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginResetPassword; i18n: I18n } & KcProps) => {
-    const { url, realm, auth } = kcContext;
+const LoginResetPassword = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LoginResetPassword; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { url, realm, auth } = kcContext;
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    const { cx } = useCssAndCx();
+        const { cx } = useCssAndCx();
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            displayMessage={false}
-            headerNode={msg("emailForgotTitle")}
-            formNode={
-                <form id="kc-reset-password-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <div className={cx(props.kcLabelWrapperClass)}>
-                            <label htmlFor="username" className={cx(props.kcLabelClass)}>
-                                {!realm.loginWithEmailAllowed
-                                    ? msg("username")
-                                    : !realm.registrationEmailAsUsername
-                                    ? msg("usernameOrEmail")
-                                    : msg("email")}
-                            </label>
-                        </div>
-                        <div className={cx(props.kcInputWrapperClass)}>
-                            <input
-                                type="text"
-                                id="username"
-                                name="username"
-                                className={cx(props.kcInputClass)}
-                                autoFocus
-                                defaultValue={auth !== undefined && auth.showUsername ? auth.attemptedUsername : undefined}
-                            />
-                        </div>
-                    </div>
-                    <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
-                        <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                            <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                <span>
-                                    <a href={url.loginUrl}>{msg("backToLogin")}</a>
-                                </span>
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayMessage={false}
+                headerNode={msg("emailForgotTitle")}
+                formNode={
+                    <form id="kc-reset-password-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div className={cx(props.kcLabelWrapperClass)}>
+                                <label htmlFor="username" className={cx(props.kcLabelClass)}>
+                                    {!realm.loginWithEmailAllowed
+                                        ? msg("username")
+                                        : !realm.registrationEmailAsUsername
+                                        ? msg("usernameOrEmail")
+                                        : msg("email")}
+                                </label>
+                            </div>
+                            <div className={cx(props.kcInputWrapperClass)}>
+                                <input
+                                    type="text"
+                                    id="username"
+                                    name="username"
+                                    className={cx(props.kcInputClass)}
+                                    autoFocus
+                                    defaultValue={auth !== undefined && auth.showUsername ? auth.attemptedUsername : undefined}
+                                />
                             </div>
                         </div>
+                        <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
+                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
+                                <div className={cx(props.kcFormOptionsWrapperClass)}>
+                                    <span>
+                                        <a href={url.loginUrl}>{msg("backToLogin")}</a>
+                                    </span>
+                                </div>
+                            </div>
 
-                        <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                            <input
-                                className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
-                                type="submit"
-                                value={msgStr("doSubmit")}
-                            />
+                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                                <input
+                                    className={cx(
+                                        props.kcButtonClass,
+                                        props.kcButtonPrimaryClass,
+                                        props.kcButtonBlockClass,
+                                        props.kcButtonLargeClass
+                                    )}
+                                    type="submit"
+                                    value={msgStr("doSubmit")}
+                                />
+                            </div>
                         </div>
-                    </div>
-                </form>
-            }
-            infoNode={msg("emailInstruction")}
-        />
-    );
-});
+                    </form>
+                }
+                infoNode={msg("emailInstruction")}
+            />
+        );
+    }
+);
 
 export default LoginResetPassword;

src/lib/components/LoginUpdatePassword.tsx

@@ -5,115 +5,121 @@ import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginUpdatePassword = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginUpdatePassword; i18n: I18n } & KcProps) => {
-    const { cx } = useCssAndCx();
+const LoginUpdatePassword = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LoginUpdatePassword; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    const { url, messagesPerField, isAppInitiatedAction, username } = kcContext;
+        const { url, messagesPerField, isAppInitiatedAction, username } = kcContext;
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            headerNode={msg("updatePasswordTitle")}
-            formNode={
-                <form id="kc-passwd-update-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                    <input
-                        type="text"
-                        id="username"
-                        name="username"
-                        value={username}
-                        readOnly={true}
-                        autoComplete="username"
-                        style={{ display: "none" }}
-                    />
-                    <input type="password" id="password" name="password" autoComplete="current-password" style={{ display: "none" }} />
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("updatePasswordTitle")}
+                formNode={
+                    <form id="kc-passwd-update-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
+                        <input
+                            type="text"
+                            id="username"
+                            name="username"
+                            value={username}
+                            readOnly={true}
+                            autoComplete="username"
+                            style={{ display: "none" }}
+                        />
+                        <input type="password" id="password" name="password" autoComplete="current-password" style={{ display: "none" }} />
 
-                    <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("password", props.kcFormGroupErrorClass))}>
-                        <div className={cx(props.kcLabelWrapperClass)}>
-                            <label htmlFor="password-new" className={cx(props.kcLabelClass)}>
-                                {msg("passwordNew")}
-                            </label>
-                        </div>
-                        <div className={cx(props.kcInputWrapperClass)}>
-                            <input
-                                type="password"
-                                id="password-new"
-                                name="password-new"
-                                autoFocus
-                                autoComplete="new-password"
-                                className={cx(props.kcInputClass)}
-                            />
-                        </div>
-                    </div>
-
-                    <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("password-confirm", props.kcFormGroupErrorClass))}>
-                        <div className={cx(props.kcLabelWrapperClass)}>
-                            <label htmlFor="password-confirm" className={cx(props.kcLabelClass)}>
-                                {msg("passwordConfirm")}
-                            </label>
-                        </div>
-                        <div className={cx(props.kcInputWrapperClass)}>
-                            <input
-                                type="password"
-                                id="password-confirm"
-                                name="password-confirm"
-                                autoComplete="new-password"
-                                className={cx(props.kcInputClass)}
-                            />
-                        </div>
-                    </div>
-
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                            <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                {isAppInitiatedAction && (
-                                    <div className="checkbox">
-                                        <label>
-                                            <input type="checkbox" id="logout-sessions" name="logout-sessions" value="on" checked />
-                                            {msgStr("logoutOtherSessions")}
-                                        </label>
-                                    </div>
-                                )}
+                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("password", props.kcFormGroupErrorClass))}>
+                            <div className={cx(props.kcLabelWrapperClass)}>
+                                <label htmlFor="password-new" className={cx(props.kcLabelClass)}>
+                                    {msg("passwordNew")}
+                                </label>
+                            </div>
+                            <div className={cx(props.kcInputWrapperClass)}>
+                                <input
+                                    type="password"
+                                    id="password-new"
+                                    name="password-new"
+                                    autoFocus
+                                    autoComplete="new-password"
+                                    className={cx(props.kcInputClass)}
+                                />
                             </div>
                         </div>
 
-                        <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                            {isAppInitiatedAction ? (
-                                <>
+                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("password-confirm", props.kcFormGroupErrorClass))}>
+                            <div className={cx(props.kcLabelWrapperClass)}>
+                                <label htmlFor="password-confirm" className={cx(props.kcLabelClass)}>
+                                    {msg("passwordConfirm")}
+                                </label>
+                            </div>
+                            <div className={cx(props.kcInputWrapperClass)}>
+                                <input
+                                    type="password"
+                                    id="password-confirm"
+                                    name="password-confirm"
+                                    autoComplete="new-password"
+                                    className={cx(props.kcInputClass)}
+                                />
+                            </div>
+                        </div>
+
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
+                                <div className={cx(props.kcFormOptionsWrapperClass)}>
+                                    {isAppInitiatedAction && (
+                                        <div className="checkbox">
+                                            <label>
+                                                <input type="checkbox" id="logout-sessions" name="logout-sessions" value="on" checked />
+                                                {msgStr("logoutOtherSessions")}
+                                            </label>
+                                        </div>
+                                    )}
+                                </div>
+                            </div>
+
+                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                                {isAppInitiatedAction ? (
+                                    <>
+                                        <input
+                                            className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                            type="submit"
+                                            defaultValue={msgStr("doSubmit")}
+                                        />
+                                        <button
+                                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
+                                            type="submit"
+                                            name="cancel-aia"
+                                            value="true"
+                                        >
+                                            {msg("doCancel")}
+                                        </button>
+                                    </>
+                                ) : (
                                     <input
-                                        className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                        className={cx(
+                                            props.kcButtonClass,
+                                            props.kcButtonPrimaryClass,
+                                            props.kcButtonBlockClass,
+                                            props.kcButtonLargeClass
+                                        )}
                                         type="submit"
                                         defaultValue={msgStr("doSubmit")}
                                     />
-                                    <button
-                                        className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
-                                        type="submit"
-                                        name="cancel-aia"
-                                        value="true"
-                                    >
-                                        {msg("doCancel")}
-                                    </button>
-                                </>
-                            ) : (
-                                <input
-                                    className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
-                                    )}
-                                    type="submit"
-                                    defaultValue={msgStr("doSubmit")}
-                                />
-                            )}
+                                )}
+                            </div>
                         </div>
-                    </div>
-                </form>
-            }
-        />
-    );
-});
+                    </form>
+                }
+            />
+        );
+    }
+);
 
 export default LoginUpdatePassword;

src/lib/components/LoginUpdateProfile.tsx

@@ -5,118 +5,130 @@ import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginUpdateProfile = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginUpdateProfile; i18n: I18n } & KcProps) => {
-    const { cx } = useCssAndCx();
+const LoginUpdateProfile = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LoginUpdateProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    const { url, user, messagesPerField, isAppInitiatedAction } = kcContext;
+        const { url, user, messagesPerField, isAppInitiatedAction } = kcContext;
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            headerNode={msg("loginProfileTitle")}
-            formNode={
-                <form id="kc-update-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                    {user.editUsernameAllowed && (
-                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("username", props.kcFormGroupErrorClass))}>
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("loginProfileTitle")}
+                formNode={
+                    <form id="kc-update-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
+                        {user.editUsernameAllowed && (
+                            <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("username", props.kcFormGroupErrorClass))}>
+                                <div className={cx(props.kcLabelWrapperClass)}>
+                                    <label htmlFor="username" className={cx(props.kcLabelClass)}>
+                                        {msg("username")}
+                                    </label>
+                                </div>
+                                <div className={cx(props.kcInputWrapperClass)}>
+                                    <input
+                                        type="text"
+                                        id="username"
+                                        name="username"
+                                        defaultValue={user.username ?? ""}
+                                        className={cx(props.kcInputClass)}
+                                    />
+                                </div>
+                            </div>
+                        )}
+
+                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("email", props.kcFormGroupErrorClass))}>
                             <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="username" className={cx(props.kcLabelClass)}>
-                                    {msg("username")}
+                                <label htmlFor="email" className={cx(props.kcLabelClass)}>
+                                    {msg("email")}
+                                </label>
+                            </div>
+                            <div className={cx(props.kcInputWrapperClass)}>
+                                <input type="text" id="email" name="email" defaultValue={user.email ?? ""} className={cx(props.kcInputClass)} />
+                            </div>
+                        </div>
+
+                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("firstName", props.kcFormGroupErrorClass))}>
+                            <div className={cx(props.kcLabelWrapperClass)}>
+                                <label htmlFor="firstName" className={cx(props.kcLabelClass)}>
+                                    {msg("firstName")}
                                 </label>
                             </div>
                             <div className={cx(props.kcInputWrapperClass)}>
                                 <input
                                     type="text"
-                                    id="username"
-                                    name="username"
-                                    defaultValue={user.username ?? ""}
+                                    id="firstName"
+                                    name="firstName"
+                                    defaultValue={user.firstName ?? ""}
                                     className={cx(props.kcInputClass)}
                                 />
                             </div>
                         </div>
-                    )}
 
-                    <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("email", props.kcFormGroupErrorClass))}>
-                        <div className={cx(props.kcLabelWrapperClass)}>
-                            <label htmlFor="email" className={cx(props.kcLabelClass)}>
-                                {msg("email")}
-                            </label>
-                        </div>
-                        <div className={cx(props.kcInputWrapperClass)}>
-                            <input type="text" id="email" name="email" defaultValue={user.email ?? ""} className={cx(props.kcInputClass)} />
-                        </div>
-                    </div>
-
-                    <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("firstName", props.kcFormGroupErrorClass))}>
-                        <div className={cx(props.kcLabelWrapperClass)}>
-                            <label htmlFor="firstName" className={cx(props.kcLabelClass)}>
-                                {msg("firstName")}
-                            </label>
-                        </div>
-                        <div className={cx(props.kcInputWrapperClass)}>
-                            <input
-                                type="text"
-                                id="firstName"
-                                name="firstName"
-                                defaultValue={user.firstName ?? ""}
-                                className={cx(props.kcInputClass)}
-                            />
-                        </div>
-                    </div>
-
-                    <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("lastName", props.kcFormGroupErrorClass))}>
-                        <div className={cx(props.kcLabelWrapperClass)}>
-                            <label htmlFor="lastName" className={cx(props.kcLabelClass)}>
-                                {msg("lastName")}
-                            </label>
-                        </div>
-                        <div className={cx(props.kcInputWrapperClass)}>
-                            <input type="text" id="lastName" name="lastName" defaultValue={user.lastName ?? ""} className={cx(props.kcInputClass)} />
-                        </div>
-                    </div>
-
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                            <div className={cx(props.kcFormOptionsWrapperClass)} />
+                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("lastName", props.kcFormGroupErrorClass))}>
+                            <div className={cx(props.kcLabelWrapperClass)}>
+                                <label htmlFor="lastName" className={cx(props.kcLabelClass)}>
+                                    {msg("lastName")}
+                                </label>
+                            </div>
+                            <div className={cx(props.kcInputWrapperClass)}>
+                                <input
+                                    type="text"
+                                    id="lastName"
+                                    name="lastName"
+                                    defaultValue={user.lastName ?? ""}
+                                    className={cx(props.kcInputClass)}
+                                />
+                            </div>
                         </div>
 
-                        <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                            {isAppInitiatedAction ? (
-                                <>
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
+                                <div className={cx(props.kcFormOptionsWrapperClass)} />
+                            </div>
+
+                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                                {isAppInitiatedAction ? (
+                                    <>
+                                        <input
+                                            className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                            type="submit"
+                                            defaultValue={msgStr("doSubmit")}
+                                        />
+                                        <button
+                                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
+                                            type="submit"
+                                            name="cancel-aia"
+                                            value="true"
+                                        >
+                                            {msg("doCancel")}
+                                        </button>
+                                    </>
+                                ) : (
                                     <input
-                                        className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                        className={cx(
+                                            props.kcButtonClass,
+                                            props.kcButtonPrimaryClass,
+                                            props.kcButtonBlockClass,
+                                            props.kcButtonLargeClass
+                                        )}
                                         type="submit"
                                         defaultValue={msgStr("doSubmit")}
                                     />
-                                    <button
-                                        className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
-                                        type="submit"
-                                        name="cancel-aia"
-                                        value="true"
-                                    >
-                                        {msg("doCancel")}
-                                    </button>
-                                </>
-                            ) : (
-                                <input
-                                    className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
-                                    )}
-                                    type="submit"
-                                    defaultValue={msgStr("doSubmit")}
-                                />
-                            )}
+                                )}
+                            </div>
                         </div>
-                    </div>
-                </form>
-            }
-        />
-    );
-});
+                    </form>
+                }
+            />
+        );
+    }
+);
 
 export default LoginUpdateProfile;

src/lib/components/LoginVerifyEmail.tsx

@@ -4,31 +4,37 @@ import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LoginVerifyEmail = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LoginVerifyEmail; i18n: I18n } & KcProps) => {
-    const { msg } = i18n;
+const LoginVerifyEmail = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LoginVerifyEmail; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { msg } = i18n;
 
-    const { url, user } = kcContext;
+        const { url, user } = kcContext;
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            displayMessage={false}
-            headerNode={msg("emailVerifyTitle")}
-            formNode={
-                <>
-                    <p className="instruction">{msg("emailVerifyInstruction1", user?.email)}</p>
-                    <p className="instruction">
-                        {msg("emailVerifyInstruction2")}
-                        <br />
-                        <a href={url.loginAction}>{msg("doClickHere")}</a>
-                        &nbsp;
-                        {msg("emailVerifyInstruction3")}
-                    </p>
-                </>
-            }
-        />
-    );
-});
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayMessage={false}
+                headerNode={msg("emailVerifyTitle")}
+                formNode={
+                    <>
+                        <p className="instruction">{msg("emailVerifyInstruction1", user?.email)}</p>
+                        <p className="instruction">
+                            {msg("emailVerifyInstruction2")}
+                            <br />
+                            <a href={url.loginAction}>{msg("doClickHere")}</a>
+                            &nbsp;
+                            {msg("emailVerifyInstruction3")}
+                        </p>
+                    </>
+                }
+            />
+        );
+    }
+);
 
 export default LoginVerifyEmail;

src/lib/components/LogoutConfirm.tsx

@@ -5,58 +5,64 @@ import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LogoutConfirm = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.LogoutConfirm; i18n: I18n } & KcProps) => {
-    const { url, client, logoutConfirm } = kcContext;
+const LogoutConfirm = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.LogoutConfirm; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { url, client, logoutConfirm } = kcContext;
 
-    const { cx } = useCssAndCx();
+        const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            displayMessage={false}
-            headerNode={msg("logoutConfirmTitle")}
-            formNode={
-                <>
-                    <div id="kc-logout-confirm" className="content-area">
-                        <p className="instruction">{msg("logoutConfirmHeader")}</p>
-                        <form className="form-actions" action={url.logoutConfirmAction} method="POST">
-                            <input type="hidden" name="session_code" value={logoutConfirm.code} />
-                            <div className={cx(props.kcFormGroupClass)}>
-                                <div id="kc-form-options">
-                                    <div className={cx(props.kcFormOptionsWrapperClass)}></div>
-                                </div>
-                                <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
-                                    <input
-                                        tabIndex={4}
-                                        className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonPrimaryClass,
-                                            props.kcButtonBlockClass,
-                                            props.kcButtonLargeClass
-                                        )}
-                                        name="confirmLogout"
-                                        id="kc-logout"
-                                        type="submit"
-                                        value={msgStr("doLogout")}
-                                    />
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayMessage={false}
+                headerNode={msg("logoutConfirmTitle")}
+                formNode={
+                    <>
+                        <div id="kc-logout-confirm" className="content-area">
+                            <p className="instruction">{msg("logoutConfirmHeader")}</p>
+                            <form className="form-actions" action={url.logoutConfirmAction} method="POST">
+                                <input type="hidden" name="session_code" value={logoutConfirm.code} />
+                                <div className={cx(props.kcFormGroupClass)}>
+                                    <div id="kc-form-options">
+                                        <div className={cx(props.kcFormOptionsWrapperClass)}></div>
+                                    </div>
+                                    <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
+                                        <input
+                                            tabIndex={4}
+                                            className={cx(
+                                                props.kcButtonClass,
+                                                props.kcButtonPrimaryClass,
+                                                props.kcButtonBlockClass,
+                                                props.kcButtonLargeClass
+                                            )}
+                                            name="confirmLogout"
+                                            id="kc-logout"
+                                            type="submit"
+                                            value={msgStr("doLogout")}
+                                        />
+                                    </div>
                                 </div>
+                            </form>
+                            <div id="kc-info-message">
+                                {!logoutConfirm.skipLink && client.baseUrl && (
+                                    <p>
+                                        <a href={client.baseUrl} dangerouslySetInnerHTML={{ __html: msgStr("backToApplication") }} />
+                                    </p>
+                                )}
                             </div>
-                        </form>
-                        <div id="kc-info-message">
-                            {!logoutConfirm.skipLink && client.baseUrl && (
-                                <p>
-                                    <a href={client.baseUrl} dangerouslySetInnerHTML={{ __html: msgStr("backToApplication") }} />
-                                </p>
-                            )}
                         </div>
-                    </div>
-                </>
-            }
-        />
-    );
-});
+                    </>
+                }
+            />
+        );
+    }
+);
 
 export default LogoutConfirm;

src/lib/components/Register.tsx

@@ -5,154 +5,165 @@ import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const Register = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Register; i18n: I18n } & KcProps) => {
-    const { url, messagesPerField, register, realm, passwordRequired, recaptchaRequired, recaptchaSiteKey } = kcContext;
+const Register = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.Register; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { url, messagesPerField, register, realm, passwordRequired, recaptchaRequired, recaptchaSiteKey } = kcContext;
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    const { cx } = useCssAndCx();
+        const { cx } = useCssAndCx();
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            headerNode={msg("registerTitle")}
-            formNode={
-                <form id="kc-register-form" className={cx(props.kcFormClass)} action={url.registrationAction} method="post">
-                    <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("firstName", props.kcFormGroupErrorClass))}>
-                        <div className={cx(props.kcLabelWrapperClass)}>
-                            <label htmlFor="firstName" className={cx(props.kcLabelClass)}>
-                                {msg("firstName")}
-                            </label>
-                        </div>
-                        <div className={cx(props.kcInputWrapperClass)}>
-                            <input
-                                type="text"
-                                id="firstName"
-                                className={cx(props.kcInputClass)}
-                                name="firstName"
-                                defaultValue={register.formData.firstName ?? ""}
-                            />
-                        </div>
-                    </div>
-
-                    <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("lastName", props.kcFormGroupErrorClass))}>
-                        <div className={cx(props.kcLabelWrapperClass)}>
-                            <label htmlFor="lastName" className={cx(props.kcLabelClass)}>
-                                {msg("lastName")}
-                            </label>
-                        </div>
-                        <div className={cx(props.kcInputWrapperClass)}>
-                            <input
-                                type="text"
-                                id="lastName"
-                                className={cx(props.kcInputClass)}
-                                name="lastName"
-                                defaultValue={register.formData.lastName ?? ""}
-                            />
-                        </div>
-                    </div>
-
-                    <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("email", props.kcFormGroupErrorClass))}>
-                        <div className={cx(props.kcLabelWrapperClass)}>
-                            <label htmlFor="email" className={cx(props.kcLabelClass)}>
-                                {msg("email")}
-                            </label>
-                        </div>
-                        <div className={cx(props.kcInputWrapperClass)}>
-                            <input
-                                type="text"
-                                id="email"
-                                className={cx(props.kcInputClass)}
-                                name="email"
-                                defaultValue={register.formData.email ?? ""}
-                                autoComplete="email"
-                            />
-                        </div>
-                    </div>
-                    {!realm.registrationEmailAsUsername && (
-                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("username", props.kcFormGroupErrorClass))}>
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("registerTitle")}
+                formNode={
+                    <form id="kc-register-form" className={cx(props.kcFormClass)} action={url.registrationAction} method="post">
+                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("firstName", props.kcFormGroupErrorClass))}>
                             <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="username" className={cx(props.kcLabelClass)}>
-                                    {msg("username")}
+                                <label htmlFor="firstName" className={cx(props.kcLabelClass)}>
+                                    {msg("firstName")}
                                 </label>
                             </div>
                             <div className={cx(props.kcInputWrapperClass)}>
                                 <input
                                     type="text"
-                                    id="username"
+                                    id="firstName"
                                     className={cx(props.kcInputClass)}
-                                    name="username"
-                                    defaultValue={register.formData.username ?? ""}
-                                    autoComplete="username"
+                                    name="firstName"
+                                    defaultValue={register.formData.firstName ?? ""}
                                 />
                             </div>
                         </div>
-                    )}
-                    {passwordRequired && (
-                        <>
-                            <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("password", props.kcFormGroupErrorClass))}>
+
+                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("lastName", props.kcFormGroupErrorClass))}>
+                            <div className={cx(props.kcLabelWrapperClass)}>
+                                <label htmlFor="lastName" className={cx(props.kcLabelClass)}>
+                                    {msg("lastName")}
+                                </label>
+                            </div>
+                            <div className={cx(props.kcInputWrapperClass)}>
+                                <input
+                                    type="text"
+                                    id="lastName"
+                                    className={cx(props.kcInputClass)}
+                                    name="lastName"
+                                    defaultValue={register.formData.lastName ?? ""}
+                                />
+                            </div>
+                        </div>
+
+                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("email", props.kcFormGroupErrorClass))}>
+                            <div className={cx(props.kcLabelWrapperClass)}>
+                                <label htmlFor="email" className={cx(props.kcLabelClass)}>
+                                    {msg("email")}
+                                </label>
+                            </div>
+                            <div className={cx(props.kcInputWrapperClass)}>
+                                <input
+                                    type="text"
+                                    id="email"
+                                    className={cx(props.kcInputClass)}
+                                    name="email"
+                                    defaultValue={register.formData.email ?? ""}
+                                    autoComplete="email"
+                                />
+                            </div>
+                        </div>
+                        {!realm.registrationEmailAsUsername && (
+                            <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("username", props.kcFormGroupErrorClass))}>
                                 <div className={cx(props.kcLabelWrapperClass)}>
-                                    <label htmlFor="password" className={cx(props.kcLabelClass)}>
-                                        {msg("password")}
+                                    <label htmlFor="username" className={cx(props.kcLabelClass)}>
+                                        {msg("username")}
                                     </label>
                                 </div>
                                 <div className={cx(props.kcInputWrapperClass)}>
                                     <input
-                                        type="password"
-                                        id="password"
+                                        type="text"
+                                        id="username"
                                         className={cx(props.kcInputClass)}
-                                        name="password"
-                                        autoComplete="new-password"
+                                        name="username"
+                                        defaultValue={register.formData.username ?? ""}
+                                        autoComplete="username"
                                     />
                                 </div>
                             </div>
-
-                            <div
-                                className={cx(
-                                    props.kcFormGroupClass,
-                                    messagesPerField.printIfExists("password-confirm", props.kcFormGroupErrorClass)
-                                )}
-                            >
-                                <div className={cx(props.kcLabelWrapperClass)}>
-                                    <label htmlFor="password-confirm" className={cx(props.kcLabelClass)}>
-                                        {msg("passwordConfirm")}
-                                    </label>
+                        )}
+                        {passwordRequired && (
+                            <>
+                                <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("password", props.kcFormGroupErrorClass))}>
+                                    <div className={cx(props.kcLabelWrapperClass)}>
+                                        <label htmlFor="password" className={cx(props.kcLabelClass)}>
+                                            {msg("password")}
+                                        </label>
+                                    </div>
+                                    <div className={cx(props.kcInputWrapperClass)}>
+                                        <input
+                                            type="password"
+                                            id="password"
+                                            className={cx(props.kcInputClass)}
+                                            name="password"
+                                            autoComplete="new-password"
+                                        />
+                                    </div>
                                 </div>
+
+                                <div
+                                    className={cx(
+                                        props.kcFormGroupClass,
+                                        messagesPerField.printIfExists("password-confirm", props.kcFormGroupErrorClass)
+                                    )}
+                                >
+                                    <div className={cx(props.kcLabelWrapperClass)}>
+                                        <label htmlFor="password-confirm" className={cx(props.kcLabelClass)}>
+                                            {msg("passwordConfirm")}
+                                        </label>
+                                    </div>
+                                    <div className={cx(props.kcInputWrapperClass)}>
+                                        <input type="password" id="password-confirm" className={cx(props.kcInputClass)} name="password-confirm" />
+                                    </div>
+                                </div>
+                            </>
+                        )}
+                        {recaptchaRequired && (
+                            <div className="form-group">
                                 <div className={cx(props.kcInputWrapperClass)}>
-                                    <input type="password" id="password-confirm" className={cx(props.kcInputClass)} name="password-confirm" />
+                                    <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey}></div>
                                 </div>
                             </div>
-                        </>
-                    )}
-                    {recaptchaRequired && (
-                        <div className="form-group">
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey}></div>
+                        )}
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
+                                <div className={cx(props.kcFormOptionsWrapperClass)}>
+                                    <span>
+                                        <a href={url.loginUrl}>{msg("backToLogin")}</a>
+                                    </span>
+                                </div>
                             </div>
-                        </div>
-                    )}
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                            <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                <span>
-                                    <a href={url.loginUrl}>{msg("backToLogin")}</a>
-                                </span>
-                            </div>
-                        </div>
 
-                        <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                            <input
-                                className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
-                                type="submit"
-                                value={msgStr("doRegister")}
-                            />
+                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                                <input
+                                    className={cx(
+                                        props.kcButtonClass,
+                                        props.kcButtonPrimaryClass,
+                                        props.kcButtonBlockClass,
+                                        props.kcButtonLargeClass
+                                    )}
+                                    type="submit"
+                                    value={msgStr("doRegister")}
+                                />
+                            </div>
                         </div>
-                    </div>
-                </form>
-            }
-        />
-    );
-});
+                    </form>
+                }
+            />
+        );
+    }
+);
 
 export default Register;

src/lib/components/RegisterUserProfile.tsx

@@ -6,62 +6,73 @@ import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
-const RegisterUserProfile = memo(({ kcContext, i18n, ...props_ }: { kcContext: KcContextBase.RegisterUserProfile; i18n: I18n } & KcProps) => {
-    const { url, messagesPerField, recaptchaRequired, recaptchaSiteKey } = kcContext;
+const RegisterUserProfile = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props_
+    }: { kcContext: KcContextBase.RegisterUserProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { url, messagesPerField, recaptchaRequired, recaptchaSiteKey } = kcContext;
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    const { cx, css } = useCssAndCx();
+        const { cx, css } = useCssAndCx();
 
-    const props = useMemo(
-        () => ({
-            ...props_,
-            "kcFormGroupClass": cx(props_.kcFormGroupClass, css({ "marginBottom": 20 }))
-        }),
-        [cx, css]
-    );
+        const props = useMemo(
+            () => ({
+                ...props_,
+                "kcFormGroupClass": cx(props_.kcFormGroupClass, css({ "marginBottom": 20 }))
+            }),
+            [cx, css]
+        );
 
-    const [isFomSubmittable, setIsFomSubmittable] = useState(false);
+        const [isFomSubmittable, setIsFomSubmittable] = useState(false);
 
-    return (
-        <Template
-            {...{ 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} i18n={i18n} {...props} />
-                    {recaptchaRequired && (
-                        <div className="form-group">
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey} />
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayMessage={messagesPerField.exists("global")}
+                displayRequiredFields={true}
+                headerNode={msg("registerTitle")}
+                formNode={
+                    <form id="kc-register-form" className={cx(props.kcFormClass)} action={url.registrationAction} method="post">
+                        <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
+                        {recaptchaRequired && (
+                            <div className="form-group">
+                                <div className={cx(props.kcInputWrapperClass)}>
+                                    <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey} />
+                                </div>
+                            </div>
+                        )}
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
+                                <div className={cx(props.kcFormOptionsWrapperClass)}>
+                                    <span>
+                                        <a href={url.loginUrl}>{msg("backToLogin")}</a>
+                                    </span>
+                                </div>
+                            </div>
+
+                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                                <input
+                                    className={cx(
+                                        props.kcButtonClass,
+                                        props.kcButtonPrimaryClass,
+                                        props.kcButtonBlockClass,
+                                        props.kcButtonLargeClass
+                                    )}
+                                    type="submit"
+                                    value={msgStr("doRegister")}
+                                    disabled={!isFomSubmittable}
+                                />
                             </div>
                         </div>
-                    )}
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                            <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                <span>
-                                    <a href={url.loginUrl}>{msg("backToLogin")}</a>
-                                </span>
-                            </div>
-                        </div>
-
-                        <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                            <input
-                                className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
-                                type="submit"
-                                value={msgStr("doRegister")}
-                                disabled={!isFomSubmittable}
-                            />
-                        </div>
-                    </div>
-                </form>
-            }
-        />
-    );
-});
+                    </form>
+                }
+            />
+        );
+    }
+);
 
 export default RegisterUserProfile;

src/lib/components/Terms.tsx

@@ -54,55 +54,61 @@ export function useDownloadTerms(params: {
     }, []);
 }
 
-const Terms = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.Terms; i18n: I18n } & KcProps) => {
-    const { msg, msgStr } = i18n;
+const Terms = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.Terms; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { msg, msgStr } = i18n;
 
-    useRerenderOnStateChange(evtTermMarkdown);
+        useRerenderOnStateChange(evtTermMarkdown);
 
-    const { cx } = useCssAndCx();
+        const { cx } = useCssAndCx();
 
-    const { url } = kcContext;
+        const { url } = kcContext;
 
-    if (evtTermMarkdown.state === undefined) {
-        return null;
+        if (evtTermMarkdown.state === undefined) {
+            return null;
+        }
+
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayMessage={false}
+                headerNode={msg("termsTitle")}
+                formNode={
+                    <>
+                        <div id="kc-terms-text">{evtTermMarkdown.state && <Markdown>{evtTermMarkdown.state}</Markdown>}</div>
+                        <form className="form-actions" action={url.loginAction} method="POST">
+                            <input
+                                className={cx(
+                                    props.kcButtonClass,
+                                    props.kcButtonClass,
+                                    props.kcButtonClass,
+                                    props.kcButtonPrimaryClass,
+                                    props.kcButtonLargeClass
+                                )}
+                                name="accept"
+                                id="kc-accept"
+                                type="submit"
+                                value={msgStr("doAccept")}
+                            />
+                            <input
+                                className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
+                                name="cancel"
+                                id="kc-decline"
+                                type="submit"
+                                value={msgStr("doDecline")}
+                            />
+                        </form>
+                        <div className="clearfix" />
+                    </>
+                }
+            />
+        );
     }
-
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            displayMessage={false}
-            headerNode={msg("termsTitle")}
-            formNode={
-                <>
-                    <div id="kc-terms-text">{evtTermMarkdown.state && <Markdown>{evtTermMarkdown.state}</Markdown>}</div>
-                    <form className="form-actions" action={url.loginAction} method="POST">
-                        <input
-                            className={cx(
-                                props.kcButtonClass,
-                                props.kcButtonClass,
-                                props.kcButtonClass,
-                                props.kcButtonPrimaryClass,
-                                props.kcButtonLargeClass
-                            )}
-                            name="accept"
-                            id="kc-accept"
-                            type="submit"
-                            value={msgStr("doAccept")}
-                        />
-                        <input
-                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
-                            name="cancel"
-                            id="kc-decline"
-                            type="submit"
-                            value={msgStr("doDecline")}
-                        />
-                    </form>
-                    <div className="clearfix" />
-                </>
-            }
-        />
-    );
-});
+);
 
 export default Terms;

src/lib/components/UpdateUserProfile.tsx

@@ -6,66 +6,72 @@ import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
-const UpdateUserProfile = memo(({ kcContext, i18n, ...props }: { kcContext: KcContextBase.UpdateUserProfile; i18n: I18n } & KcProps) => {
-    const { cx } = useCssAndCx();
+const UpdateUserProfile = memo(
+    ({
+        kcContext,
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props
+    }: { kcContext: KcContextBase.UpdateUserProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { cx } = useCssAndCx();
 
-    const { msg, msgStr } = i18n;
+        const { msg, msgStr } = i18n;
 
-    const { url, isAppInitiatedAction } = kcContext;
+        const { url, isAppInitiatedAction } = kcContext;
 
-    const [isFomSubmittable, setIsFomSubmittable] = useState(false);
+        const [isFomSubmittable, setIsFomSubmittable] = useState(false);
 
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            doFetchDefaultThemeResources={true}
-            headerNode={msg("loginProfileTitle")}
-            formNode={
-                <form id="kc-update-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("loginProfileTitle")}
+                formNode={
+                    <form id="kc-update-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
+                        <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
 
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                            <div className={cx(props.kcFormOptionsWrapperClass)}></div>
-                        </div>
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
+                                <div className={cx(props.kcFormOptionsWrapperClass)}></div>
+                            </div>
 
-                        <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                            {isAppInitiatedAction ? (
-                                <>
+                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                                {isAppInitiatedAction ? (
+                                    <>
+                                        <input
+                                            className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                            type="submit"
+                                            value={msgStr("doSubmit")}
+                                        />
+                                        <button
+                                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
+                                            type="submit"
+                                            name="cancel-aia"
+                                            value="true"
+                                            formNoValidate
+                                        >
+                                            {msg("doCancel")}
+                                        </button>
+                                    </>
+                                ) : (
                                     <input
-                                        className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                        className={cx(
+                                            props.kcButtonClass,
+                                            props.kcButtonPrimaryClass,
+                                            props.kcButtonBlockClass,
+                                            props.kcButtonLargeClass
+                                        )}
                                         type="submit"
-                                        value={msgStr("doSubmit")}
+                                        defaultValue={msgStr("doSubmit")}
+                                        disabled={!isFomSubmittable}
                                     />
-                                    <button
-                                        className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
-                                        type="submit"
-                                        name="cancel-aia"
-                                        value="true"
-                                        formNoValidate
-                                    >
-                                        {msg("doCancel")}
-                                    </button>
-                                </>
-                            ) : (
-                                <input
-                                    className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
-                                    )}
-                                    type="submit"
-                                    defaultValue={msgStr("doSubmit")}
-                                    disabled={!isFomSubmittable}
-                                />
-                            )}
+                                )}
+                            </div>
                         </div>
-                    </div>
-                </form>
-            }
-        />
-    );
-});
+                    </form>
+                }
+            />
+        );
+    }
+);
 
 export default UpdateUserProfile;

yarn.lock

@@ -748,14 +748,14 @@ event-emitter@^0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
-evt@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/evt/-/evt-2.4.1.tgz#68beca2f7bd7eb755fdda5b263a80b934100e046"
-  integrity sha512-eo7sZcfDbiVWD5Aw6STkIEMmchYLdeGnJB6tVaM9AXZc7pViin3PmQhb6fgFIFHfl0re9zSEHtSjyu70Y7dRJg==
+evt@^2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/evt/-/evt-2.4.4.tgz#37d6e28ccb5b1bc91162fc3d5bcfbeb1ef3191cf"
+  integrity sha512-w/ZYdPCRdSfslOhcQHq7DuYoaU04YZKkFPyBwF8pYmOkRizivpbI0jZ8ffY/jITzbLo7RZ0wxN2dqyi62kyGwg==
   dependencies:
     minimal-polyfills "^2.2.2"
     run-exclusive "^2.2.16"
-    tsafe "^1.0.1"
+    tsafe "^1.1.1"
 
 execa@^5.1.1:
   version "5.1.1"
@@ -1385,15 +1385,15 @@ please-upgrade-node@^3.2.0:
   dependencies:
     semver-compare "^1.0.0"
 
-powerhooks@^0.20.16:
-  version "0.20.16"
-  resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-0.20.16.tgz#03aadcccb4f70ca1c768369c01b84197cfeb97aa"
-  integrity sha512-pCDaiGe5p3NrTvtelDBjrclJtjmLQlf99EjHPpQCeQ1H1ZmwQDxV8DaSbguQq0jc1PGcJ5D6Ts3gcEr/e680fg==
+powerhooks@^0.20.20:
+  version "0.20.20"
+  resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-0.20.20.tgz#f9b2549710f5166f63d80e07c46c16d6da4c6f78"
+  integrity sha512-98Ymz0bjo5Ds9u273wYz1tdJ51sB1jcyjqGa08mRY5dKumewydA/+71zrFelfgkOLRRhVZ+mWynG6DZ7zOVjrQ==
   dependencies:
-    evt "^2.4.1"
+    evt "^2.4.4"
     memoizee "^0.4.15"
     resize-observer-polyfill "^1.5.1"
-    tsafe "^1.0.1"
+    tsafe "^1.1.1"
 
 prettier@^2.3.0:
   version "2.7.1"
@@ -1733,20 +1733,20 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-tsafe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.0.1.tgz#c8c4eb2d75d1478418a4941307c5dd667fd76d23"
-  integrity sha512-FgJ1a4rE7YbmW5QIzpsfFl4tsAp0x74FH2bVE6qODb2U8jSrwTr5/ckIazeylme5zXndVbtgKm4BZdqmoGhiPw==
+tsafe@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.1.1.tgz#8d6998c726f8c63c518e1d1e283bbcd282a2b9a9"
+  integrity sha512-Ogblm3uh0dVupcCcC4IT641rnSQ7CW9IO0q8yIncG8OBe4DDXEqGtUE8LWf7+0MK1qZGeWPWEqSxlLzY2xzREA==
 
 tslib@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
-tss-react@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-4.1.3.tgz#170a2edd85e32ba3b752416eeb45438c35e90243"
-  integrity sha512-Ul99aVoVngHY2nwFC87jZlGP+K3LfG9ZRakimOzRwgJz77f/zXWuY2FVzwaSc+OW804twNaxZZRtLlpagex8sg==
+tss-react@^4.3.3:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-4.3.3.tgz#fca93e91b93a2e52c40dc904c7067a2b1905a160"
+  integrity sha512-gXCocAaCDkLpMy0yYdr6AB9/FAetkiRsFnkoDYhjngMBni6ELyZStUwOmZ/LFdBGzKRFlrtext63J+UaaavgZg==
   dependencies:
     "@emotion/cache" "*"
     "@emotion/serialize" "*"