Bump version

.github/workflows/ci.yaml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ !github.event.created && github.repository != 'garronej/ts-ci' }}
     steps:
-    - uses: actions/checkout@v2.3.4
-    - uses: actions/setup-node@v2.1.3
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
     - uses: bahmutov/npm-install@v1
-    - name: If this step fails run 'npm run lint' and 'npm run format' then commit again.
+    - name: If this step fails run 'yarn format' then commit again.
       run: |
         PACKAGE_MANAGER=npm
         if [ -f "./yarn.lock" ]; then
@@ -24,30 +24,31 @@ jobs:
         fi
         $PACKAGE_MANAGER run format:check
   test:
-    runs-on: macos-10.15
+    runs-on: ${{ matrix.os }}
     needs: test_lint
-    env: 
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
     strategy:
       matrix:
-        node: [ '15', '14' ]
-    name: Test with Node v${{ matrix.node }}
+        node: [ '14', '15' ,'16', '17' ]
+        os: [ windows-latest, ubuntu-latest ]
+    name: Test with Node v${{ matrix.node }} on ${{ matrix.os }}
     steps:
     - name: Tell if project is using npm or yarn
       id: step1
-      uses: garronej/ts-ci@v1.1.7
+      uses: garronej/ts-ci@v2.0.2
       with: 
         action_name: tell_if_project_uses_npm_or_yarn
-    - uses: actions/checkout@v2.3.4
-    - uses: actions/setup-node@v2.1.3
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
     - uses: bahmutov/npm-install@v1
     - if: steps.step1.outputs.npm_or_yarn == 'yarn'
       run: |
+        yarn build
         yarn test
     - if: steps.step1.outputs.npm_or_yarn == 'npm'
       run: |
+        npm run build
         npm test
   check_if_version_upgraded:
     name: Check if version upgrade
@@ -63,9 +64,9 @@ jobs:
       from_version: ${{ steps.step1.outputs.from_version }}
       to_version: ${{ steps.step1.outputs.to_version }}
       is_upgraded_version: ${{ steps.step1.outputs.is_upgraded_version }}
-      is_release_beta: ${{steps.step1.outputs.is_release_beta }}
+      is_pre_release: ${{steps.step1.outputs.is_pre_release }}
     steps:
-    - uses: garronej/ts-ci@v1.1.7
+    - uses: garronej/ts-ci@v2.0.2
       id: step1
       with: 
         action_name: is_package_json_version_upgraded
@@ -73,13 +74,13 @@ jobs:
 
   create_github_release:
     runs-on: ubuntu-latest
-    # We create a release only if the version have been upgraded and we are on a default branch
-    # PR on the default branch can release beta but not real release
+    # We create a release only if the version have been upgraded and we are on the main branch
+    # or if we are on a branch of the repo that has an PR open on main.
     if: |
       needs.check_if_version_upgraded.outputs.is_upgraded_version == 'true' &&
       (
         github.event_name == 'push' ||
-        needs.check_if_version_upgraded.outputs.is_release_beta == 'true'
+        needs.check_if_version_upgraded.outputs.is_pre_release == 'true'
       )
     needs: 
       - check_if_version_upgraded
@@ -91,7 +92,7 @@ jobs:
         target_commitish: ${{ github.head_ref || github.ref }}
         generate_release_notes: true
         draft: false
-        prerelease: ${{ needs.check_if_version_upgraded.outputs.is_release_beta == 'true' }}
+        prerelease: ${{ needs.check_if_version_upgraded.outputs.is_pre_release == 'true' }}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
 
@@ -101,12 +102,11 @@ jobs:
       - create_github_release
       - check_if_version_upgraded
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3
       with:
         ref: ${{ github.ref }}
-    - uses: actions/setup-node@v2.1.3
+    - uses: actions/setup-node@v3
       with:
-        node-version: '15'
         registry-url: https://registry.npmjs.org/
     - uses: bahmutov/npm-install@v1
     - run: |
@@ -115,7 +115,7 @@ jobs:
             PACKAGE_MANAGER=yarn
         fi
         $PACKAGE_MANAGER run build
-    - run: npx -y -p denoify@1.0.2 enable_short_npm_import_path
+    - run: npx -y -p denoify@1.2.2 enable_short_npm_import_path
       env:
         DRY_RUN: "0"
     - name: Publishing on NPM
@@ -129,11 +129,11 @@ jobs:
           false
         fi
         EXTRA_ARGS=""
-        if [ "$IS_BETA" = "true" ]; then
-            EXTRA_ARGS="--tag beta"
+        if [ "$IS_PRE_RELEASE" = "true" ]; then
+            EXTRA_ARGS="--tag next"
         fi
         npm publish $EXTRA_ARGS
       env:
         NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
         VERSION: ${{ needs.check_if_version_upgraded.outputs.to_version }}
-        IS_BETA: ${{ needs.check_if_version_upgraded.outputs.is_release_beta }}
+        IS_PRE_RELEASE: ${{ needs.check_if_version_upgraded.outputs.is_pre_release }}

README.md

@@ -49,6 +49,12 @@
 
 # Changelog highlights
 
+## 6.8.0
+
+-   It is now possible to pass a custom `<Template />` component as a prop to `<KcApp />` and every
+    individual page (`<Login />`, `<RegisterUserProfile />`, ...) it enables to customize only the header and footer for
+    example without having to switch to a full-component level customization. [See issue](https://github.com/InseeFrLab/keycloakify/issues/191).
+
 ## 6.7.0
 
 -   Add support for `webauthn-authenticate.ftl` thanks to [@mstrodl](https://github.com/Mstrodl)'s hacktoberfest [PR](https://github.com/InseeFrLab/keycloakify/pull/185).

package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "6.7.2",
+    "version": "6.8.3",
     "description": "Keycloak theme generator for Reacts app",
     "repository": {
         "type": "git",
@@ -78,12 +78,12 @@
         "@octokit/rest": "^18.12.0",
         "cheerio": "^1.0.0-rc.5",
         "cli-select": "^1.1.2",
-        "evt": "^2.4.5",
+        "evt": "^2.4.6",
         "memoizee": "^0.4.15",
         "minimal-polyfills": "^2.2.2",
         "minimist": "^1.2.6",
         "path-browserify": "^1.0.1",
-        "powerhooks": "^0.20.22",
+        "powerhooks": "^0.20.23",
         "react-markdown": "^5.0.3",
         "rfc4648": "^1.5.2",
         "scripting-tools": "^0.19.13",

src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl

@@ -32,7 +32,7 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
         "printIfExists": function (fieldName, x) {
             <#if !messagesPerField?? >
                 return undefined;
-            </#if>
+            <#else>
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
                         <#attempt>
@@ -42,11 +42,12 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
                     }
                 </#list>
                 throw new Error("There is no " + fieldName + " field");
+            </#if>
         },
         "existsError": function (fieldName) {
             <#if !messagesPerField?? >
                 return false;
-            </#if>
+            <#else>
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
                         <#attempt>
@@ -56,11 +57,12 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
                     }
                 </#list>
                 throw new Error("There is no " + fieldName + " field");
+            </#if>
         },
         "get": function (fieldName) {
             <#if !messagesPerField?? >
                 return '';
-            </#if>
+            <#else>
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
                         <#attempt>
@@ -72,11 +74,12 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
                     }
                 </#list>
                 throw new Error("There is no " + fieldName + " field");
+            </#if>
         },
         "exists": function (fieldName) {
             <#if !messagesPerField?? >
                 return false;
-            </#if>
+            <#else>
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
                         <#attempt>
@@ -86,6 +89,7 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
                     }
                 </#list>
                 throw new Error("There is no " + fieldName + " field");
+            </#if>
         }
     };
 

src/lib/components/Error.tsx

@@ -1,23 +1,27 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const Error = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.Error; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type ErrorProps = KcProps & {
+    kcContext: KcContextBase.Error;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const Error = memo((props: ErrorProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { message, client } = kcContext;
 
     const { msg } = i18n;
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             displayMessage={false}
             headerNode={msg("errorTitle")}
             formNode={
@@ -34,7 +38,6 @@ const Error = memo(
             }
         />
     );
-    }
-);
+});
 
 export default Error;

src/lib/components/IdpReviewUserProfile.tsx

