Update garronej_modules_update

feat: add silent flag

.github/FUNDING.yaml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: [garronej]
+custom: ['https://www.ringerhq.com/experts/garronej']

.github/workflows/ci.yaml

@@ -45,11 +45,9 @@ jobs:
     - 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

README.md

@@ -27,7 +27,14 @@
         <a href="https://www.keycloakify.dev">Home</a>
         -
         <a href="https://docs.keycloakify.dev">Documentation</a>
-</p>
+    </p>
+    <p align="center"> ---- Project starter / Demo setup ---- </p>
+    <p align="center">
+        <a href="https://github.com/garronej/keycloakify-starter">CSS Level customization</a>
+        -
+        <a href="https://github.com/garronej/keycloakify-advanced-starter">Component Level customization</a>
+    </p>
+    <p align="center"> ---- </p>
 
 </p>
 
@@ -37,11 +44,17 @@
 </p>
 
 > 🗣 V6 have been released 🎉  
-> [It features major improvements](/#600).  
+> [It features major improvements](https://github.com/InseeFrLab/keycloakify#600).  
 > Checkout [the migration guide](https://docs.keycloakify.dev/v5-to-v6).
 
 # Changelog highlights
 
+## 6.4.0
+
+-   You can now optionally pass a `doFetchDefaultThemeResources: boolean` prop to every page component and the default `<KcApp />`
+    This enables you to prevent the default CSS and JS that comes with the builtin Keycloak theme to be downloaded.  
+    You'll get [a black slate](https://user-images.githubusercontent.com/6702424/192619083-4baa5df4-4a21-4ec7-8e28-d200d1208299.png).
+
 ## 6.0.0
 
 -   Bundle size drastically reduced, locals and component dynamically loaded.

package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "6.0.0",
+    "version": "6.4.2",
     "description": "Keycloak theme generator for Reacts app",
     "repository": {
         "type": "git",
@@ -13,7 +13,8 @@
         "build:test": "rimraf dist_test/ && tsc -p src/test && yarn copy-files dist_test/",
         "grant-exec-perms": "node dist/bin/tools/grant-exec-perms.js",
         "copy-files": "copyfiles -u 1 src/**/*.ftl",
-        "test": "yarn build:test && node dist_test/test/bin && node dist_test/test/lib",
+        "pretest": "yarn build:test",
+        "test": "node dist_test/test/bin && node dist_test/test/lib",
         "generate-messages": "node dist/bin/generate-i18n-messages.js",
         "link_in_test_app": "node dist/bin/link_in_test_app.js",
         "_format": "prettier '**/*.{ts,tsx,json,md}'",
@@ -60,6 +61,7 @@
     "devDependencies": {
         "@emotion/react": "^11.4.1",
         "@types/memoizee": "^0.4.7",
+        "@types/minimist": "^1.2.2",
         "@types/node": "^17.0.25",
         "@types/react": "18.0.9",
         "copyfiles": "^2.4.1",
@@ -75,15 +77,16 @@
         "@octokit/rest": "^18.12.0",
         "cheerio": "^1.0.0-rc.5",
         "cli-select": "^1.1.2",
-        "evt": "^2.4.0",
+        "evt": "^2.4.4",
         "memoizee": "^0.4.15",
         "minimal-polyfills": "^2.2.2",
+        "minimist": "^1.2.6",
         "path-browserify": "^1.0.1",
-        "powerhooks": "^0.20.15",
+        "powerhooks": "^0.20.20",
         "react-markdown": "^5.0.3",
         "scripting-tools": "^0.19.13",
-        "tsafe": "^1.0.1",
-        "tss-react": "^4.1.1",
+        "tsafe": "^1.1.1",
+        "tss-react": "^4.2.0",
         "zod": "^3.17.10"
     }
 }

src/bin/create-keycloak-email-directory.ts

@@ -6,11 +6,15 @@ import { join as pathJoin, basename as pathBasename } from "path";
 import { transformCodebase } from "./tools/transformCodebase";
 import { promptKeycloakVersion } from "./promptKeycloakVersion";
 import * as fs from "fs";
+import { getCliOptions } from "./tools/cliOptions";
+import { getLogger } from "./tools/logger";
 
 if (require.main === module) {
     (async () => {
+        const { isSilent } = getCliOptions(process.argv.slice(2));
+        const logger = getLogger({ isSilent });
         if (fs.existsSync(keycloakThemeEmailDirPath)) {
-            console.log(`There is already a ./${pathBasename(keycloakThemeEmailDirPath)} directory in your project. Aborting.`);
+            logger.warn(`There is already a ./${pathBasename(keycloakThemeEmailDirPath)} directory in your project. Aborting.`);
 
             process.exit(-1);
         }
@@ -21,7 +25,8 @@ if (require.main === module) {
 
         downloadBuiltinKeycloakTheme({
             keycloakVersion,
-            "destDirPath": builtinKeycloakThemeTmpDirPath
+            "destDirPath": builtinKeycloakThemeTmpDirPath,
+            isSilent
         });
 
         transformCodebase({
@@ -29,7 +34,7 @@ if (require.main === module) {
             "destDirPath": keycloakThemeEmailDirPath
         });
 
-        console.log(`./${pathBasename(keycloakThemeEmailDirPath)} ready to be customized`);
+        logger.log(`./${pathBasename(keycloakThemeEmailDirPath)} ready to be customized`);
 
         fs.rmSync(builtinKeycloakThemeTmpDirPath, { "recursive": true, "force": true });
     })();

src/bin/download-builtin-keycloak-theme.ts

@@ -4,31 +4,37 @@ import { keycloakThemeBuildingDirPath } from "./keycloakify";
 import { join as pathJoin } from "path";
 import { downloadAndUnzip } from "./tools/downloadAndUnzip";
 import { promptKeycloakVersion } from "./promptKeycloakVersion";
+import { getCliOptions } from "./tools/cliOptions";
+import { getLogger } from "./tools/logger";
 
-export function downloadBuiltinKeycloakTheme(params: { keycloakVersion: string; destDirPath: string }) {
-    const { keycloakVersion, destDirPath } = params;
+export function downloadBuiltinKeycloakTheme(params: { keycloakVersion: string; destDirPath: string; isSilent: boolean }) {
+    const { keycloakVersion, destDirPath, isSilent } = params;
 
     for (const ext of ["", "-community"]) {
         downloadAndUnzip({
             "destDirPath": destDirPath,
             "url": `https://github.com/keycloak/keycloak/archive/refs/tags/${keycloakVersion}.zip`,
             "pathOfDirToExtractInArchive": `keycloak-${keycloakVersion}/themes/src/main/resources${ext}/theme`,
-            "cacheDirPath": pathJoin(keycloakThemeBuildingDirPath, ".cache")
+            "cacheDirPath": pathJoin(keycloakThemeBuildingDirPath, ".cache"),
+            isSilent
         });
     }
 }
 
 if (require.main === module) {
     (async () => {
+        const { isSilent } = getCliOptions(process.argv.slice(2));
+        const logger = getLogger({ isSilent });
         const { keycloakVersion } = await promptKeycloakVersion();
 
         const destDirPath = pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme");
 
-        console.log(`Downloading builtins theme of Keycloak ${keycloakVersion} here ${destDirPath}`);
+        logger.log(`Downloading builtins theme of Keycloak ${keycloakVersion} here ${destDirPath}`);
 
         downloadBuiltinKeycloakTheme({
             keycloakVersion,
-            destDirPath
+            destDirPath,
+            isSilent
         });
     })();
 }

src/bin/generate-i18n-messages.ts

@@ -5,6 +5,8 @@ import { crawl } from "./tools/crawl";
 import { downloadBuiltinKeycloakTheme } from "./download-builtin-keycloak-theme";
 import { getProjectRoot } from "./tools/getProjectRoot";
 import { rm_rf, rm_r } from "./tools/rm";
+import { getCliOptions } from "./tools/cliOptions";
+import { getLogger } from "./tools/logger";
 
 //NOTE: To run without argument when we want to generate src/i18n/generated_kcMessages files,
 // update the version array for generating for newer version.
@@ -12,8 +14,11 @@ import { rm_rf, rm_r } from "./tools/rm";
 //@ts-ignore
 const propertiesParser = require("properties-parser");
 
+const { isSilent } = getCliOptions(process.argv.slice(2));
+const logger = getLogger({ isSilent });
+
 for (const keycloakVersion of ["11.0.3", "15.0.2", "18.0.1"]) {
-    console.log({ keycloakVersion });
+    logger.log(JSON.stringify({ keycloakVersion }));
 
     const tmpDirPath = pathJoin(getProjectRoot(), "tmp_xImOef9dOd44");
 
@@ -21,7 +26,8 @@ for (const keycloakVersion of ["11.0.3", "15.0.2", "18.0.1"]) {
 
     downloadBuiltinKeycloakTheme({
         keycloakVersion,
-        "destDirPath": tmpDirPath
+        "destDirPath": tmpDirPath,
+        isSilent
     });
 
     type Dictionary = { [idiomId: string]: string };
@@ -75,7 +81,7 @@ for (const keycloakVersion of ["11.0.3", "15.0.2", "18.0.1"]) {
                 )
             );
 
-            console.log(`${filePath} wrote`);
+            logger.log(`${filePath} wrote`);
         });
     });
 }

src/bin/keycloakify/BuildOptions.ts

@@ -11,7 +11,7 @@ type ParsedPackageJson = {
     keycloakify?: {
         extraPages?: string[];
         extraThemeProperties?: string[];
-        isAppAndKeycloakServerSharingSameDomain?: boolean;
+        areAppAndKeycloakServerSharingSameDomain?: boolean;
     };
 };
 
@@ -23,7 +23,7 @@ const zParsedPackageJson = z.object({
         .object({
             "extraPages": z.array(z.string()).optional(),
             "extraThemeProperties": z.array(z.string()).optional(),
-            "isAppAndKeycloakServerSharingSameDomain": z.boolean().optional()
+            "areAppAndKeycloakServerSharingSameDomain": z.boolean().optional()
         })
         .optional()
 });
@@ -35,6 +35,7 @@ export type BuildOptions = BuildOptions.Standalone | BuildOptions.ExternalAssets
 
 export namespace BuildOptions {
     export type Common = {
+        isSilent: boolean;
         version: string;
         themeName: string;
         extraPages?: string[];
@@ -56,11 +57,11 @@ export namespace BuildOptions {
         };
 
         export type SameDomain = CommonExternalAssets & {
-            isAppAndKeycloakServerSharingSameDomain: true;
+            areAppAndKeycloakServerSharingSameDomain: true;
         };
 
         export type DifferentDomains = CommonExternalAssets & {
-            isAppAndKeycloakServerSharingSameDomain: false;
+            areAppAndKeycloakServerSharingSameDomain: false;
             urlOrigin: string;
             urlPathname: string | undefined;
         };
@@ -71,8 +72,9 @@ export function readBuildOptions(params: {
     packageJson: string;
     CNAME: string | undefined;
     isExternalAssetsCliParamProvided: boolean;
+    isSilent: boolean;
 }): BuildOptions {
-    const { packageJson, CNAME, isExternalAssetsCliParamProvided } = params;
+    const { packageJson, CNAME, isExternalAssetsCliParamProvided, isSilent } = params;
 
     const parsedPackageJson = zParsedPackageJson.parse(JSON.parse(packageJson));
 
@@ -130,7 +132,8 @@ export function readBuildOptions(params: {
             })(),
             "version": version,
             extraPages,
-            extraThemeProperties
+            extraThemeProperties,
+            isSilent
         };
     })();
 
@@ -140,10 +143,10 @@ export function readBuildOptions(params: {
             "isStandalone": false
         });
 
-        if (parsedPackageJson.keycloakify?.isAppAndKeycloakServerSharingSameDomain) {
+        if (parsedPackageJson.keycloakify?.areAppAndKeycloakServerSharingSameDomain) {
             return id<BuildOptions.ExternalAssets.SameDomain>({
                 ...commonExternalAssets,
-                "isAppAndKeycloakServerSharingSameDomain": true
+                "areAppAndKeycloakServerSharingSameDomain": true
             });
         } else {
             assert(
@@ -155,14 +158,14 @@ export function readBuildOptions(params: {
                     "public/CNAME file.",
                     "Alternatively, if your app and the Keycloak server are on the same domain, ",
                     "eg https://example.com is your app and https://example.com/auth is the keycloak",
-                    'admin UI, you can set "keycloakify": { "isAppAndKeycloakServerSharingSameDomain": true }',
+                    'admin UI, you can set "keycloakify": { "areAppAndKeycloakServerSharingSameDomain": true }',
                     "in your package.json"
                 ].join(" ")
             );
 
             return id<BuildOptions.ExternalAssets.DifferentDomains>({
                 ...commonExternalAssets,
-                "isAppAndKeycloakServerSharingSameDomain": false,
+                "areAppAndKeycloakServerSharingSameDomain": false,
                 "urlOrigin": url.origin,
                 "urlPathname": url.pathname
             });

src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl

@@ -272,6 +272,11 @@ ${ftl_object_to_js_code_declaring_an_object(.data_model, [])?no_esc};
 
             <#list object as array_item>
 
+                <#if !array_item??>
+                    <#local out_seq += ["null,"]>
+                    <#continue>
+                </#if>
+
                 <#local rec_out = ftl_object_to_js_code_declaring_an_object(array_item, path + [ i ])>
 
                 <#local i = i + 1>

src/bin/keycloakify/generateFtl/generateFtl.ts

@@ -27,7 +27,9 @@ export const pageIds = [
     "login-idp-link-email.ftl",
     "login-page-expired.ftl",
     "login-config-totp.ftl",
-    "logout-confirm.ftl"
+    "logout-confirm.ftl",
+    "update-user-profile.ftl",
+    "idp-review-user-profile.ftl"
 ] as const;
 
 export type BuildOptionsLike = BuildOptionsLike.Standalone | BuildOptionsLike.ExternalAssets;
@@ -46,11 +48,11 @@ export namespace BuildOptionsLike {
         };
 
         export type SameDomain = CommonExternalAssets & {
-            isAppAndKeycloakServerSharingSameDomain: true;
+            areAppAndKeycloakServerSharingSameDomain: true;
         };
 
         export type DifferentDomains = CommonExternalAssets & {
-            isAppAndKeycloakServerSharingSameDomain: false;
+            areAppAndKeycloakServerSharingSameDomain: false;
             urlOrigin: string;
             urlPathname: string | undefined;
         };
@@ -76,7 +78,7 @@ export function generateFtlFilesCodeFactory(params: {
     const $ = cheerio.load(indexHtmlCode);
 
     fix_imports_statements: {
-        if (!buildOptions.isStandalone && buildOptions.isAppAndKeycloakServerSharingSameDomain) {
+        if (!buildOptions.isStandalone && buildOptions.areAppAndKeycloakServerSharingSameDomain) {
             break fix_imports_statements;
         }
 

src/bin/keycloakify/generateKeycloakThemeResources.ts

@@ -11,6 +11,7 @@ import { isInside } from "../tools/isInside";
 import type { BuildOptions } from "./BuildOptions";
 import { assert } from "tsafe/assert";
 import { Reflect } from "tsafe/Reflect";
+import { getLogger } from "../tools/logger";
 
 export type BuildOptionsLike = BuildOptionsLike.Standalone | BuildOptionsLike.ExternalAssets;
 
@@ -19,6 +20,7 @@ export namespace BuildOptionsLike {
         themeName: string;
         extraPages?: string[];
         extraThemeProperties?: string[];
+        isSilent: boolean;
     };
 
     export type Standalone = Common & {
@@ -34,11 +36,11 @@ export namespace BuildOptionsLike {
         };
 
         export type SameDomain = CommonExternalAssets & {
-            isAppAndKeycloakServerSharingSameDomain: true;
+            areAppAndKeycloakServerSharingSameDomain: true;
         };
 
         export type DifferentDomains = CommonExternalAssets & {
-            isAppAndKeycloakServerSharingSameDomain: false;
+            areAppAndKeycloakServerSharingSameDomain: false;
             urlOrigin: string;
             urlPathname: string | undefined;
         };
@@ -60,6 +62,7 @@ export function generateKeycloakThemeResources(params: {
 }): { doBundlesEmailTemplate: boolean } {
     const { reactAppBuildDirPath, keycloakThemeBuildingDirPath, keycloakThemeEmailDirPath, keycloakVersion, buildOptions } = params;
 
+    const logger = getLogger({ isSilent: buildOptions.isSilent });
     const themeDirPath = pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme", buildOptions.themeName, "login");
 
     let allCssGlobalsToDefine: Record<string, string> = {};
@@ -97,7 +100,7 @@ export function generateKeycloakThemeResources(params: {
             }
 
             if (/\.js?$/i.test(filePath)) {
-                if (!buildOptions.isStandalone && buildOptions.isAppAndKeycloakServerSharingSameDomain) {
+                if (!buildOptions.isStandalone && buildOptions.areAppAndKeycloakServerSharingSameDomain) {
                     return undefined;
                 }
 
@@ -117,7 +120,7 @@ export function generateKeycloakThemeResources(params: {
 
     email: {
         if (!fs.existsSync(keycloakThemeEmailDirPath)) {
-            console.log(
+            logger.log(
                 [
                     `Not bundling email template because ${pathBasename(keycloakThemeEmailDirPath)} does not exist`,
                     `To start customizing the email template, run: 👉 npx create-keycloak-email-directory 👈`
@@ -154,7 +157,8 @@ export function generateKeycloakThemeResources(params: {
 
         downloadBuiltinKeycloakTheme({
             keycloakVersion,
-            "destDirPath": tmpDirPath
+            "destDirPath": tmpDirPath,
+            isSilent: buildOptions.isSilent
         });
 
         const themeResourcesDirPath = pathJoin(themeDirPath, "resources");

src/bin/keycloakify/keycloakify.ts

@@ -5,6 +5,8 @@ import * as child_process from "child_process";
 import { generateStartKeycloakTestingContainer } from "./generateStartKeycloakTestingContainer";
 import * as fs from "fs";
 import { readBuildOptions } from "./BuildOptions";
+import { getLogger } from "../tools/logger";
+import { getCliOptions } from "../tools/cliOptions";
 
 const reactProjectDirPath = process.cwd();
 
@@ -12,7 +14,9 @@ export const keycloakThemeBuildingDirPath = pathJoin(reactProjectDirPath, "build
 export const keycloakThemeEmailDirPath = pathJoin(keycloakThemeBuildingDirPath, "..", "keycloak_email");
 
 export function main() {
-    console.log("🔏 Building the keycloak theme...⌚");
+    const { isSilent, hasExternalAssets } = getCliOptions(process.argv.slice(2));
+    const logger = getLogger({ isSilent });
+    logger.log("🔏 Building the keycloak theme...⌚");
 
     const buildOptions = readBuildOptions({
         "packageJson": fs.readFileSync(pathJoin(reactProjectDirPath, "package.json")).toString("utf8"),
@@ -25,7 +29,8 @@ export function main() {
 
             return fs.readFileSync(cnameFilePath).toString("utf8");
         })(),
-        "isExternalAssetsCliParamProvided": process.argv[2]?.toLowerCase() === "--external-assets"
+        "isExternalAssetsCliParamProvided": hasExternalAssets,
+        "isSilent": isSilent
     });
 
     const { doBundlesEmailTemplate } = generateKeycloakThemeResources({
@@ -51,7 +56,7 @@ export function main() {
     });
 
     //We want, however, to test in a container running the latest Keycloak version
-    const containerKeycloakVersion = "18.0.2";
+    const containerKeycloakVersion = "19.0.1";
 
     generateStartKeycloakTestingContainer({
         keycloakThemeBuildingDirPath,
@@ -59,7 +64,7 @@ export function main() {
         buildOptions
     });
 
-    console.log(
+    logger.log(
         [
             "",
             `✅ Your keycloak theme has been generated and bundled into ./${pathRelative(reactProjectDirPath, jarFilePath)} 🚀`,

src/bin/keycloakify/replacers/replaceImportsFromStaticInJsCode.ts

@@ -57,7 +57,7 @@ export function replaceImportsFromStaticInJsCode(params: { jsCode: string; build
                         : `
                     var p= "";
                     Object.defineProperty(${n}, "p", {
-                        get: function() { return "${ftlValuesGlobalName}" in window ? "${buildOptions.urlOrigin}" : p; },
+                        get: function() { return "${ftlValuesGlobalName}" in window ? "${buildOptions.urlOrigin}/" : p; },
                         set: function (value){ p = value;}
                     });
                     `
@@ -73,13 +73,13 @@ export function replaceImportsFromStaticInJsCode(params: { jsCode: string; build
         .replace(/([a-zA-Z]+\.[a-zA-Z]+)\+"static\//g, (...[, group]) =>
             buildOptions.isStandalone
                 ? `window.${ftlValuesGlobalName}.url.resourcesPath + "/build/static/`
-                : `("${ftlValuesGlobalName}" in window ? "${buildOptions.urlOrigin}" : ${group}) + "static/`
+                : `("${ftlValuesGlobalName}" in window ? "${buildOptions.urlOrigin}/" : ${group}) + "static/`
         )
         //TODO: Write a test case for this
         .replace(/".chunk.css",([a-zA-Z])+=([a-zA-Z]+\.[a-zA-Z]+)\+([a-zA-Z]+),/, (...[, group1, group2, group3]) =>
             buildOptions.isStandalone
                 ? `".chunk.css",${group1} = window.${ftlValuesGlobalName}.url.resourcesPath + "/build/" + ${group3},`
-                : `".chunk.css",${group1} = ("${ftlValuesGlobalName}" in window ? "${buildOptions.urlOrigin}" : ${group2}) + ${group3},`
+                : `".chunk.css",${group1} = ("${ftlValuesGlobalName}" in window ? "${buildOptions.urlOrigin}/" : ${group2}) + ${group3},`
         );
 
     return { fixedJsCode };

src/bin/tools/cliOptions.ts

@@ -0,0 +1,15 @@
+import parseArgv from "minimist";
+
+export type CliOptions = {
+    isSilent: boolean;
+    hasExternalAssets: boolean;
+};
+
+export const getCliOptions = (processArgv: string[]): CliOptions => {
+    const argv = parseArgv(processArgv);
+
+    return {
+        isSilent: typeof argv["silent"] === "boolean" ? argv["silent"] : false,
+        hasExternalAssets: typeof argv["external-assets"] === "boolean" ? argv["external-assets"] : false
+    };
+};

src/bin/tools/downloadAndUnzip.ts

@@ -6,7 +6,13 @@ import { rm, rm_rf } from "./rm";
 import * as crypto from "crypto";
 
 /** assert url ends with .zip */
-export function downloadAndUnzip(params: { url: string; destDirPath: string; pathOfDirToExtractInArchive?: string; cacheDirPath: string }) {
+export function downloadAndUnzip(params: {
+    isSilent: boolean;
+    url: string;
+    destDirPath: string;
+    pathOfDirToExtractInArchive?: string;
+    cacheDirPath: string;
+}) {
     const { url, destDirPath, pathOfDirToExtractInArchive, cacheDirPath } = params;
 
     const extractDirPath = pathJoin(
@@ -54,7 +60,7 @@ export function downloadAndUnzip(params: { url: string; destDirPath: string; pat
 
         const zipFileBasename = pathBasename(url);
 
-        execSync(`curl -L ${url} -o ${zipFileBasename}`, { "cwd": extractDirPath });
+        execSync(`curl -L ${url} -o ${zipFileBasename} ${params.isSilent ? "-s" : ""}`, { "cwd": extractDirPath });
 
         execSync(`unzip -o ${zipFileBasename}${pathOfDirToExtractInArchive === undefined ? "" : ` "${pathOfDirToExtractInArchive}/**/*"`}`, {
             "cwd": extractDirPath

src/bin/tools/logger.ts

@@ -0,0 +1,27 @@
+type LoggerOpts = {
+    force?: boolean;
+};
+
+type Logger = {
+    log: (message: string, opts?: LoggerOpts) => void;
+    warn: (message: string) => void;
+    error: (message: string) => void;
+};
+
+export const getLogger = ({ isSilent }: { isSilent?: boolean } = {}): Logger => {
+    return {
+        log: (message, { force } = {}) => {
+            if (isSilent && !force) {
+                return;
+            }
+
+            console.log(message);
+        },
+        warn: message => {
+            console.warn(message);
+        },
+        error: message => {
+            console.error(message);
+        }
+    };
+};

src/lib/components/Error.tsx

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

src/lib/components/IdpReviewUserProfile.tsx

@@ -0,0 +1,57 @@
+import React, { useState, memo } from "react";
+import Template 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) => {
+        const { cx } = useCssAndCx();
+
+        const { msg, msgStr } = i18n;
+
+        const { url } = kcContext;
+
+        const [isFomSubmittable, setIsFomSubmittable] = useState(false);
+
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                headerNode={msg("loginIdpReviewProfileTitle")}
+                formNode={
+                    <form id="kc-idp-review-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
+                        <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
+
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
+                                <div className={cx(props.kcFormOptionsWrapperClass)} />
+                            </div>
+                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                                <input
+                                    className={cx(
+                                        props.kcButtonClass,
+                                        props.kcButtonPrimaryClass,
+                                        props.kcButtonBlockClass,
+                                        props.kcButtonLargeClass
+                                    )}
+                                    type="submit"
+                                    value={msgStr("doSubmit")}
+                                    disabled={!isFomSubmittable}
+                                />
+                            </div>
+                        </div>
+                    </form>
+                }
+            />
+        );
+    }
+);
+
+export default IdpReviewUserProfile;

src/lib/components/Info.tsx

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

src/lib/components/KcApp.tsx

@@ -20,64 +20,76 @@ const LoginPageExpired = lazy(() => import("./LoginPageExpired"));
 const LoginIdpLinkEmail = lazy(() => import("./LoginIdpLinkEmail"));
 const LoginConfigTotp = lazy(() => import("./LoginConfigTotp"));
 const LogoutConfirm = lazy(() => import("./LogoutConfirm"));
+const UpdateUserProfile = lazy(() => import("./UpdateUserProfile"));
+const IdpReviewUserProfile = lazy(() => import("./IdpReviewUserProfile"));
 
-const KcApp = memo(({ kcContext, i18n: userProvidedI18n, ...kcProps }: { kcContext: KcContextBase; i18n?: I18n } & KcProps) => {
-    const i18n = (function useClosure() {
-        const i18n = useI18n({
-            kcContext,
-            "extraMessages": {},
-            "doSkip": userProvidedI18n !== undefined
-        });
+const KcApp = memo(
+    ({
+        kcContext,
+        i18n: userProvidedI18n,
+        ...kcProps
+    }: { kcContext: KcContextBase; i18n?: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const i18n = (function useClosure() {
+            const i18n = useI18n({
+                kcContext,
+                "extraMessages": {},
+                "doSkip": userProvidedI18n !== undefined
+            });
 
-        return userProvidedI18n ?? i18n;
-    })();
+            return userProvidedI18n ?? i18n;
+        })();
 
-    if (i18n === null) {
-        return null;
+        if (i18n === null) {
+            return null;
+        }
+
+        const props = { i18n, ...kcProps };
+
+        return (
+            <Suspense>
+                {(() => {
+                    switch (kcContext.pageId) {
+                        case "login.ftl":
+                            return <Login {...{ kcContext, ...props }} />;
+                        case "register.ftl":
+                            return <Register {...{ kcContext, ...props }} />;
+                        case "register-user-profile.ftl":
+                            return <RegisterUserProfile {...{ kcContext, ...props }} />;
+                        case "info.ftl":
+                            return <Info {...{ kcContext, ...props }} />;
+                        case "error.ftl":
+                            return <Error {...{ kcContext, ...props }} />;
+                        case "login-reset-password.ftl":
+                            return <LoginResetPassword {...{ kcContext, ...props }} />;
+                        case "login-verify-email.ftl":
+                            return <LoginVerifyEmail {...{ kcContext, ...props }} />;
+                        case "terms.ftl":
+                            return <Terms {...{ kcContext, ...props }} />;
+                        case "login-otp.ftl":
+                            return <LoginOtp {...{ kcContext, ...props }} />;
+                        case "login-update-password.ftl":
+                            return <LoginUpdatePassword {...{ kcContext, ...props }} />;
+                        case "login-update-profile.ftl":
+                            return <LoginUpdateProfile {...{ kcContext, ...props }} />;
+                        case "login-idp-link-confirm.ftl":
+                            return <LoginIdpLinkConfirm {...{ kcContext, ...props }} />;
+                        case "login-idp-link-email.ftl":
+                            return <LoginIdpLinkEmail {...{ kcContext, ...props }} />;
+                        case "login-page-expired.ftl":
+                            return <LoginPageExpired {...{ kcContext, ...props }} />;
+                        case "login-config-totp.ftl":
+                            return <LoginConfigTotp {...{ kcContext, ...props }} />;
+                        case "logout-confirm.ftl":
+                            return <LogoutConfirm {...{ kcContext, ...props }} />;
+                        case "update-user-profile.ftl":
+                            return <UpdateUserProfile {...{ kcContext, ...props }} />;
+                        case "idp-review-user-profile.ftl":
+                            return <IdpReviewUserProfile {...{ kcContext, ...props }} />;
+                    }
+                })()}
+            </Suspense>
+        );
     }
-
-    const props = { i18n, ...kcProps };
-
-    return (
-        <Suspense>
-            {(() => {
-                switch (kcContext.pageId) {
-                    case "login.ftl":
-                        return <Login {...{ kcContext, ...props }} />;
-                    case "register.ftl":
-                        return <Register {...{ kcContext, ...props }} />;
-                    case "register-user-profile.ftl":
-                        return <RegisterUserProfile {...{ kcContext, ...props }} />;
-                    case "info.ftl":
-                        return <Info {...{ kcContext, ...props }} />;
-                    case "error.ftl":
-                        return <Error {...{ kcContext, ...props }} />;
-                    case "login-reset-password.ftl":
-                        return <LoginResetPassword {...{ kcContext, ...props }} />;
-                    case "login-verify-email.ftl":
-                        return <LoginVerifyEmail {...{ kcContext, ...props }} />;
-                    case "terms.ftl":
-                        return <Terms {...{ kcContext, ...props }} />;
-                    case "login-otp.ftl":
-                        return <LoginOtp {...{ kcContext, ...props }} />;
-                    case "login-update-password.ftl":
-                        return <LoginUpdatePassword {...{ kcContext, ...props }} />;
-                    case "login-update-profile.ftl":
-                        return <LoginUpdateProfile {...{ kcContext, ...props }} />;
-                    case "login-idp-link-confirm.ftl":
-                        return <LoginIdpLinkConfirm {...{ kcContext, ...props }} />;
-                    case "login-idp-link-email.ftl":
-                        return <LoginIdpLinkEmail {...{ kcContext, ...props }} />;
-                    case "login-page-expired.ftl":
-                        return <LoginPageExpired {...{ kcContext, ...props }} />;
-                    case "login-config-totp.ftl":
-                        return <LoginConfigTotp {...{ kcContext, ...props }} />;
-                    case "logout-confirm.ftl":
-                        return <LogoutConfirm {...{ kcContext, ...props }} />;
-                }
-            })()}
-        </Suspense>
-    );
-});
+);
 
 export default KcApp;

src/lib/components/Login.tsx

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

src/lib/components/LoginConfigTotp.tsx

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

src/lib/components/LoginIdpLinkConfirm.tsx

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

src/lib/components/LoginIdpLinkEmail.tsx

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

src/lib/components/LoginOtp.tsx

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

src/lib/components/LoginPageExpired.tsx

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

src/lib/components/LoginResetPassword.tsx

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

src/lib/components/LoginUpdatePassword.tsx

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

src/lib/components/LoginUpdateProfile.tsx

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

src/lib/components/LoginVerifyEmail.tsx

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

src/lib/components/LogoutConfirm.tsx

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

src/lib/components/Register.tsx

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

src/lib/components/RegisterUserProfile.tsx

@@ -1,220 +1,78 @@
-import React, { useMemo, memo, useEffect, useState, Fragment } from "react";
+import React, { useMemo, memo, useState } from "react";
 import Template from "./Template";
 import type { KcProps } from "./KcProps";
-import type { KcContextBase, Attribute } from "../getKcContext/KcContextBase";
+import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
-import type { ReactComponent } from "../tools/ReactComponent";
-import { useCallbackFactory } from "powerhooks/useCallbackFactory";
-import { useFormValidationSlice } from "../useFormValidationSlice";
 import type { I18n } from "../i18n";
+import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
-const RegisterUserProfile = memo(({ kcContext, i18n, ...props_ }: { kcContext: KcContextBase.RegisterUserProfile; i18n: I18n } & KcProps) => {
-    const { url, messagesPerField, recaptchaRequired, recaptchaSiteKey } = kcContext;
-
-    const { msg, msgStr } = i18n;
-
-    const { cx, css } = useCssAndCx();
-
-    const props = useMemo(
-        () => ({
-            ...props_,
-            "kcFormGroupClass": cx(props_.kcFormGroupClass, css({ "marginBottom": 20 }))
-        }),
-        [cx, css]
-    );
-
-    const [isFomSubmittable, setIsFomSubmittable] = useState(false);
-
-    return (
-        <Template
-            {...{ kcContext, i18n, ...props }}
-            displayMessage={messagesPerField.exists("global")}
-            displayRequiredFields={true}
-            doFetchDefaultThemeResources={true}
-            headerNode={msg("registerTitle")}
-            formNode={
-                <form id="kc-register-form" className={cx(props.kcFormClass)} action={url.registrationAction} method="post">
-                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
-                    {recaptchaRequired && (
-                        <div className="form-group">
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey} />
-                            </div>
-                        </div>
-                    )}
-                    <div className={cx(props.kcFormGroupClass)}>
-                        <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                            <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                <span>
-                                    <a href={url.loginUrl}>{msg("backToLogin")}</a>
-                                </span>
-                            </div>
-                        </div>
-
-                        <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                            <input
-                                className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
-                                type="submit"
-                                value={msgStr("doRegister")}
-                                disabled={!isFomSubmittable}
-                            />
-                        </div>
-                    </div>
-                </form>
-            }
-        />
-    );
-});
-
-type UserProfileFormFieldsProps = { kcContext: KcContextBase.RegisterUserProfile; i18n: I18n } & KcProps &
-    Partial<Record<"BeforeField" | "AfterField", ReactComponent<{ attribute: Attribute }>>> & {
-        onIsFormSubmittableValueChange: (isFormSubmittable: boolean) => void;
-    };
-
-const UserProfileFormFields = memo(({ kcContext, onIsFormSubmittableValueChange, i18n, ...props }: UserProfileFormFieldsProps) => {
-    const { cx, css } = useCssAndCx();
-
-    const { advancedMsg } = i18n;
-
-    const {
-        formValidationState: { fieldStateByAttributeName, isFormSubmittable },
-        formValidationReducer,
-        attributesWithPassword
-    } = useFormValidationSlice({
+const RegisterUserProfile = memo(
+    ({
         kcContext,
-        i18n
-    });
+        i18n,
+        doFetchDefaultThemeResources = true,
+        ...props_
+    }: { kcContext: KcContextBase.RegisterUserProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
+        const { url, messagesPerField, recaptchaRequired, recaptchaSiteKey } = kcContext;
 
-    useEffect(() => {
-        onIsFormSubmittableValueChange(isFormSubmittable);
-    }, [isFormSubmittable]);
+        const { msg, msgStr } = i18n;
 
-    const onChangeFactory = useCallbackFactory(
-        (
-            [name]: [string],
-            [
-                {
-                    target: { value }
-                }
-            ]: [React.ChangeEvent<HTMLInputElement | HTMLSelectElement>]
-        ) =>
-            formValidationReducer({
-                "action": "update value",
-                name,
-                "newValue": value
-            })
-    );
+        const { cx, css } = useCssAndCx();
 
-    const onBlurFactory = useCallbackFactory(([name]: [string]) =>
-        formValidationReducer({
-            "action": "focus lost",
-            name
-        })
-    );
+        const props = useMemo(
+            () => ({
+                ...props_,
+                "kcFormGroupClass": cx(props_.kcFormGroupClass, css({ "marginBottom": 20 }))
+            }),
+            [cx, css]
+        );
 
-    let currentGroup = "";
+        const [isFomSubmittable, setIsFomSubmittable] = useState(false);
 
-    return (
-        <>
-            {attributesWithPassword.map((attribute, i) => {
-                const { group = "", groupDisplayHeader = "", groupDisplayDescription = "" } = attribute;
-
-                const { value, displayableErrors } = fieldStateByAttributeName[attribute.name];
-
-                const formGroupClassName = cx(props.kcFormGroupClass, displayableErrors.length !== 0 && props.kcFormGroupErrorClass);
-
-                return (
-                    <Fragment key={i}>
-                        {group !== currentGroup && (currentGroup = group) !== "" && (
-                            <div className={formGroupClassName}>
-                                <div className={cx(props.kcContentWrapperClass)}>
-                                    <label id={`header-${group}`} className={cx(props.kcFormGroupHeader)}>
-                                        {advancedMsg(groupDisplayHeader) || currentGroup}
-                                    </label>
+        return (
+            <Template
+                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
+                displayMessage={messagesPerField.exists("global")}
+                displayRequiredFields={true}
+                headerNode={msg("registerTitle")}
+                formNode={
+                    <form id="kc-register-form" className={cx(props.kcFormClass)} action={url.registrationAction} method="post">
+                        <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
+                        {recaptchaRequired && (
+                            <div className="form-group">
+                                <div className={cx(props.kcInputWrapperClass)}>
+                                    <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey} />
                                 </div>
-                                {groupDisplayDescription !== "" && (
-                                    <div className={cx(props.kcLabelWrapperClass)}>
-                                        <label id={`description-${group}`} className={`${cx(props.kcLabelClass)}`}>
-                                            {advancedMsg(groupDisplayDescription)}
-                                        </label>
-                                    </div>
-                                )}
                             </div>
                         )}
-                        <div className={formGroupClassName}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor={attribute.name} className={cx(props.kcLabelClass)}>
-                                    {advancedMsg(attribute.displayName ?? "")}
-                                </label>
-                                {attribute.required && <>*</>}
-                            </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                {(() => {
-                                    const { options } = attribute.validators;
-
-                                    if (options !== undefined) {
-                                        return (
-                                            <select
-                                                id={attribute.name}
-                                                name={attribute.name}
-                                                onChange={onChangeFactory(attribute.name)}
-                                                onBlur={onBlurFactory(attribute.name)}
-                                                value={value}
-                                            >
-                                                {options.options.map(option => (
-                                                    <option key={option} value={option}>
-                                                        {option}
-                                                    </option>
-                                                ))}
-                                            </select>
-                                        );
-                                    }
-
-                                    return (
-                                        <input
-                                            type={(() => {
-                                                switch (attribute.name) {
-                                                    case "password-confirm":
-                                                    case "password":
-                                                        return "password";
-                                                    default:
-                                                        return "text";
-                                                }
-                                            })()}
-                                            id={attribute.name}
-                                            name={attribute.name}
-                                            value={value}
-                                            onChange={onChangeFactory(attribute.name)}
-                                            className={cx(props.kcInputClass)}
-                                            aria-invalid={displayableErrors.length !== 0}
-                                            disabled={attribute.readOnly}
-                                            autoComplete={attribute.autocomplete}
-                                            onBlur={onBlurFactory(attribute.name)}
-                                        />
-                                    );
-                                })()}
-                                {displayableErrors.length !== 0 && (
-                                    <span
-                                        id={`input-error-${attribute.name}`}
-                                        className={cx(
-                                            props.kcInputErrorMessageClass,
-                                            css({
-                                                "position": displayableErrors.length === 1 ? "absolute" : undefined,
-                                                "& > span": { "display": "block" }
-                                            })
-                                        )}
-                                        aria-live="polite"
-                                    >
-                                        {displayableErrors.map(({ errorMessage }) => errorMessage)}
+                        <div className={cx(props.kcFormGroupClass)}>
+                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
+                                <div className={cx(props.kcFormOptionsWrapperClass)}>
+                                    <span>
+                                        <a href={url.loginUrl}>{msg("backToLogin")}</a>
                                     </span>
-                                )}
+                                </div>
+                            </div>
+
+                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
+                                <input
+                                    className={cx(
+                                        props.kcButtonClass,
+                                        props.kcButtonPrimaryClass,
+                                        props.kcButtonBlockClass,
+                                        props.kcButtonLargeClass
+                                    )}
+                                    type="submit"
+                                    value={msgStr("doRegister")}
+                                    disabled={!isFomSubmittable}
+                                />
                             </div>
                         </div>
-                    </Fragment>
-                );
-            })}
-        </>
-    );
-});
+                    </form>
+                }
+            />
+        );
+    }
+);
 
 export default RegisterUserProfile;

src/lib/components/Terms.tsx

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

src/lib/components/UpdateUserProfile.tsx

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

src/lib/components/shared/UserProfileCommons.tsx

@@ -0,0 +1,170 @@
+import React, { memo, useEffect, Fragment } from "react";
+import type { KcProps } from "../KcProps";
+import type { Attribute } from "../../getKcContext/KcContextBase";
+import { useCssAndCx } from "../../tools/useCssAndCx";
+import type { ReactComponent } from "../../tools/ReactComponent";
+import { useCallbackFactory } from "powerhooks/useCallbackFactory";
+import { useFormValidationSlice } from "../../useFormValidationSlice";
+import type { I18n } from "../../i18n";
+import type { Param0 } from "tsafe/Param0";
+
+export type UserProfileFormFieldsProps = {
+    kcContext: Param0<typeof useFormValidationSlice>["kcContext"];
+    i18n: I18n;
+} & KcProps &
+    Partial<Record<"BeforeField" | "AfterField", ReactComponent<{ attribute: Attribute }>>> & {
+        onIsFormSubmittableValueChange: (isFormSubmittable: boolean) => void;
+    };
+
+export const UserProfileFormFields = memo(
+    ({ kcContext, onIsFormSubmittableValueChange, i18n, BeforeField, AfterField, ...props }: UserProfileFormFieldsProps) => {
+        const { cx, css } = useCssAndCx();
+
+        const { advancedMsg } = i18n;
+
+        const {
+            formValidationState: { fieldStateByAttributeName, isFormSubmittable },
+            formValidationReducer,
+            attributesWithPassword
+        } = useFormValidationSlice({
+            kcContext,
+            i18n
+        });
+
+        useEffect(() => {
+            onIsFormSubmittableValueChange(isFormSubmittable);
+        }, [isFormSubmittable]);
+
+        const onChangeFactory = useCallbackFactory(
+            (
+                [name]: [string],
+                [
+                    {
+                        target: { value }
+                    }
+                ]: [React.ChangeEvent<HTMLInputElement | HTMLSelectElement>]
+            ) =>
+                formValidationReducer({
+                    "action": "update value",
+                    name,
+                    "newValue": value
+                })
+        );
+
+        const onBlurFactory = useCallbackFactory(([name]: [string]) =>
+            formValidationReducer({
+                "action": "focus lost",
+                name
+            })
+        );
+
+        let currentGroup = "";
+
+        return (
+            <>
+                {attributesWithPassword.map((attribute, i) => {
+                    const { group = "", groupDisplayHeader = "", groupDisplayDescription = "" } = attribute;
+
+                    const { value, displayableErrors } = fieldStateByAttributeName[attribute.name];
+
+                    const formGroupClassName = cx(props.kcFormGroupClass, displayableErrors.length !== 0 && props.kcFormGroupErrorClass);
+
+                    return (
+                        <Fragment key={i}>
+                            {group !== currentGroup && (currentGroup = group) !== "" && (
+                                <div className={formGroupClassName}>
+                                    <div className={cx(props.kcContentWrapperClass)}>
+                                        <label id={`header-${group}`} className={cx(props.kcFormGroupHeader)}>
+                                            {advancedMsg(groupDisplayHeader) || currentGroup}
+                                        </label>
+                                    </div>
+                                    {groupDisplayDescription !== "" && (
+                                        <div className={cx(props.kcLabelWrapperClass)}>
+                                            <label id={`description-${group}`} className={`${cx(props.kcLabelClass)}`}>
+                                                {advancedMsg(groupDisplayDescription)}
+                                            </label>
+                                        </div>
+                                    )}
+                                </div>
+                            )}
+
+                            {BeforeField && <BeforeField attribute={attribute} />}
+
+                            <div className={formGroupClassName}>
+                                <div className={cx(props.kcLabelWrapperClass)}>
+                                    <label htmlFor={attribute.name} className={cx(props.kcLabelClass)}>
+                                        {advancedMsg(attribute.displayName ?? "")}
+                                    </label>
+                                    {attribute.required && <>*</>}
+                                </div>
+                                <div className={cx(props.kcInputWrapperClass)}>
+                                    {(() => {
+                                        const { options } = attribute.validators;
+
+                                        if (options !== undefined) {
+                                            return (
+                                                <select
+                                                    id={attribute.name}
+                                                    name={attribute.name}
+                                                    onChange={onChangeFactory(attribute.name)}
+                                                    onBlur={onBlurFactory(attribute.name)}
+                                                    value={value}
+                                                >
+                                                    {options.options.map(option => (
+                                                        <option key={option} value={option}>
+                                                            {option}
+                                                        </option>
+                                                    ))}
+                                                </select>
+                                            );
+                                        }
+
+                                        return (
+                                            <input
+                                                type={(() => {
+                                                    switch (attribute.name) {
+                                                        case "password-confirm":
+                                                        case "password":
+                                                            return "password";
+                                                        default:
+                                                            return "text";
+                                                    }
+                                                })()}
+                                                id={attribute.name}
+                                                name={attribute.name}
+                                                value={value}
+                                                onChange={onChangeFactory(attribute.name)}
+                                                className={cx(props.kcInputClass)}
+                                                aria-invalid={displayableErrors.length !== 0}
+                                                disabled={attribute.readOnly}
+                                                autoComplete={attribute.autocomplete}
+                                                onBlur={onBlurFactory(attribute.name)}
+                                            />
+                                        );
+                                    })()}
+                                    {displayableErrors.length !== 0 && (
+                                        <span
+                                            id={`input-error-${attribute.name}`}
+                                            className={cx(
+                                                props.kcInputErrorMessageClass,
+                                                css({
+                                                    "position": displayableErrors.length === 1 ? "absolute" : undefined,
+                                                    "& > span": { "display": "block" }
+                                                })
+                                            )}
+                                            aria-live="polite"
+                                        >
+                                            {displayableErrors.map(({ errorMessage }) => errorMessage)}
+                                        </span>
+                                    )}
+                                </div>
+                            </div>
+
+                            {AfterField && <AfterField attribute={attribute} />}
+                        </Fragment>
+                    );
+                })}
+            </>
+        );
+    }
+);

src/lib/getKcContext/KcContextBase.ts

@@ -25,7 +25,9 @@ export type KcContextBase =
     | KcContextBase.LoginIdpLinkEmail
     | KcContextBase.LoginPageExpired
     | KcContextBase.LoginConfigTotp
-    | KcContextBase.LogoutConfirm;
+    | KcContextBase.LogoutConfirm
+    | KcContextBase.UpdateUserProfile
+    | KcContextBase.IdpReviewUserProfile;
 
 export declare namespace KcContextBase {
     export type Common = {
@@ -270,6 +272,23 @@ export declare namespace KcContextBase {
             skipLink?: boolean;
         };
     };
+
+    export type UpdateUserProfile = Common & {
+        pageId: "update-user-profile.ftl";
+        profile: {
+            attributes: Attribute[];
+            attributesByName: Record<string, Attribute>;
+        };
+    };
+
+    export type IdpReviewUserProfile = Common & {
+        pageId: "idp-review-user-profile.ftl";
+        profile: {
+            context: "IDP_REVIEW";
+            attributes: Attribute[];
+            attributesByName: Record<string, Attribute>;
+        };
+    };
 }
 
 export type Attribute = {

src/lib/getKcContext/getKcContext.ts

@@ -47,8 +47,16 @@ export function getKcContext<KcContextExtended extends { pageId: string } = neve
                 "source": partialKcContextCustomMock
             });
 
-            if (partialKcContextCustomMock.pageId === "register-user-profile.ftl") {
-                assert(kcContextDefaultMock?.pageId === "register-user-profile.ftl");
+            if (
+                partialKcContextCustomMock.pageId === "register-user-profile.ftl" ||
+                partialKcContextCustomMock.pageId === "update-user-profile.ftl" ||
+                partialKcContextCustomMock.pageId === "idp-review-user-profile.ftl"
+            ) {
+                assert(
+                    kcContextDefaultMock?.pageId === "register-user-profile.ftl" ||
+                        kcContextDefaultMock?.pageId === "update-user-profile.ftl" ||
+                        kcContextDefaultMock?.pageId === "idp-review-user-profile.ftl"
+                );
 
                 const { attributes } = kcContextDefaultMock.profile;
 
@@ -60,8 +68,6 @@ export function getKcContext<KcContextExtended extends { pageId: string } = neve
                 ].filter(exclude(undefined));
 
                 attributes.forEach(attribute => {
-                    console.log("====>", attribute);
-
                     const partialAttribute = partialAttributes.find(({ name }) => name === attribute.name);
 
                     const augmentedAttribute: Attribute = {} as any;

src/lib/getKcContext/kcContextMocks/kcContextMocks.ts

@@ -7,6 +7,100 @@ import { pathJoin } from "../../../bin/tools/pathJoin";
 
 const PUBLIC_URL = process.env["PUBLIC_URL"] ?? "/";
 
+const attributes: Attribute[] = [
+    {
+        "validators": {
+            "username-prohibited-characters": {
+                "ignore.empty.value": true
+            },
+            "up-username-has-value": {},
+            "length": {
+                "ignore.empty.value": true,
+                "min": "3",
+                "max": "255"
+            },
+            "up-duplicate-username": {},
+            "up-username-mutation": {}
+        },
+        "displayName": "${username}",
+        "annotations": {},
+        "required": true,
+        "groupAnnotations": {},
+        "autocomplete": "username",
+        "readOnly": false,
+        "name": "username",
+        "value": "xxxx"
+    },
+    {
+        "validators": {
+            "up-email-exists-as-username": {},
+            "length": {
+                "max": "255",
+                "ignore.empty.value": true
+            },
+            "up-blank-attribute-value": {
+                "error-message": "missingEmailMessage",
+                "fail-on-null": false
+            },
+            "up-duplicate-email": {},
+            "email": {
+                "ignore.empty.value": true
+            },
+            "pattern": {
+                "ignore.empty.value": true,
+                "pattern": "gmail\\.com$"
+            }
+        },
+        "displayName": "${email}",
+        "annotations": {},
+        "required": true,
+        "groupAnnotations": {},
+        "autocomplete": "email",
+        "readOnly": false,
+        "name": "email"
+    },
+    {
+        "validators": {
+            "length": {
+                "max": "255",
+                "ignore.empty.value": true
+            },
+            "person-name-prohibited-characters": {
+                "ignore.empty.value": true
+            },
+            "up-immutable-attribute": {},
+            "up-attribute-required-by-metadata-value": {}
+        },
+        "displayName": "${firstName}",
+        "annotations": {},
+        "required": true,
+        "groupAnnotations": {},
+        "readOnly": false,
+        "name": "firstName"
+    },
+    {
+        "validators": {
+            "length": {
+                "max": "255",
+                "ignore.empty.value": true
+            },
+            "person-name-prohibited-characters": {
+                "ignore.empty.value": true
+            },
+            "up-immutable-attribute": {},
+            "up-attribute-required-by-metadata-value": {}
+        },
+        "displayName": "${lastName}",
+        "annotations": {},
+        "required": true,
+        "groupAnnotations": {},
+        "readOnly": false,
+        "name": "lastName"
+    }
+];
+
+const attributesByName = Object.fromEntries(attributes.map(attribute => [attribute.name, attribute])) as any;
+
 export const kcContextCommonMock: KcContextBase.Common = {
     "url": {
         "loginAction": "#",
@@ -200,104 +294,8 @@ export const kcContextMocks: KcContextBase[] = [
                 ...registerCommon,
                 "profile": {
                     "context": "REGISTRATION_PROFILE" as const,
-                    ...(() => {
-                        const attributes: Attribute[] = [
-                            {
-                                "validators": {
-                                    "username-prohibited-characters": {
-                                        "ignore.empty.value": true
-                                    },
-                                    "up-username-has-value": {},
-                                    "length": {
-                                        "ignore.empty.value": true,
-                                        "min": "3",
-                                        "max": "255"
-                                    },
-                                    "up-duplicate-username": {},
-                                    "up-username-mutation": {}
-                                },
-                                "displayName": "${username}",
-                                "annotations": {},
-                                "required": true,
-                                "groupAnnotations": {},
-                                "autocomplete": "username",
-                                "readOnly": false,
-                                "name": "username",
-                                "value": "xxxx"
-                            },
-                            {
-                                "validators": {
-                                    "up-email-exists-as-username": {},
-                                    "length": {
-                                        "max": "255",
-                                        "ignore.empty.value": true
-                                    },
-                                    "up-blank-attribute-value": {
-                                        "error-message": "missingEmailMessage",
-                                        "fail-on-null": false
-                                    },
-                                    "up-duplicate-email": {},
-                                    "email": {
-                                        "ignore.empty.value": true
-                                    },
-                                    "pattern": {
-                                        "ignore.empty.value": true,
-                                        "pattern": "gmail\\.com$"
-                                    }
-                                },
-                                "displayName": "${email}",
-                                "annotations": {},
-                                "required": true,
-                                "groupAnnotations": {},
-                                "autocomplete": "email",
-                                "readOnly": false,
-                                "name": "email"
-                            },
-                            {
-                                "validators": {
-                                    "length": {
-                                        "max": "255",
-                                        "ignore.empty.value": true
-                                    },
-                                    "person-name-prohibited-characters": {
-                                        "ignore.empty.value": true
-                                    },
-                                    "up-immutable-attribute": {},
-                                    "up-attribute-required-by-metadata-value": {}
-                                },
-                                "displayName": "${firstName}",
-                                "annotations": {},
-                                "required": true,
-                                "groupAnnotations": {},
-                                "readOnly": false,
-                                "name": "firstName"
-                            },
-                            {
-                                "validators": {
-                                    "length": {
-                                        "max": "255",
-                                        "ignore.empty.value": true
-                                    },
-                                    "person-name-prohibited-characters": {
-                                        "ignore.empty.value": true
-                                    },
-                                    "up-immutable-attribute": {},
-                                    "up-attribute-required-by-metadata-value": {}
-                                },
-                                "displayName": "${lastName}",
-                                "annotations": {},
-                                "required": true,
-                                "groupAnnotations": {},
-                                "readOnly": false,
-                                "name": "lastName"
-                            }
-                        ];
-
-                        return {
-                            attributes,
-                            "attributesByName": Object.fromEntries(attributes.map(attribute => [attribute.name, attribute])) as any
-                        } as any;
-                    })()
+                    attributes,
+                    attributesByName
                 }
             })
         ];
@@ -423,5 +421,22 @@ export const kcContextMocks: KcContextBase[] = [
             "baseUrl": "#"
         },
         "logoutConfirm": { "code": "123", skipLink: false }
+    }),
+    id<KcContextBase.UpdateUserProfile>({
+        ...kcContextCommonMock,
+        "pageId": "update-user-profile.ftl",
+        "profile": {
+            attributes,
+            attributesByName
+        }
+    }),
+    id<KcContextBase.IdpReviewUserProfile>({
+        ...kcContextCommonMock,
+        "pageId": "idp-review-user-profile.ftl",
+        "profile": {
+            context: "IDP_REVIEW",
+            attributes,
+            attributesByName
+        }
     })
 ];

src/lib/i18n/index.tsx

@@ -1,10 +1,10 @@
 import "minimal-polyfills/Object.fromEntries";
 //NOTE for later: https://github.com/remarkjs/react-markdown/blob/236182ecf30bd89c1e5a7652acaf8d0bf81e6170/src/renderers.js#L7-L35
 import React, { useEffect, useState, useRef } from "react";
-import ReactMarkdown from "react-markdown";
 import type baseMessages from "./generated_messages/18.0.1/login/en";
 import { assert } from "tsafe/assert";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
+import { Markdown } from "../tools/Markdown";
 
 export const fallbackLanguageTag = "en";
 
@@ -83,8 +83,6 @@ export function __unsafe_useI18n<ExtraMessageKey extends string = never>(params:
             return;
         }
 
-        let isMounted = true;
-
         refHasStartedFetching.current = true;
 
         (async () => {
@@ -144,10 +142,6 @@ export function __unsafe_useI18n<ExtraMessageKey extends string = never>(params:
                 })()
             ]).then(modules => modules.map(module => module.default));
 
-            if (!isMounted) {
-                return;
-            }
-
             setI18n({
                 ...createI18nTranslationFunctions({
                     "fallbackMessages": {
@@ -180,10 +174,6 @@ export function __unsafe_useI18n<ExtraMessageKey extends string = never>(params:
                 )
             });
         })();
-
-        return () => {
-            isMounted = false;
-        };
     }, []);
 
     return i18n ?? null;
@@ -244,9 +234,9 @@ function createI18nTranslationFunctions<MessageKey extends string>(params: {
         })();
 
         return doRenderMarkdown ? (
-            <ReactMarkdown allowDangerousHtml renderers={key === "termsText" ? undefined : { "paragraph": "span" }}>
+            <Markdown allowDangerousHtml renderers={{ "paragraph": "span" }}>
                 {messageWithArgsInjectedIfAny}
-            </ReactMarkdown>
+            </Markdown>
         ) : (
             messageWithArgsInjectedIfAny
         );

src/lib/tools/Markdown.ts

@@ -0,0 +1,3 @@
+import Markdown from "react-markdown";
+
+export { Markdown };

src/lib/useFormValidationSlice.tsx

@@ -304,13 +304,17 @@ export function useGetErrors(params: {
     return { getErrors };
 }
 
+/**
+ * NOTE: The attributesWithPassword returned is actually augmented with
+ * artificial password related attributes only if kcContext.passwordRequired === true
+ */
 export function useFormValidationSlice(params: {
     kcContext: {
         messagesPerField: Pick<KcContextBase.Common["messagesPerField"], "existsError" | "get">;
         profile: {
             attributes: Attribute[];
         };
-        passwordRequired: boolean;
+        passwordRequired?: boolean;
         realm: { registrationEmailAsUsername: boolean };
     };
     /** NOTE: Try to avoid passing a new ref every render for better performances. */

src/test/bin/generateKeycloakThemeResources.ts

@@ -14,6 +14,7 @@ generateKeycloakThemeResources({
         "extraPages": ["my-custom-page.ftl"],
         "extraThemeProperties": ["env=test"],
         "isStandalone": true,
-        "urlPathname": "/keycloakify-demo-app/"
+        "urlPathname": "/keycloakify-demo-app/",
+        "isSilent": false
     }
 });

src/test/bin/replaceImportFromStatic.ts

@@ -103,13 +103,13 @@ import { assetIsSameCode } from "../tools/assertIsSameCode";
 
         const fixedJsCodeExpected = `
             function f() {
-                return ("kcContext" in window ? "https://demo-app.keycloakify.dev" : a.p) + "static/js/" + ({}[e] || e) + "." + {
+                return ("kcContext" in window ? "https://demo-app.keycloakify.dev/" : a.p) + "static/js/" + ({}[e] || e) + "." + {
                     3: "0664cdc0"
                 }[e] + ".chunk.js"
             }
 
             function sameAsF() {
-                return ("kcContext" in window ? "https://demo-app.keycloakify.dev" : a.p) + "static/js/" + ({}[e] || e) + "." + {
+                return ("kcContext" in window ? "https://demo-app.keycloakify.dev/" : a.p) + "static/js/" + ({}[e] || e) + "." + {
                     3: "0664cdc0"
                 }[e] + ".chunk.js"
             }
@@ -119,7 +119,7 @@ import { assetIsSameCode } from "../tools/assertIsSameCode";
                 if( pd === undefined || pd.configurable ){
                     var p= "";
                     Object.defineProperty(__webpack_require__, "p", {
-                        get: function() { return "kcContext" in window ? "https://demo-app.keycloakify.dev" : p; },
+                        get: function() { return "kcContext" in window ? "https://demo-app.keycloakify.dev/" : p; },
                         set: function (value){ p = value; }
                     });
                 }
@@ -137,7 +137,7 @@ import { assetIsSameCode } from "../tools/assertIsSameCode";
                 if( pd === undefined || pd.configurable ){
                     var p= "";
                     Object.defineProperty(t, "p", {
-                        get: function() { return "kcContext" in window ? "https://demo-app.keycloakify.dev" : p; },
+                        get: function() { return "kcContext" in window ? "https://demo-app.keycloakify.dev/" : p; },
                         set: function (value){ p = value; }
                     });
                 }

src/test/bin/setupSampleReactProject.ts

@@ -8,6 +8,7 @@ export function setupSampleReactProject() {
     downloadAndUnzip({
         "url": "https://github.com/InseeFrLab/keycloakify/releases/download/v0.0.1/sample_build_dir_and_package_json.zip",
         "destDirPath": sampleReactProjectDirPath,
-        "cacheDirPath": pathJoin(sampleReactProjectDirPath, "build_keycloak", ".cache")
+        "cacheDirPath": pathJoin(sampleReactProjectDirPath, "build_keycloak", ".cache"),
+        "isSilent": false
     });
 }

yarn.lock

@@ -265,6 +265,11 @@
   resolved "https://registry.yarnpkg.com/@types/memoizee/-/memoizee-0.4.8.tgz#04adc0c266a0f5d72db0556fdda2ba17dad9b519"
   integrity sha512-qDpXKGgwKywnQt/64fH1O0LiPA++QGIYeykEUiZ51HymKVRLnUSGcRuF60IfpPeeXiuRwiR/W4y7S5VzbrgLCA==
 
+"@types/minimist@^1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+
 "@types/node@^17.0.25":
   version "17.0.45"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
@@ -743,14 +748,14 @@ event-emitter@^0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
-evt@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/evt/-/evt-2.4.0.tgz#5052d3a685bba8f7e7be699b358c1781bd4037bf"
-  integrity sha512-1V8FnExwqzX2fufT793mHfCnQay078kRdAEDHzJz863pgJK9aeDiWXZFs5aKmzJfIgi+svevtApVnleZXz4Jeg==
+evt@^2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/evt/-/evt-2.4.4.tgz#37d6e28ccb5b1bc91162fc3d5bcfbeb1ef3191cf"
+  integrity sha512-w/ZYdPCRdSfslOhcQHq7DuYoaU04YZKkFPyBwF8pYmOkRizivpbI0jZ8ffY/jITzbLo7RZ0wxN2dqyi62kyGwg==
   dependencies:
     minimal-polyfills "^2.2.2"
     run-exclusive "^2.2.16"
-    tsafe "^1.0.1"
+    tsafe "^1.1.1"
 
 execa@^5.1.1:
   version "5.1.1"
@@ -1188,6 +1193,11 @@ minimatch@^3.0.3, minimatch@^3.1.1:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+
 mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
@@ -1375,15 +1385,15 @@ please-upgrade-node@^3.2.0:
   dependencies:
     semver-compare "^1.0.0"
 
-powerhooks@^0.20.15:
-  version "0.20.15"
-  resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-0.20.15.tgz#e5093a11f3ed1badbc09944acf5a3fb15ac3f1d7"
-  integrity sha512-28xNjPTtjPPP8vyi9SWXfn0U9hjxm/UzuarD2uofIXa/CPWmkCeTtikyLoR6yuiE4pOfvdDXVfU5im40GuzJaQ==
+powerhooks@^0.20.20:
+  version "0.20.20"
+  resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-0.20.20.tgz#f9b2549710f5166f63d80e07c46c16d6da4c6f78"
+  integrity sha512-98Ymz0bjo5Ds9u273wYz1tdJ51sB1jcyjqGa08mRY5dKumewydA/+71zrFelfgkOLRRhVZ+mWynG6DZ7zOVjrQ==
   dependencies:
-    evt "^2.4.0"
+    evt "^2.4.4"
     memoizee "^0.4.15"
     resize-observer-polyfill "^1.5.1"
-    tsafe "^1.0.1"
+    tsafe "^1.1.1"
 
 prettier@^2.3.0:
   version "2.7.1"
@@ -1723,20 +1733,20 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-tsafe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.0.1.tgz#c8c4eb2d75d1478418a4941307c5dd667fd76d23"
-  integrity sha512-FgJ1a4rE7YbmW5QIzpsfFl4tsAp0x74FH2bVE6qODb2U8jSrwTr5/ckIazeylme5zXndVbtgKm4BZdqmoGhiPw==
+tsafe@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.1.1.tgz#8d6998c726f8c63c518e1d1e283bbcd282a2b9a9"
+  integrity sha512-Ogblm3uh0dVupcCcC4IT641rnSQ7CW9IO0q8yIncG8OBe4DDXEqGtUE8LWf7+0MK1qZGeWPWEqSxlLzY2xzREA==
 
 tslib@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
-tss-react@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-4.1.1.tgz#207220417e4b2f8eb26d8280ab9cdeb385063069"
-  integrity sha512-K1U2s/GGw+XycUjJGztJsLUhwm8KJWz5afL5WZU3SwMeQsA+gbETM6bSxVk2/DXBdw9uYLL9jkSYPAXh0tfYBw==
+tss-react@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-4.2.0.tgz#6738d07177a2782553ee25a758aeafa20378ca91"
+  integrity sha512-f0ov6IG8voaJpQ2j31leaOBIwZ1eRz2LOmWhdrMm4ERLTuyQm1Lw8VlVrqcqrpa+fP3UuFrwkLnWUARKZp20lg==
   dependencies:
     "@emotion/cache" "*"
     "@emotion/serialize" "*"