@@ -1,18 +1,22 @@
 import React, { useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
-const IdpReviewUserProfile = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.IdpReviewUserProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type IdpReviewUserProfileProps = KcProps & {
+    kcContext: KcContextBase.IdpReviewUserProfile;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const IdpReviewUserProfile = memo((props: IdpReviewUserProfileProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { cx } = useCssAndCx();
 
     const { msg, msgStr } = i18n;
@@ -23,23 +27,23 @@ const IdpReviewUserProfile = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             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} />
+                <form id="kc-idp-review-profile-form" className={cx(kcProps.kcFormClass)} action={url.loginAction} method="post">
+                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...kcProps} />
 
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)} />
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)} />
                         </div>
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
                             <input
                                 className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
                                 )}
                                 type="submit"
                                 value={msgStr("doSubmit")}
@@ -51,7 +55,6 @@ const IdpReviewUserProfile = memo(
             }
         />
     );
-    }
-);
+});
 
 export default IdpReviewUserProfile;

src/lib/components/Info.tsx

@@ -1,17 +1,21 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import { assert } from "../tools/assert";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const Info = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.Info; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type InfoProps = KcProps & {
+    kcContext: KcContextBase.Info;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const Info = memo((props: InfoProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { msgStr, msg } = i18n;
 
     assert(kcContext.message !== undefined);
@@ -20,7 +24,7 @@ const Info = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             displayMessage={false}
             headerNode={messageHeader !== undefined ? <>{messageHeader}</> : <>{message.summary}</>}
             formNode={
@@ -51,7 +55,6 @@ const Info = memo(
             }
         />
     );
-    }
-);
+});
 
 export default Info;

src/lib/components/KcApp.tsx

@@ -3,6 +3,8 @@ import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { KcProps } from "./KcProps";
 import { __unsafe_useI18n as useI18n } from "../i18n";
 import type { I18n } from "../i18n";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 
 const Login = lazy(() => import("./Login"));
 const Register = lazy(() => import("./Register"));
@@ -26,12 +28,16 @@ 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; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type KcAppProps = KcProps & {
+    kcContext: KcContextBase;
+    i18n?: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const KcApp = memo((props_: KcAppProps) => {
+    const { kcContext, i18n: userProvidedI18n, Template = DefaultTemplate, ...kcProps } = props_;
+
     const i18n = (function useClosure() {
         const i18n = useI18n({
             kcContext,
@@ -46,59 +52,58 @@ const KcApp = memo(
         return null;
     }
 
-        const props = { i18n, ...kcProps };
+    const commonProps = { i18n, Template, ...kcProps };
 
     return (
         <Suspense>
             {(() => {
                 switch (kcContext.pageId) {
                     case "login.ftl":
-                            return <Login {...{ kcContext, ...props }} />;
+                        return <Login {...{ kcContext, ...commonProps }} />;
                     case "register.ftl":
-                            return <Register {...{ kcContext, ...props }} />;
+                        return <Register {...{ kcContext, ...commonProps }} />;
                     case "register-user-profile.ftl":
-                            return <RegisterUserProfile {...{ kcContext, ...props }} />;
+                        return <RegisterUserProfile {...{ kcContext, ...commonProps }} />;
                     case "info.ftl":
-                            return <Info {...{ kcContext, ...props }} />;
+                        return <Info {...{ kcContext, ...commonProps }} />;
                     case "error.ftl":
-                            return <Error {...{ kcContext, ...props }} />;
+                        return <Error {...{ kcContext, ...commonProps }} />;
                     case "login-reset-password.ftl":
-                            return <LoginResetPassword {...{ kcContext, ...props }} />;
+                        return <LoginResetPassword {...{ kcContext, ...commonProps }} />;
                     case "login-verify-email.ftl":
-                            return <LoginVerifyEmail {...{ kcContext, ...props }} />;
+                        return <LoginVerifyEmail {...{ kcContext, ...commonProps }} />;
                     case "terms.ftl":
-                            return <Terms {...{ kcContext, ...props }} />;
+                        return <Terms {...{ kcContext, ...commonProps }} />;
                     case "login-otp.ftl":
-                            return <LoginOtp {...{ kcContext, ...props }} />;
+                        return <LoginOtp {...{ kcContext, ...commonProps }} />;
                     case "login-username.ftl":
-                            return <LoginUsername {...{ kcContext, ...props }} />;
+                        return <LoginUsername {...{ kcContext, ...commonProps }} />;
                     case "login-password.ftl":
-                            return <LoginPassword {...{ kcContext, ...props }} />;
+                        return <LoginPassword {...{ kcContext, ...commonProps }} />;
                     case "webauthn-authenticate.ftl":
-                            return <WebauthnAuthenticate {...{ kcContext, ...props }} />;
+                        return <WebauthnAuthenticate {...{ kcContext, ...commonProps }} />;
                     case "login-update-password.ftl":
-                            return <LoginUpdatePassword {...{ kcContext, ...props }} />;
+                        return <LoginUpdatePassword {...{ kcContext, ...commonProps }} />;
                     case "login-update-profile.ftl":
-                            return <LoginUpdateProfile {...{ kcContext, ...props }} />;
+                        return <LoginUpdateProfile {...{ kcContext, ...commonProps }} />;
                     case "login-idp-link-confirm.ftl":
-                            return <LoginIdpLinkConfirm {...{ kcContext, ...props }} />;
+                        return <LoginIdpLinkConfirm {...{ kcContext, ...commonProps }} />;
                     case "login-idp-link-email.ftl":
-                            return <LoginIdpLinkEmail {...{ kcContext, ...props }} />;
+                        return <LoginIdpLinkEmail {...{ kcContext, ...commonProps }} />;
                     case "login-page-expired.ftl":
-                            return <LoginPageExpired {...{ kcContext, ...props }} />;
+                        return <LoginPageExpired {...{ kcContext, ...commonProps }} />;
                     case "login-config-totp.ftl":
-                            return <LoginConfigTotp {...{ kcContext, ...props }} />;
+                        return <LoginConfigTotp {...{ kcContext, ...commonProps }} />;
                     case "logout-confirm.ftl":
-                            return <LogoutConfirm {...{ kcContext, ...props }} />;
+                        return <LogoutConfirm {...{ kcContext, ...commonProps }} />;
                     case "update-user-profile.ftl":
-                            return <UpdateUserProfile {...{ kcContext, ...props }} />;
+                        return <UpdateUserProfile {...{ kcContext, ...commonProps }} />;
                     case "idp-review-user-profile.ftl":
-                            return <IdpReviewUserProfile {...{ kcContext, ...props }} />;
+                        return <IdpReviewUserProfile {...{ kcContext, ...commonProps }} />;
                 }
             })()}
         </Suspense>
     );
-    }
-);
+});
 
 export default KcApp;

src/lib/components/Login.tsx

@@ -1,5 +1,6 @@
 import React, { useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
@@ -7,13 +8,16 @@ import { useConstCallback } from "powerhooks/useConstCallback";
 import type { FormEventHandler } from "react";
 import type { I18n } from "../i18n";
 
-const Login = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.Login; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginProps = KcProps & {
+    kcContext: KcContextBase.Login;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const Login = memo((props: LoginProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { social, realm, url, usernameEditDisabled, login, auth, registrationDisabled } = kcContext;
 
     const { msg, msgStr } = i18n;
@@ -38,21 +42,21 @@ const Login = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             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" className={cx(realm.password && social.providers !== undefined && kcProps.kcContentWrapperClass)}>
                     <div
                         id="kc-form-wrapper"
                         className={cx(
-                                realm.password && social.providers && [props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass]
+                            realm.password && social.providers && [kcProps.kcFormSocialAccountContentClass, kcProps.kcFormSocialAccountClass]
                         )}
                     >
                         {realm.password && (
                             <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
-                                    <div className={cx(props.kcFormGroupClass)}>
+                                <div className={cx(kcProps.kcFormGroupClass)}>
                                     {(() => {
                                         const label = !realm.loginWithEmailAllowed
                                             ? "username"
@@ -64,13 +68,13 @@ const Login = memo(
 
                                         return (
                                             <>
-                                                    <label htmlFor={autoCompleteHelper} className={cx(props.kcLabelClass)}>
+                                                <label htmlFor={autoCompleteHelper} className={cx(kcProps.kcLabelClass)}>
                                                     {msg(label)}
                                                 </label>
                                                 <input
                                                     tabIndex={1}
                                                     id={autoCompleteHelper}
-                                                        className={cx(props.kcInputClass)}
+                                                    className={cx(kcProps.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.
@@ -88,20 +92,20 @@ const Login = memo(
                                         );
                                     })()}
                                 </div>
-                                    <div className={cx(props.kcFormGroupClass)}>
-                                        <label htmlFor="password" className={cx(props.kcLabelClass)}>
+                                <div className={cx(kcProps.kcFormGroupClass)}>
+                                    <label htmlFor="password" className={cx(kcProps.kcLabelClass)}>
                                         {msg("password")}
                                     </label>
                                     <input
                                         tabIndex={2}
                                         id="password"
-                                            className={cx(props.kcInputClass)}
+                                        className={cx(kcProps.kcInputClass)}
                                         name="password"
                                         type="password"
                                         autoComplete="off"
                                     />
                                 </div>
-                                    <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
+                                <div className={cx(kcProps.kcFormGroupClass, kcProps.kcFormSettingClass)}>
                                     <div id="kc-form-options">
                                         {realm.rememberMe && !usernameEditDisabled && (
                                             <div className="checkbox">
@@ -122,7 +126,7 @@ const Login = memo(
                                             </div>
                                         )}
                                     </div>
-                                        <div className={cx(props.kcFormOptionsWrapperClass)}>
+                                    <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
                                         {realm.resetPasswordAllowed && (
                                             <span>
                                                 <a tabIndex={5} href={url.loginResetCredentialsUrl}>
@@ -132,7 +136,7 @@ const Login = memo(
                                         )}
                                     </div>
                                 </div>
-                                    <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
+                                <div id="kc-form-buttons" className={cx(kcProps.kcFormGroupClass)}>
                                     <input
                                         type="hidden"
                                         id="id-hidden-input"
@@ -146,10 +150,10 @@ const Login = memo(
                                     <input
                                         tabIndex={4}
                                         className={cx(
-                                                props.kcButtonClass,
-                                                props.kcButtonPrimaryClass,
-                                                props.kcButtonBlockClass,
-                                                props.kcButtonLargeClass
+                                            kcProps.kcButtonClass,
+                                            kcProps.kcButtonPrimaryClass,
+                                            kcProps.kcButtonBlockClass,
+                                            kcProps.kcButtonLargeClass
                                         )}
                                         name="login"
                                         id="kc-login"
@@ -162,15 +166,15 @@ const Login = memo(
                         )}
                     </div>
                     {realm.password && social.providers !== undefined && (
-                            <div id="kc-social-providers" className={cx(props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass)}>
+                        <div id="kc-social-providers" className={cx(kcProps.kcFormSocialAccountContentClass, kcProps.kcFormSocialAccountClass)}>
                             <ul
                                 className={cx(
-                                        props.kcFormSocialAccountListClass,
-                                        social.providers.length > 4 && props.kcFormSocialAccountDoubleListClass
+                                    kcProps.kcFormSocialAccountListClass,
+                                    social.providers.length > 4 && kcProps.kcFormSocialAccountDoubleListClass
                                 )}
                             >
                                 {social.providers.map(p => (
-                                        <li key={p.providerId} className={cx(props.kcFormSocialAccountListLinkClass)}>
+                                    <li key={p.providerId} className={cx(kcProps.kcFormSocialAccountListLinkClass)}>
                                         <a href={p.loginUrl} id={`zocial-${p.alias}`} className={cx("zocial", p.providerId)}>
                                             <span>{p.displayName}</span>
                                         </a>
@@ -197,7 +201,6 @@ const Login = memo(
             }
         />
     );
-    }
-);
+});
 
 export default Login;

src/lib/components/LoginConfigTotp.tsx

@@ -1,17 +1,21 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginConfigTotp = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginConfigTotp; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginConfigTotpProps = KcProps & {
+    kcContext: KcContextBase.LoginConfigTotp;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LoginConfigTotp = memo((props: LoginConfigTotpProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { url, isAppInitiatedAction, totp, mode, messagesPerField } = kcContext;
 
     const { cx } = useCssAndCx();
@@ -19,14 +23,14 @@ const LoginConfigTotp = memo(
     const { msg, msgStr } = i18n;
 
     const algToKeyUriAlg: Record<KcContextBase.LoginConfigTotp["totp"]["policy"]["algorithm"], string> = {
-            HmacSHA1: "SHA1",
-            HmacSHA256: "SHA256",
-            HmacSHA512: "SHA512"
+        "HmacSHA1": "SHA1",
+        "HmacSHA256": "SHA256",
+        "HmacSHA512": "SHA512"
     };
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             headerNode={msg("loginTotpTitle")}
             formNode={
                 <>
@@ -98,26 +102,26 @@ const LoginConfigTotp = memo(
                         </li>
                     </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)}>
+                    <form action={url.loginAction} className={cx(kcProps.kcFormClass)} id="kc-totp-settings-form" method="post">
+                        <div className={cx(kcProps.kcFormGroupClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
+                                <label htmlFor="totp" className={cx(kcProps.kcLabelClass)}>
                                     {msg("authenticatorCode")}
                                 </label>{" "}
                                 <span className="required">*</span>
                             </div>
-                                <div className={cx(props.kcInputWrapperClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
                                 <input
                                     type="text"
                                     id="totp"
                                     name="totp"
                                     autoComplete="off"
-                                        className={cx(props.kcInputClass)}
+                                    className={cx(kcProps.kcInputClass)}
                                     aria-invalid={messagesPerField.existsError("totp")}
                                 />
 
                                 {messagesPerField.existsError("totp") && (
-                                        <span id="input-error-otp-code" className={cx(props.kcInputErrorMessageClass)} aria-live="polite">
+                                    <span id="input-error-otp-code" className={cx(kcProps.kcInputErrorMessageClass)} aria-live="polite">
                                         {messagesPerField.get("totp")}
                                     </span>
                                 )}
@@ -126,24 +130,24 @@ const LoginConfigTotp = memo(
                             {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)}>
+                        <div className={cx(kcProps.kcFormGroupClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
+                                <label htmlFor="userLabel" className={cx(kcProps.kcLabelClass)}>
                                     {msg("loginTotpDeviceName")}
                                 </label>{" "}
                                 {totp.otpCredentials.length >= 1 && <span className="required">*</span>}
                             </div>
-                                <div className={cx(props.kcInputWrapperClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
                                 <input
                                     type="text"
                                     id="userLabel"
                                     name="userLabel"
                                     autoComplete="off"
-                                        className={cx(props.kcInputClass)}
+                                    className={cx(kcProps.kcInputClass)}
                                     aria-invalid={messagesPerField.existsError("userLabel")}
                                 />
                                 {messagesPerField.existsError("userLabel") && (
-                                        <span id="input-error-otp-label" className={cx(props.kcInputErrorMessageClass)} aria-live="polite">
+                                    <span id="input-error-otp-label" className={cx(kcProps.kcInputErrorMessageClass)} aria-live="polite">
                                         {messagesPerField.get("userLabel")}
                                     </span>
                                 )}
@@ -154,17 +158,17 @@ const LoginConfigTotp = memo(
                             <>
                                 <input
                                     type="submit"
-                                        className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                    className={cx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
                                     id="saveTOTPBtn"
                                     value={msgStr("doSubmit")}
                                 />
                                 <button
                                     type="submit"
                                     className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonDefaultClass,
-                                            props.kcButtonLargeClass,
-                                            props.kcButtonLargeClass
+                                        kcProps.kcButtonClass,
+                                        kcProps.kcButtonDefaultClass,
+                                        kcProps.kcButtonLargeClass,
+                                        kcProps.kcButtonLargeClass
                                     )}
                                     id="cancelTOTPBtn"
                                     name="cancel-aia"
@@ -176,7 +180,7 @@ const LoginConfigTotp = memo(
                         ) : (
                             <input
                                 type="submit"
-                                    className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                className={cx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
                                 id="saveTOTPBtn"
                                 value={msgStr("doSubmit")}
                             />
@@ -186,7 +190,6 @@ const LoginConfigTotp = memo(
             }
         />
     );
-    }
-);
+});
 
 export default LoginConfigTotp;

src/lib/components/LoginIdpLinkConfirm.tsx

@@ -1,17 +1,21 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginIdpLinkConfirm = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginIdpLinkConfirm; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginIdpLinkConfirmProps = KcProps & {
+    kcContext: KcContextBase.LoginIdpLinkConfirm;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LoginIdpLinkConfirm = memo((props: LoginIdpLinkConfirmProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { url, idpAlias } = kcContext;
 
     const { msg } = i18n;
@@ -20,14 +24,19 @@ const LoginIdpLinkConfirm = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             headerNode={msg("confirmLinkIdpTitle")}
             formNode={
                 <form id="kc-register-form" action={url.loginAction} method="post">
-                        <div className={cx(props.kcFormGroupClass)}>
+                    <div className={cx(kcProps.kcFormGroupClass)}>
                         <button
                             type="submit"
-                                className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
+                            className={cx(
+                                kcProps.kcButtonClass,
+                                kcProps.kcButtonDefaultClass,
+                                kcProps.kcButtonBlockClass,
+                                kcProps.kcButtonLargeClass
+                            )}
                             name="submitAction"
                             id="updateProfile"
                             value="updateProfile"
@@ -36,7 +45,12 @@ const LoginIdpLinkConfirm = memo(
                         </button>
                         <button
                             type="submit"
-                                className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
+                            className={cx(
+                                kcProps.kcButtonClass,
+                                kcProps.kcButtonDefaultClass,
+                                kcProps.kcButtonBlockClass,
+                                kcProps.kcButtonLargeClass
+                            )}
                             name="submitAction"
                             id="linkAccount"
                             value="linkAccount"
@@ -48,7 +62,6 @@ const LoginIdpLinkConfirm = memo(
             }
         />
     );
-    }
-);
+});
 
 export default LoginIdpLinkConfirm;

src/lib/components/LoginIdpLinkEmail.tsx

@@ -1,23 +1,27 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LoginIdpLinkEmail = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginIdpLinkEmail; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginIdpLinkEmailProps = KcProps & {
+    kcContext: KcContextBase.LoginIdpLinkEmail;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LoginIdpLinkEmail = memo((props: LoginIdpLinkEmailProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { url, realm, brokerContext, idpAlias } = kcContext;
 
     const { msg } = i18n;
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             headerNode={msg("emailLinkIdpTitle", idpAlias)}
             formNode={
                 <>
@@ -34,7 +38,6 @@ const LoginIdpLinkEmail = memo(
             }
         />
     );
-    }
-);
+});
 
 export default LoginIdpLinkEmail;

src/lib/components/LoginOtp.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { headInsert } from "../tools/headInsert";
@@ -7,13 +8,16 @@ import { pathJoin } from "../../bin/tools/pathJoin";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginOtp = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginOtp; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginOtpProps = KcProps & {
+    kcContext: KcContextBase.LoginOtp;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LoginOtp = memo((props: LoginOtpProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { otpLogin, url } = kcContext;
 
     const { cx } = useCssAndCx();
@@ -39,49 +43,49 @@ const LoginOtp = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             headerNode={msg("doLogIn")}
             formNode={
-                    <form id="kc-otp-login-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
+                <form id="kc-otp-login-form" className={cx(kcProps.kcFormClass)} action={url.loginAction} method="post">
                     {otpLogin.userOtpCredentials.length > 1 && (
-                            <div className={cx(props.kcFormGroupClass)}>
-                                <div className={cx(props.kcInputWrapperClass)}>
+                        <div className={cx(kcProps.kcFormGroupClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
                                 {otpLogin.userOtpCredentials.map(otpCredential => (
-                                        <div key={otpCredential.id} className={cx(props.kcSelectOTPListClass)}>
+                                    <div key={otpCredential.id} className={cx(kcProps.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 className={cx(kcProps.kcSelectOTPListItemClass)}>
+                                            <span className={cx(kcProps.kcAuthenticatorOtpCircleClass)} />
+                                            <h2 className={cx(kcProps.kcSelectOTPItemHeadingClass)}>{otpCredential.userLabel}</h2>
                                         </div>
                                     </div>
                                 ))}
                             </div>
                         </div>
                     )}
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="otp" className={cx(props.kcLabelClass)}>
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="otp" className={cx(kcProps.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 className={cx(kcProps.kcInputWrapperClass)}>
+                            <input id="otp" name="otp" autoComplete="off" type="text" className={cx(kcProps.kcInputClass)} autoFocus />
                         </div>
                     </div>
 
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)} />
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)} />
                         </div>
 
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
                             <input
                                 className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
                                 )}
                                 name="login"
                                 id="kc-login"
@@ -94,8 +98,7 @@ const LoginOtp = memo(
             }
         />
     );
-    }
-);
+});
 
 declare const $: any;
 

src/lib/components/LoginPageExpired.tsx

@@ -1,23 +1,27 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LoginPageExpired = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginPageExpired; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginPageExpired = KcProps & {
+    kcContext: KcContextBase.LoginPageExpired;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LoginPageExpired = memo((props: LoginPageExpired) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { url } = kcContext;
 
     const { msg } = i18n;
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             displayMessage={false}
             headerNode={msg("pageExpiredTitle")}
             formNode={
@@ -38,7 +42,6 @@ const LoginPageExpired = memo(
             }
         />
     );
-    }
-);
+});
 
 export default LoginPageExpired;

src/lib/components/LoginPassword.tsx

@@ -1,5 +1,6 @@
 import React, { useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
@@ -7,13 +8,16 @@ import { useConstCallback } from "powerhooks/useConstCallback";
 import type { FormEventHandler } from "react";
 import type { I18n } from "../i18n";
 
-const LoginPassword = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginPassword; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginPasswordProps = KcProps & {
+    kcContext: KcContextBase.LoginPassword;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LoginPassword = memo((props: LoginPasswordProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { realm, url, login } = kcContext;
 
     const { msg, msgStr } = i18n;
@@ -34,21 +38,21 @@ const LoginPassword = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             headerNode={msg("doLogIn")}
             formNode={
                 <div id="kc-form">
                     <div id="kc-form-wrapper">
                         <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
-                                <div className={cx(props.kcFormGroupClass)}>
+                            <div className={cx(kcProps.kcFormGroupClass)}>
                                 <hr />
-                                    <label htmlFor="password" className={cx(props.kcLabelClass)}>
+                                <label htmlFor="password" className={cx(kcProps.kcLabelClass)}>
                                     {msg("password")}
                                 </label>
                                 <input
                                     tabIndex={2}
                                     id="password"
-                                        className={cx(props.kcInputClass)}
+                                    className={cx(kcProps.kcInputClass)}
                                     name="password"
                                     type="password"
                                     autoFocus={true}
@@ -56,9 +60,9 @@ const LoginPassword = memo(
                                     defaultValue={login.password ?? ""}
                                 />
                             </div>
-                                <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
+                            <div className={cx(kcProps.kcFormGroupClass, kcProps.kcFormSettingClass)}>
                                 <div id="kc-form-options" />
-                                    <div className={cx(props.kcFormOptionsWrapperClass)}>
+                                <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
                                     {realm.resetPasswordAllowed && (
                                         <span>
                                             <a tabIndex={5} href={url.loginResetCredentialsUrl}>
@@ -68,14 +72,14 @@ const LoginPassword = memo(
                                     )}
                                 </div>
                             </div>
-                                <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
+                            <div id="kc-form-buttons" className={cx(kcProps.kcFormGroupClass)}>
                                 <input
                                     tabIndex={4}
                                     className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonPrimaryClass,
-                                            props.kcButtonBlockClass,
-                                            props.kcButtonLargeClass
+                                        kcProps.kcButtonClass,
+                                        kcProps.kcButtonPrimaryClass,
+                                        kcProps.kcButtonBlockClass,
+                                        kcProps.kcButtonLargeClass
                                     )}
                                     name="login"
                                     id="kc-login"
@@ -90,7 +94,6 @@ const LoginPassword = memo(
             }
         />
     );
-    }
-);
+});
 
 export default LoginPassword;

src/lib/components/LoginResetPassword.tsx

@@ -1,17 +1,21 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginResetPassword = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginResetPassword; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginResetPasswordProps = KcProps & {
+    kcContext: KcContextBase.LoginResetPassword;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LoginResetPassword = memo((props: LoginResetPasswordProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { url, realm, auth } = kcContext;
 
     const { msg, msgStr } = i18n;
@@ -20,14 +24,14 @@ const LoginResetPassword = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             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)}>
+                <form id="kc-reset-password-form" className={cx(kcProps.kcFormClass)} action={url.loginAction} method="post">
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="username" className={cx(kcProps.kcLabelClass)}>
                                 {!realm.loginWithEmailAllowed
                                     ? msg("username")
                                     : !realm.registrationEmailAsUsername
@@ -35,33 +39,33 @@ const LoginResetPassword = memo(
                                     : msg("email")}
                             </label>
                         </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
                             <input
                                 type="text"
                                 id="username"
                                 name="username"
-                                    className={cx(props.kcInputClass)}
+                                className={cx(kcProps.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)}>
+                    <div className={cx(kcProps.kcFormGroupClass, kcProps.kcFormSettingClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
                                 <span>
                                     <a href={url.loginUrl}>{msg("backToLogin")}</a>
                                 </span>
                             </div>
                         </div>
 
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
                             <input
                                 className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
                                 )}
                                 type="submit"
                                 value={msgStr("doSubmit")}
@@ -73,7 +77,6 @@ const LoginResetPassword = memo(
             infoNode={msg("emailInstruction")}
         />
     );
-    }
-);
+});
 
 export default LoginResetPassword;

src/lib/components/LoginUpdatePassword.tsx

@@ -1,17 +1,21 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginUpdatePassword = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginUpdatePassword; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginUpdatePasswordProps = KcProps & {
+    kcContext: KcContextBase.LoginUpdatePassword;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LoginUpdatePassword = memo((props: LoginUpdatePasswordProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { cx } = useCssAndCx();
 
     const { msg, msgStr } = i18n;
@@ -20,10 +24,10 @@ const LoginUpdatePassword = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             headerNode={msg("updatePasswordTitle")}
             formNode={
-                    <form id="kc-passwd-update-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
+                <form id="kc-passwd-update-form" className={cx(kcProps.kcFormClass)} action={url.loginAction} method="post">
                     <input
                         type="text"
                         id="username"
@@ -35,44 +39,44 @@ const LoginUpdatePassword = memo(
                     />
                     <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)}>
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("password", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="password-new" className={cx(kcProps.kcLabelClass)}>
                                 {msg("passwordNew")}
                             </label>
                         </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
                             <input
                                 type="password"
                                 id="password-new"
                                 name="password-new"
                                 autoFocus
                                 autoComplete="new-password"
-                                    className={cx(props.kcInputClass)}
+                                className={cx(kcProps.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)}>
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("password-confirm", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="password-confirm" className={cx(kcProps.kcLabelClass)}>
                                 {msg("passwordConfirm")}
                             </label>
                         </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
                             <input
                                 type="password"
                                 id="password-confirm"
                                 name="password-confirm"
                                 autoComplete="new-password"
-                                    className={cx(props.kcInputClass)}
+                                className={cx(kcProps.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(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
                                 {isAppInitiatedAction && (
                                     <div className="checkbox">
                                         <label>
@@ -84,16 +88,16 @@ const LoginUpdatePassword = memo(
                             </div>
                         </div>
 
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
                             {isAppInitiatedAction ? (
                                 <>
                                     <input
-                                            className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
                                         type="submit"
                                         defaultValue={msgStr("doSubmit")}
                                     />
                                     <button
-                                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
                                         type="submit"
                                         name="cancel-aia"
                                         value="true"
@@ -104,10 +108,10 @@ const LoginUpdatePassword = memo(
                             ) : (
                                 <input
                                     className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonPrimaryClass,
-                                            props.kcButtonBlockClass,
-                                            props.kcButtonLargeClass
+                                        kcProps.kcButtonClass,
+                                        kcProps.kcButtonPrimaryClass,
+                                        kcProps.kcButtonBlockClass,
+                                        kcProps.kcButtonLargeClass
                                     )}
                                     type="submit"
                                     defaultValue={msgStr("doSubmit")}
@@ -119,7 +123,6 @@ const LoginUpdatePassword = memo(
             }
         />
     );
-    }
-);
+});
 
 export default LoginUpdatePassword;

src/lib/components/LoginUpdateProfile.tsx

@@ -1,17 +1,21 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginUpdateProfile = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginUpdateProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginUpdateProfile = KcProps & {
+    kcContext: KcContextBase.LoginUpdateProfile;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LoginUpdateProfile = memo((props: LoginUpdateProfile) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { cx } = useCssAndCx();
 
     const { msg, msgStr } = i18n;
@@ -20,89 +24,89 @@ const LoginUpdateProfile = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             headerNode={msg("loginProfileTitle")}
             formNode={
-                    <form id="kc-update-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
+                <form id="kc-update-profile-form" className={cx(kcProps.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)}>
+                        <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("username", kcProps.kcFormGroupErrorClass))}>
+                            <div className={cx(kcProps.kcLabelWrapperClass)}>
+                                <label htmlFor="username" className={cx(kcProps.kcLabelClass)}>
                                     {msg("username")}
                                 </label>
                             </div>
-                                <div className={cx(props.kcInputWrapperClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
                                 <input
                                     type="text"
                                     id="username"
                                     name="username"
                                     defaultValue={user.username ?? ""}
-                                        className={cx(props.kcInputClass)}
+                                    className={cx(kcProps.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)}>
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("email", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="email" className={cx(kcProps.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 className={cx(kcProps.kcInputWrapperClass)}>
+                            <input type="text" id="email" name="email" defaultValue={user.email ?? ""} className={cx(kcProps.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)}>
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("firstName", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="firstName" className={cx(kcProps.kcLabelClass)}>
                                 {msg("firstName")}
                             </label>
                         </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
                             <input
                                 type="text"
                                 id="firstName"
                                 name="firstName"
                                 defaultValue={user.firstName ?? ""}
-                                    className={cx(props.kcInputClass)}
+                                className={cx(kcProps.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)}>
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("lastName", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="lastName" className={cx(kcProps.kcLabelClass)}>
                                 {msg("lastName")}
                             </label>
                         </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
                             <input
                                 type="text"
                                 id="lastName"
                                 name="lastName"
                                 defaultValue={user.lastName ?? ""}
-                                    className={cx(props.kcInputClass)}
+                                className={cx(kcProps.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(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)} />
                         </div>
 
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
                             {isAppInitiatedAction ? (
                                 <>
                                     <input
-                                            className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
                                         type="submit"
                                         defaultValue={msgStr("doSubmit")}
                                     />
                                     <button
-                                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
                                         type="submit"
                                         name="cancel-aia"
                                         value="true"
@@ -113,10 +117,10 @@ const LoginUpdateProfile = memo(
                             ) : (
                                 <input
                                     className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonPrimaryClass,
-                                            props.kcButtonBlockClass,
-                                            props.kcButtonLargeClass
+                                        kcProps.kcButtonClass,
+                                        kcProps.kcButtonPrimaryClass,
+                                        kcProps.kcButtonBlockClass,
+                                        kcProps.kcButtonLargeClass
                                     )}
                                     type="submit"
                                     defaultValue={msgStr("doSubmit")}
@@ -128,7 +132,6 @@ const LoginUpdateProfile = memo(
             }
         />
     );
-    }
-);
+});
 
 export default LoginUpdateProfile;

src/lib/components/LoginUsername.tsx

@@ -1,5 +1,6 @@
 import React, { useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
@@ -7,13 +8,16 @@ import { useConstCallback } from "powerhooks/useConstCallback";
 import type { FormEventHandler } from "react";
 import type { I18n } from "../i18n";
 
-const LoginUsername = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginUsername; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginUsernameProps = KcProps & {
+    kcContext: KcContextBase.LoginUsername;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LoginUsername = memo((props: LoginUsernameProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { social, realm, url, usernameHidden, login, registrationDisabled } = kcContext;
 
     const { msg, msgStr } = i18n;
@@ -38,21 +42,21 @@ const LoginUsername = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             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" className={cx(realm.password && social.providers !== undefined && kcProps.kcContentWrapperClass)}>
                     <div
                         id="kc-form-wrapper"
                         className={cx(
-                                realm.password && social.providers && [props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass]
+                            realm.password && social.providers && [kcProps.kcFormSocialAccountContentClass, kcProps.kcFormSocialAccountClass]
                         )}
                     >
                         {realm.password && (
                             <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
-                                    <div className={cx(props.kcFormGroupClass)}>
+                                <div className={cx(kcProps.kcFormGroupClass)}>
                                     {!usernameHidden &&
                                         (() => {
                                             const label = !realm.loginWithEmailAllowed
@@ -65,13 +69,13 @@ const LoginUsername = memo(
 
                                             return (
                                                 <>
-                                                        <label htmlFor={autoCompleteHelper} className={cx(props.kcLabelClass)}>
+                                                    <label htmlFor={autoCompleteHelper} className={cx(kcProps.kcLabelClass)}>
                                                         {msg(label)}
                                                     </label>
                                                     <input
                                                         tabIndex={1}
                                                         id={autoCompleteHelper}
-                                                            className={cx(props.kcInputClass)}
+                                                        className={cx(kcProps.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.
@@ -85,7 +89,7 @@ const LoginUsername = memo(
                                             );
                                         })()}
                                 </div>
-                                    <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
+                                <div className={cx(kcProps.kcFormGroupClass, kcProps.kcFormSettingClass)}>
                                     <div id="kc-form-options">
                                         {realm.rememberMe && !usernameHidden && (
                                             <div className="checkbox">
@@ -107,14 +111,14 @@ const LoginUsername = memo(
                                         )}
                                     </div>
                                 </div>
-                                    <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
+                                <div id="kc-form-buttons" className={cx(kcProps.kcFormGroupClass)}>
                                     <input
                                         tabIndex={4}
                                         className={cx(
-                                                props.kcButtonClass,
-                                                props.kcButtonPrimaryClass,
-                                                props.kcButtonBlockClass,
-                                                props.kcButtonLargeClass
+                                            kcProps.kcButtonClass,
+                                            kcProps.kcButtonPrimaryClass,
+                                            kcProps.kcButtonBlockClass,
+                                            kcProps.kcButtonLargeClass
                                         )}
                                         name="login"
                                         id="kc-login"
@@ -127,15 +131,15 @@ const LoginUsername = memo(
                         )}
                     </div>
                     {realm.password && social.providers !== undefined && (
-                            <div id="kc-social-providers" className={cx(props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass)}>
+                        <div id="kc-social-providers" className={cx(kcProps.kcFormSocialAccountContentClass, kcProps.kcFormSocialAccountClass)}>
                             <ul
                                 className={cx(
-                                        props.kcFormSocialAccountListClass,
-                                        social.providers.length > 4 && props.kcFormSocialAccountDoubleListClass
+                                    kcProps.kcFormSocialAccountListClass,
+                                    social.providers.length > 4 && kcProps.kcFormSocialAccountDoubleListClass
                                 )}
                             >
                                 {social.providers.map(p => (
-                                        <li key={p.providerId} className={cx(props.kcFormSocialAccountListLinkClass)}>
+                                    <li key={p.providerId} className={cx(kcProps.kcFormSocialAccountListLinkClass)}>
                                         <a href={p.loginUrl} id={`zocial-${p.alias}`} className={cx("zocial", p.providerId)}>
                                             <span>{p.displayName}</span>
                                         </a>
@@ -162,7 +166,6 @@ const LoginUsername = memo(
             }
         />
     );
-    }
-);
+});
 
 export default LoginUsername;

src/lib/components/LoginVerifyEmail.tsx

@@ -1,23 +1,27 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LoginVerifyEmail = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginVerifyEmail; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LoginVerifyEmailProps = KcProps & {
+    kcContext: KcContextBase.LoginVerifyEmail;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LoginVerifyEmail = memo((props: LoginVerifyEmailProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { msg } = i18n;
 
     const { url, user } = kcContext;
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             displayMessage={false}
             headerNode={msg("emailVerifyTitle")}
             formNode={
@@ -34,7 +38,6 @@ const LoginVerifyEmail = memo(
             }
         />
     );
-    }
-);
+});
 
 export default LoginVerifyEmail;

src/lib/components/LogoutConfirm.tsx

@@ -1,17 +1,21 @@
 import React, { memo } from "react";
 import { useCssAndCx } from "../tools/useCssAndCx";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LogoutConfirm = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LogoutConfirm; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type LogoutConfirmProps = KcProps & {
+    kcContext: KcContextBase.LogoutConfirm;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const LogoutConfirm = memo((props: LogoutConfirmProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { url, client, logoutConfirm } = kcContext;
 
     const { cx } = useCssAndCx();
@@ -20,7 +24,7 @@ const LogoutConfirm = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             displayMessage={false}
             headerNode={msg("logoutConfirmTitle")}
             formNode={
@@ -29,18 +33,18 @@ const LogoutConfirm = memo(
                         <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 className={cx(kcProps.kcFormGroupClass)}>
                                 <div id="kc-form-options">
-                                        <div className={cx(props.kcFormOptionsWrapperClass)}></div>
+                                    <div className={cx(kcProps.kcFormOptionsWrapperClass)}></div>
                                 </div>
-                                    <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
+                                <div id="kc-form-buttons" className={cx(kcProps.kcFormGroupClass)}>
                                     <input
                                         tabIndex={4}
                                         className={cx(
-                                                props.kcButtonClass,
-                                                props.kcButtonPrimaryClass,
-                                                props.kcButtonBlockClass,
-                                                props.kcButtonLargeClass
+                                            kcProps.kcButtonClass,
+                                            kcProps.kcButtonPrimaryClass,
+                                            kcProps.kcButtonBlockClass,
+                                            kcProps.kcButtonLargeClass
                                         )}
                                         name="confirmLogout"
                                         id="kc-logout"
@@ -62,7 +66,6 @@ const LogoutConfirm = memo(
             }
         />
     );
-    }
-);
+});
 
 export default LogoutConfirm;

src/lib/components/Register.tsx

@@ -1,17 +1,21 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const Register = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.Register; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type RegisterProps = KcProps & {
+    kcContext: KcContextBase.Register;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const Register = memo((props: RegisterProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { url, messagesPerField, register, realm, passwordRequired, recaptchaRequired, recaptchaSiteKey } = kcContext;
 
     const { msg, msgStr } = i18n;
@@ -20,55 +24,55 @@ const Register = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             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)}>
+                <form id="kc-register-form" className={cx(kcProps.kcFormClass)} action={url.registrationAction} method="post">
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("firstName", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="firstName" className={cx(kcProps.kcLabelClass)}>
                                 {msg("firstName")}
                             </label>
                         </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
                             <input
                                 type="text"
                                 id="firstName"
-                                    className={cx(props.kcInputClass)}
+                                className={cx(kcProps.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)}>
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("lastName", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="lastName" className={cx(kcProps.kcLabelClass)}>
                                 {msg("lastName")}
                             </label>
                         </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
                             <input
                                 type="text"
                                 id="lastName"
-                                    className={cx(props.kcInputClass)}
+                                className={cx(kcProps.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)}>
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("email", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="email" className={cx(kcProps.kcLabelClass)}>
                                 {msg("email")}
                             </label>
                         </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
                             <input
                                 type="text"
                                 id="email"
-                                    className={cx(props.kcInputClass)}
+                                className={cx(kcProps.kcInputClass)}
                                 name="email"
                                 defaultValue={register.formData.email ?? ""}
                                 autoComplete="email"
@@ -76,17 +80,17 @@ const Register = memo(
                         </div>
                     </div>
                     {!realm.registrationEmailAsUsername && (
-                            <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("username", props.kcFormGroupErrorClass))}>
-                                <div className={cx(props.kcLabelWrapperClass)}>
-                                    <label htmlFor="username" className={cx(props.kcLabelClass)}>
+                        <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("username", kcProps.kcFormGroupErrorClass))}>
+                            <div className={cx(kcProps.kcLabelWrapperClass)}>
+                                <label htmlFor="username" className={cx(kcProps.kcLabelClass)}>
                                     {msg("username")}
                                 </label>
                             </div>
-                                <div className={cx(props.kcInputWrapperClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
                                 <input
                                     type="text"
                                     id="username"
-                                        className={cx(props.kcInputClass)}
+                                    className={cx(kcProps.kcInputClass)}
                                     name="username"
                                     defaultValue={register.formData.username ?? ""}
                                     autoComplete="username"
@@ -96,17 +100,17 @@ const Register = memo(
                     )}
                     {passwordRequired && (
                         <>
-                                <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("password", props.kcFormGroupErrorClass))}>
-                                    <div className={cx(props.kcLabelWrapperClass)}>
-                                        <label htmlFor="password" className={cx(props.kcLabelClass)}>
+                            <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("password", kcProps.kcFormGroupErrorClass))}>
+                                <div className={cx(kcProps.kcLabelWrapperClass)}>
+                                    <label htmlFor="password" className={cx(kcProps.kcLabelClass)}>
                                         {msg("password")}
                                     </label>
                                 </div>
-                                    <div className={cx(props.kcInputWrapperClass)}>
+                                <div className={cx(kcProps.kcInputWrapperClass)}>
                                     <input
                                         type="password"
                                         id="password"
-                                            className={cx(props.kcInputClass)}
+                                        className={cx(kcProps.kcInputClass)}
                                         name="password"
                                         autoComplete="new-password"
                                     />
@@ -115,44 +119,44 @@ const Register = memo(
 
                             <div
                                 className={cx(
-                                        props.kcFormGroupClass,
-                                        messagesPerField.printIfExists("password-confirm", props.kcFormGroupErrorClass)
+                                    kcProps.kcFormGroupClass,
+                                    messagesPerField.printIfExists("password-confirm", kcProps.kcFormGroupErrorClass)
                                 )}
                             >
-                                    <div className={cx(props.kcLabelWrapperClass)}>
-                                        <label htmlFor="password-confirm" className={cx(props.kcLabelClass)}>
+                                <div className={cx(kcProps.kcLabelWrapperClass)}>
+                                    <label htmlFor="password-confirm" className={cx(kcProps.kcLabelClass)}>
                                         {msg("passwordConfirm")}
                                     </label>
                                 </div>
-                                    <div className={cx(props.kcInputWrapperClass)}>
-                                        <input type="password" id="password-confirm" className={cx(props.kcInputClass)} name="password-confirm" />
+                                <div className={cx(kcProps.kcInputWrapperClass)}>
+                                    <input type="password" id="password-confirm" className={cx(kcProps.kcInputClass)} name="password-confirm" />
                                 </div>
                             </div>
                         </>
                     )}
                     {recaptchaRequired && (
                         <div className="form-group">
-                                <div className={cx(props.kcInputWrapperClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
                                 <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey}></div>
                             </div>
                         </div>
                     )}
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)}>
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
                                 <span>
                                     <a href={url.loginUrl}>{msg("backToLogin")}</a>
                                 </span>
                             </div>
                         </div>
 
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
                             <input
                                 className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
                                 )}
                                 type="submit"
                                 value={msgStr("doRegister")}
@@ -163,7 +167,6 @@ const Register = memo(
             }
         />
     );
-    }
-);
+});
 
 export default Register;

src/lib/components/RegisterUserProfile.tsx

@@ -1,28 +1,32 @@
 import React, { useMemo, memo, useState } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
-const RegisterUserProfile = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props_
-    }: { kcContext: KcContextBase.RegisterUserProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type RegisterUserProfileProps = KcProps & {
+    kcContext: KcContextBase.RegisterUserProfile;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const RegisterUserProfile = memo((props: RegisterUserProfileProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps_ } = props;
+
     const { url, messagesPerField, recaptchaRequired, recaptchaSiteKey } = kcContext;
 
     const { msg, msgStr } = i18n;
 
     const { cx, css } = useCssAndCx();
 
-        const props = useMemo(
+    const kcProps = useMemo(
         () => ({
-                ...props_,
-                "kcFormGroupClass": cx(props_.kcFormGroupClass, css({ "marginBottom": 20 }))
+            ...kcProps_,
+            "kcFormGroupClass": cx(kcProps_.kcFormGroupClass, css({ "marginBottom": 20 }))
         }),
         [cx, css]
     );
@@ -31,36 +35,36 @@ const RegisterUserProfile = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             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} />
+                <form id="kc-register-form" className={cx(kcProps.kcFormClass)} action={url.registrationAction} method="post">
+                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...kcProps} />
                     {recaptchaRequired && (
                         <div className="form-group">
-                                <div className={cx(props.kcInputWrapperClass)}>
+                            <div className={cx(kcProps.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)}>
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
                                 <span>
                                     <a href={url.loginUrl}>{msg("backToLogin")}</a>
                                 </span>
                             </div>
                         </div>
 
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
                             <input
                                 className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
                                 )}
                                 type="submit"
                                 value={msgStr("doRegister")}
@@ -72,7 +76,6 @@ const RegisterUserProfile = memo(
             }
         />
     );
-    }
-);
+});
 
 export default RegisterUserProfile;

src/lib/components/Terms.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
@@ -12,6 +13,7 @@ import memoize from "memoizee";
 import { useConst } from "powerhooks/useConst";
 import { useConstCallback } from "powerhooks/useConstCallback";
 import { Markdown } from "../tools/Markdown";
+import type { Extends } from "tsafe";
 
 export const evtTermMarkdown = Evt.create<string | undefined>(undefined);
 
@@ -22,7 +24,7 @@ export type KcContextLike = {
     };
 };
 
-assert<KcContextBase extends KcContextLike ? true : false>();
+assert<Extends<KcContextBase, KcContextLike>>();
 
 /** Allow to avoid bundling the terms and download it on demand*/
 export function useDownloadTerms(params: {
@@ -54,13 +56,16 @@ export function useDownloadTerms(params: {
     }, []);
 }
 
-const Terms = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.Terms; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type TermsProps = KcProps & {
+    kcContext: KcContextBase.Terms;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const Terms = memo((props: TermsProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { msg, msgStr } = i18n;
 
     useRerenderOnStateChange(evtTermMarkdown);
@@ -75,7 +80,7 @@ const Terms = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             displayMessage={false}
             headerNode={msg("termsTitle")}
             formNode={
@@ -84,11 +89,11 @@ const Terms = memo(
                     <form className="form-actions" action={url.loginAction} method="POST">
                         <input
                             className={cx(
-                                    props.kcButtonClass,
-                                    props.kcButtonClass,
-                                    props.kcButtonClass,
-                                    props.kcButtonPrimaryClass,
-                                    props.kcButtonLargeClass
+                                kcProps.kcButtonClass,
+                                kcProps.kcButtonClass,
+                                kcProps.kcButtonClass,
+                                kcProps.kcButtonPrimaryClass,
+                                kcProps.kcButtonLargeClass
                             )}
                             name="accept"
                             id="kc-accept"
@@ -96,7 +101,7 @@ const Terms = memo(
                             value={msgStr("doAccept")}
                         />
                         <input
-                                className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
+                            className={cx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
                             name="cancel"
                             id="kc-decline"
                             type="submit"
@@ -108,7 +113,6 @@ const Terms = memo(
             }
         />
     );
-    }
-);
+});
 
 export default Terms;

src/lib/components/UpdateUserProfile.tsx

@@ -1,18 +1,22 @@
 import React, { useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
-const UpdateUserProfile = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.UpdateUserProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type UpdateUserProfileProps = KcProps & {
+    kcContext: KcContextBase.UpdateUserProfile;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const UpdateUserProfile = memo((props: UpdateUserProfileProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { cx } = useCssAndCx();
 
     const { msg, msgStr } = i18n;
@@ -23,27 +27,27 @@ const UpdateUserProfile = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             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} />
+                <form id="kc-update-profile-form" className={cx(kcProps.kcFormClass)} action={url.loginAction} method="post">
+                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...kcProps} />
 
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)}></div>
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}></div>
                         </div>
 
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
                             {isAppInitiatedAction ? (
                                 <>
                                     <input
-                                            className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
                                         type="submit"
                                         value={msgStr("doSubmit")}
                                     />
                                     <button
-                                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
                                         type="submit"
                                         name="cancel-aia"
                                         value="true"
@@ -55,10 +59,10 @@ const UpdateUserProfile = memo(
                             ) : (
                                 <input
                                     className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonPrimaryClass,
-                                            props.kcButtonBlockClass,
-                                            props.kcButtonLargeClass
+                                        kcProps.kcButtonClass,
+                                        kcProps.kcButtonPrimaryClass,
+                                        kcProps.kcButtonBlockClass,
+                                        kcProps.kcButtonLargeClass
                                     )}
                                     type="submit"
                                     defaultValue={msgStr("doSubmit")}
@@ -71,7 +75,6 @@ const UpdateUserProfile = memo(
             }
         />
     );
-    }
-);
+});
 
 export default UpdateUserProfile;

src/lib/components/WebauthnAuthenticate.tsx

@@ -1,5 +1,6 @@
 import React, { useRef, useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
@@ -7,13 +8,16 @@ import type { I18n, MessageKeyBase } from "../i18n";
 import { base64url } from "rfc4648";
 import { useConstCallback } from "powerhooks/useConstCallback";
 
-const WebauthnAuthenticate = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.WebauthnAuthenticate; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+export type WebauthnAuthenticateProps = KcProps & {
+    kcContext: KcContextBase.WebauthnAuthenticate;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
+
+const WebauthnAuthenticate = memo((props: WebauthnAuthenticateProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
+
     const { url } = kcContext;
 
     const { msg, msgStr } = i18n;
@@ -95,10 +99,10 @@ const WebauthnAuthenticate = memo(
 
     return (
         <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             headerNode={msg("webauthn-login-title")}
             formNode={
-                    <div id="kc-form-webauthn" className={cx(props.kcFormClass)}>
+                <div id="kc-form-webauthn" className={cx(kcProps.kcFormClass)}>
                     <form id="webauth" action={url.loginAction} ref={webAuthForm} method="post">
                         <input type="hidden" id="clientDataJSON" name="clientDataJSON" value={clientDataJSON} />
                         <input type="hidden" id="authenticatorData" name="authenticatorData" value={authenticatorData} />
@@ -107,10 +111,10 @@ const WebauthnAuthenticate = memo(
                         <input type="hidden" id="userHandle" name="userHandle" value={userHandle} />
                         <input type="hidden" id="error" name="error" value={error} />
                     </form>
-                        <div className={cx(props.kcFormGroupClass)}>
+                    <div className={cx(kcProps.kcFormGroupClass)}>
                         {authenticators &&
                             (() => (
-                                    <form id="authn_select" className={cx(props.kcFormClass)}>
+                                <form id="authn_select" className={cx(kcProps.kcFormClass)}>
                                     {authenticators.authenticators.map(authenticator => (
                                         <input
                                             type="hidden"
@@ -126,23 +130,23 @@ const WebauthnAuthenticate = memo(
                             (() => (
                                 <>
                                     {authenticators.authenticators.length > 1 && (
-                                            <p className={cx(props.kcSelectAuthListItemTitle)}>{msg("webauthn-available-authenticators")}</p>
+                                        <p className={cx(kcProps.kcSelectAuthListItemTitle)}>{msg("webauthn-available-authenticators")}</p>
                                     )}
-                                        <div className={cx(props.kcFormClass)}>
+                                    <div className={cx(kcProps.kcFormClass)}>
                                         {authenticators.authenticators.map(authenticator => (
-                                                <div id="kc-webauthn-authenticator" className={cx(props.kcSelectAuthListItemClass)}>
-                                                    <div className={cx(props.kcSelectAuthListItemIconClass)}>
+                                            <div id="kc-webauthn-authenticator" className={cx(kcProps.kcSelectAuthListItemClass)}>
+                                                <div className={cx(kcProps.kcSelectAuthListItemIconClass)}>
                                                     <i
                                                         className={cx(
-                                                                props[authenticator.transports.iconClass] ?? props.kcWebAuthnDefaultIcon,
-                                                                props.kcSelectAuthListItemIconPropertyClass
+                                                            kcProps[authenticator.transports.iconClass] ?? kcProps.kcWebAuthnDefaultIcon,
+                                                            kcProps.kcSelectAuthListItemIconPropertyClass
                                                         )}
                                                     />
                                                 </div>
-                                                    <div className={cx(props.kcSelectAuthListItemBodyClass)}>
+                                                <div className={cx(kcProps.kcSelectAuthListItemBodyClass)}>
                                                     <div
                                                         id="kc-webauthn-authenticator-label"
-                                                            className={cx(props.kcSelectAuthListItemHeadingClass)}
+                                                        className={cx(kcProps.kcSelectAuthListItemHeadingClass)}
                                                     >
                                                         {authenticator.label}
                                                     </div>
@@ -150,7 +154,7 @@ const WebauthnAuthenticate = memo(
                                                     {authenticator.transports && authenticator.transports.displayNameProperties.length && (
                                                         <div
                                                             id="kc-webauthn-authenticator-transport"
-                                                                className={cx(props.kcSelectAuthListItemDescriptionClass)}
+                                                            className={cx(kcProps.kcSelectAuthListItemDescriptionClass)}
                                                         >
                                                             {authenticator.transports.displayNameProperties.map(
                                                                 (transport: MessageKeyBase, index: number) => (
@@ -165,20 +169,18 @@ const WebauthnAuthenticate = memo(
                                                         </div>
                                                     )}
 
-                                                        <div className={cx(props.kcSelectAuthListItemDescriptionClass)}>
-                                                            <span id="kc-webauthn-authenticator-created-label">
-                                                                {msg("webauthn-createdAt-label")}
-                                                            </span>
+                                                    <div className={cx(kcProps.kcSelectAuthListItemDescriptionClass)}>
+                                                        <span id="kc-webauthn-authenticator-created-label">{msg("webauthn-createdAt-label")}</span>
                                                         <span id="kc-webauthn-authenticator-created">{authenticator.createdAt}</span>
                                                     </div>
                                                 </div>
-                                                    <div className={cx(props.kcSelectAuthListItemFillClass)} />
+                                                <div className={cx(kcProps.kcSelectAuthListItemFillClass)} />
                                             </div>
                                         ))}
                                     </div>
                                 </>
                             ))()}
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
                             <input
                                 id="authenticateWebAuthnButton"
                                 type="button"
@@ -186,10 +188,10 @@ const WebauthnAuthenticate = memo(
                                 autoFocus={true}
                                 value={msgStr("webauthn-doAuthenticate")}
                                 className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
                                 )}
                             />
                         </div>
@@ -198,7 +200,6 @@ const WebauthnAuthenticate = memo(
             }
         />
     );
-    }
-);
+});
 
 export default WebauthnAuthenticate;

yarn.lock

@@ -967,14 +967,14 @@ event-emitter@^0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
-evt@^2.4.5:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/evt/-/evt-2.4.5.tgz#9e383c20a7917977e26b9fbad178585916ea8142"
-  integrity sha512-shiXMrEhTHqTl5PacT3vdA1U9i3usnInuxt77Lj0Ph9igNM982b1Uf/3L24OSzI0SqLx/XIRVIJcgzUZ2Ij8AA==
+evt@^2.4.6:
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/evt/-/evt-2.4.6.tgz#79e242cd2f84c2ec0b8119478712f7af80368832"
+  integrity sha512-4kSu9YVklCeddEAu/UCzIISrxc5SAD82hX7gXjBox4yyrPNblYrmJr4GgTOOQpNXTGYci+UIpFUYikgZa9fyTQ==
   dependencies:
     minimal-polyfills "^2.2.2"
     run-exclusive "^2.2.16"
-    tsafe "^1.1.2"
+    tsafe "^1.1.3"
 
 execa@^5.1.1:
   version "5.1.1"
@@ -1634,12 +1634,12 @@ please-upgrade-node@^3.2.0:
   dependencies:
     semver-compare "^1.0.0"
 
-powerhooks@^0.20.22:
-  version "0.20.22"
-  resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-0.20.22.tgz#469ba048dfa9c1d549325c73a091f8f3b96895b3"
-  integrity sha512-xFv5s7JTkwQh+lDVR1yLgGXPYfpbmdmdg6qT4VTF4EArieaImhCXFp7arSul55FvYoCuD5+gR9ooctDG53LeLg==
+powerhooks@^0.20.23:
+  version "0.20.23"
+  resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-0.20.23.tgz#52619405f63bf621c52f0cb944c58414734b618f"
+  integrity sha512-+44ltLJmvti6XZJuaRlfMbjX/2ZkJBw8CybkwDIh/GntOtyertWhbYa1k9QBy2deLKTcBj39Tx86/exIHoCcFA==
   dependencies:
-    evt "^2.4.5"
+    evt "^2.4.6"
     memoizee "^0.4.15"
     resize-observer-polyfill "^1.5.1"
     tsafe "^1.1.3"
@@ -1992,11 +1992,6 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-tsafe@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.1.2.tgz#cece1900bca89e25a84a65e7087f00dff3664b2e"
-  integrity sha512-jom5KsB9vpvOE9dLx2yTrPAJzzwU9CRPgoatoD7m2Zb7FCqo6ueEdZ+AZk+OysM4N+m8EUnIa1s9Pq3IMRDYLA==
-
 tsafe@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.1.3.tgz#fa7c2ae7da689884292b70ee30febbca5c665d03"