Bump version

.github/workflows/ci.yaml

@@ -74,6 +74,7 @@ jobs:
       id: step1
       with: 
         action_name: is_package_json_version_upgraded
+        branch: ${{ github.head_ref || github.ref }}
 
   create_github_release:
     runs-on: ubuntu-latest

README.md

@@ -45,14 +45,6 @@
 > when using React; it's a well-regarded solution that many
 > developers appreciate.
 
-> 📣 🛑 Account themes generated by Keycloakify are currently not compatible with Keycloak 22.  
-> We are working on a solution. [More info](https://github.com/keycloakify/keycloakify/issues/389#issuecomment-1661591906).  
-> Note that login and email themes are not affected.
-
-Keycloakify is fully compatible with Keycloak, starting from version 11 and is anticipated to maintain compatibility with all future versions.  
-You can update your Keycloak, your Keycloakify generated theme won't break.  
-To understand the basis of my confidence in this, you can [visit this discussion thread where I've explained in detail](https://github.com/keycloakify/keycloakify/discussions/346#discussioncomment-5889791).
-
 ## Sponsor 👼
 
 We are exclusively sponsored by [Cloud IAM](https://cloud-iam.com/?mtm_campaign=keycloakify-deal&mtm_source=keycloakify-github), a French company offering Keycloak as a service.  
@@ -125,23 +117,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 
 # Changelog highlights
 
-## 7.15
-
--   The i18n messages you defines in your theme are now also maid available to Keycloak.
-    In practice this mean that you can now customize the `kcContext.message.summary` that
-    display a general alert and the values returned by `kcContext.messagesPerField.get()` that
-    are used to display specific error on some field of the form.  
-    [See video](https://youtu.be/D6tZcemReTI)
-
-## 7.14
-
--   Deprecate the `extraPages` build option. Keycloakify is now able to analyze your code to detect extra pages.
-
-## 7.13
-
--   Deprecate `customUserAttribute`, Keycloakify now analyze your code to predict field name usage. [See doc](https://docs.keycloakify.dev/build-options#customuserattributes).  
-    It's now mandatory to [adopt the new directory structure](https://docs.keycloakify.dev/migration-guides/v6-greater-than-v7).
-
 ## 7.12
 
 -   You can now pack multiple themes variant in a single `.jar` bundle. In vanilla Keycloak themes you have the ability to extend a base theme.

keycloakify-json-schema.json

@@ -30,6 +30,18 @@
                                 "type": "string"
                             }
                         },
+                        "extraLoginPages": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "extraAccountPages": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
                         "extraThemeProperties": {
                             "type": "array",
                             "items": {
@@ -58,6 +70,12 @@
                         "keycloakifyBuildDirPath": {
                             "type": "string"
                         },
+                        "customUserAttributes": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
                         "themeName": {
                             "type": "string"
                         }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "7.16.0-rc.1",
+    "version": "7.12.5",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",
@@ -10,10 +10,11 @@
     "types": "dist/index.d.ts",
     "scripts": {
         "prepare": "yarn generate-i18n-messages",
-        "build": "rimraf dist/ && tsc -p src/bin && tsc -p src && tsc-alias -p src/tsconfig.json && yarn grant-exec-perms && yarn copy-files dist/ && cp -r src dist/",
+        "build": "rimraf dist/ && tsc -p src/bin && tsc -p src && tsc-alias -p src/tsconfig.json && yarn grant-exec-perms && yarn copy-files dist/",
+        "watch-in-starter": "yarn build && yarn link-in-starter && (concurrently \"tsc -p src -w\" \"tsc-alias -p src/tsconfig.json\" \"tsc -p src/bin -w\")",
         "generate:json-schema": "ts-node scripts/generate-json-schema.ts",
         "grant-exec-perms": "node dist/bin/tools/grant-exec-perms.js",
-        "copy-files": "copyfiles -u 1 src/**/*.ftl src/**/*.java",
+        "copy-files": "copyfiles -u 1 src/**/*.ftl",
         "test": "yarn test:types && vitest run",
         "test:keycloakify-starter": "ts-node scripts/test-keycloakify-starter",
         "test:types": "tsc -p test/tsconfig.json --noEmit",
@@ -23,7 +24,6 @@
         "generate-i18n-messages": "ts-node --skipProject scripts/generate-i18n-messages.ts",
         "link-in-app": "ts-node --skipProject scripts/link-in-app.ts",
         "link-in-starter": "yarn link-in-app keycloakify-starter",
-        "watch-in-starter": "yarn build && yarn link-in-starter && (concurrently \"tsc -p src -w\" \"tsc-alias -p src/tsconfig.json\" \"tsc -p src/bin -w\")",
         "copy-keycloak-resources-to-storybook-static": "PUBLIC_DIR_PATH=.storybook/static node dist/bin/copy-keycloak-resources-to-public.js",
         "storybook": "yarn build && yarn copy-keycloak-resources-to-storybook-static && start-storybook -p 6006",
         "build-storybook": "yarn build && yarn copy-keycloak-resources-to-storybook-static && build-storybook"
@@ -79,14 +79,12 @@
         "@storybook/manager-webpack5": "^6.5.13",
         "@storybook/react": "^6.5.13",
         "@storybook/testing-library": "^0.0.13",
-        "@types/babel__generator": "^7.6.4",
         "@types/make-fetch-happen": "^10.0.1",
         "@types/minimist": "^1.2.2",
         "@types/node": "^18.15.3",
         "@types/react": "^18.0.35",
         "@types/react-dom": "^18.0.11",
         "@types/yauzl": "^2.10.0",
-        "@types/yazl": "^2.4.2",
         "concurrently": "^8.0.1",
         "copyfiles": "^2.4.1",
         "eslint-plugin-storybook": "^0.6.7",
@@ -108,10 +106,8 @@
         "zod-to-json-schema": "^3.20.4"
     },
     "dependencies": {
-        "@babel/generator": "^7.22.9",
-        "@babel/parser": "^7.22.7",
-        "@babel/types": "^7.22.5",
         "@octokit/rest": "^18.12.0",
+        "@types/yazl": "^2.4.2",
         "cheerio": "^1.0.0-rc.5",
         "cli-select": "^1.1.2",
         "evt": "^2.4.18",
@@ -120,7 +116,6 @@
         "minimist": "^1.2.6",
         "path-browserify": "^1.0.1",
         "react-markdown": "^5.0.3",
-        "recast": "^0.23.3",
         "rfc4648": "^1.5.2",
         "tsafe": "^1.6.0",
         "yauzl": "^2.10.0",

scripts/generate-i18n-messages.ts

@@ -37,10 +37,7 @@ async function main() {
         const baseThemeDirPath = pathJoin(tmpDirPath, "base");
         const re = new RegExp(`^([^\\${pathSep}]+)\\${pathSep}messages\\${pathSep}messages_([^.]+).properties$`);
 
-        crawl({
-            "dirPath": baseThemeDirPath,
-            "returnedPathsType": "relative to dirPath"
-        }).forEach(filePath => {
+        crawl(baseThemeDirPath).forEach(filePath => {
             const match = filePath.match(re);
 
             if (match === null) {

src/account/index.ts

@@ -4,7 +4,6 @@ export default Fallback;
 
 export { getKcContext } from "keycloakify/account/kcContext/getKcContext";
 export { createGetKcContext } from "keycloakify/account/kcContext/createGetKcContext";
-export type { AccountThemePageId as PageId } from "keycloakify/bin/keycloakify/generateFtl";
 export { createUseI18n } from "keycloakify/account/i18n/i18n";
 
 export type { PageProps } from "keycloakify/account/pages/PageProps";

src/account/kcContext/KcContext.ts

@@ -52,34 +52,9 @@ export declare namespace KcContext {
             name: string; // Client id
         };
         messagesPerField: {
-            /**
-             * Return text if message for given field exists. Useful eg. to add css styles for fields with message.
-             *
-             * @param fieldName to check for
-             * @param text to return
-             * @return text if message exists for given field, else undefined
-             */
-            printIfExists: <T extends string>(fieldName: string, text: T) => T | undefined;
-            /**
-             * Check if exists error message for given fields
-             *
-             * @param fields
-             * @return boolean
-             */
+            printIfExists: <T>(fieldName: string, x: T) => T | undefined;
             existsError: (fieldName: string) => boolean;
-            /**
-             * Get message for given field.
-             *
-             * @param fieldName
-             * @return message text or empty string
-             */
             get: (fieldName: string) => string;
-            /**
-             * Check if message for given field exists
-             *
-             * @param field
-             * @return boolean
-             */
             exists: (fieldName: string) => boolean;
         };
         account: {

src/account/kcContext/kcContextMocks.ts

@@ -4,7 +4,7 @@ import { pathJoin } from "keycloakify/bin/tools/pathJoin";
 import { id } from "tsafe/id";
 import type { KcContext } from "./KcContext";
 
-const PUBLIC_URL = (typeof process !== "object" ? undefined : process.env?.["PUBLIC_URL"]) || "/";
+const PUBLIC_URL = process.env["PUBLIC_URL"] ?? "/";
 
 export const kcContextCommonMock: KcContext.Common = {
     "keycloakifyVersion": "0.0.0",

src/bin/eject-keycloak-page.ts

@@ -51,6 +51,10 @@ import { getThemeSrcDirPath } from "./getSrcDirPath";
 
     const { themeSrcDirPath } = getThemeSrcDirPath({ "projectDirPath": process.cwd() });
 
+    if (themeSrcDirPath === undefined) {
+        throw new Error("Couldn't locate your theme sources");
+    }
+
     const targetFilePath = pathJoin(themeSrcDirPath, themeType, "pages", pageBasename);
 
     if (existsSync(targetFilePath)) {

src/bin/getSrcDirPath.ts

@@ -2,17 +2,15 @@ import * as fs from "fs";
 import { exclude } from "tsafe";
 import { crawl } from "./tools/crawl";
 import { join as pathJoin } from "path";
-import { themeTypes } from "./keycloakify/generateFtl";
 
 const themeSrcDirBasename = "keycloak-theme";
 
-/** Can't catch error, if the directory isn't found, this function will just exit the process with an error message. */
 export function getThemeSrcDirPath(params: { projectDirPath: string }) {
     const { projectDirPath } = params;
 
     const srcDirPath = pathJoin(projectDirPath, "src");
 
-    const themeSrcDirPath: string | undefined = crawl({ "dirPath": srcDirPath, "returnedPathsType": "relative to dirPath" })
+    const themeSrcDirPath: string | undefined = crawl(srcDirPath)
         .map(fileRelativePath => {
             const split = fileRelativePath.split(themeSrcDirBasename);
 
@@ -24,24 +22,22 @@ export function getThemeSrcDirPath(params: { projectDirPath: string }) {
         })
         .filter(exclude(undefined))[0];
 
-    if (themeSrcDirPath !== undefined) {
-        return { themeSrcDirPath };
-    }
-
-    for (const themeType of [...themeTypes, "email"]) {
-        if (!fs.existsSync(pathJoin(srcDirPath, themeType))) {
-            continue;
+    if (themeSrcDirPath === undefined) {
+        if (fs.existsSync(pathJoin(srcDirPath, "login")) || fs.existsSync(pathJoin(srcDirPath, "account"))) {
+            return { "themeSrcDirPath": srcDirPath };
         }
-        return { "themeSrcDirPath": srcDirPath };
+        return { "themeSrcDirPath": undefined };
     }
 
-    console.error(
-        [
-            "Can't locate your theme source directory. It should be either: ",
-            "src/ or src/keycloak-theme.",
-            "Example in the starter: https://github.com/keycloakify/keycloakify-starter/tree/main/src/keycloak-theme"
-        ].join("\n")
-    );
-
-    process.exit(-1);
+    return { themeSrcDirPath };
+}
+
+export function getEmailThemeSrcDirPath(params: { projectDirPath: string }) {
+    const { projectDirPath } = params;
+
+    const { themeSrcDirPath } = getThemeSrcDirPath({ projectDirPath });
+
+    const emailThemeSrcDirPath = themeSrcDirPath === undefined ? undefined : pathJoin(themeSrcDirPath, "email");
+
+    return { emailThemeSrcDirPath };
 }

src/bin/initialize-email-theme.ts

@@ -7,7 +7,7 @@ import { promptKeycloakVersion } from "./promptKeycloakVersion";
 import { readBuildOptions } from "./keycloakify/BuildOptions";
 import * as fs from "fs";
 import { getLogger } from "./tools/logger";
-import { getThemeSrcDirPath } from "./getSrcDirPath";
+import { getEmailThemeSrcDirPath } from "./getSrcDirPath";
 
 export async function main() {
     const { isSilent } = readBuildOptions({
@@ -17,11 +17,15 @@ export async function main() {
 
     const logger = getLogger({ isSilent });
 
-    const { themeSrcDirPath } = getThemeSrcDirPath({
+    const { emailThemeSrcDirPath } = getEmailThemeSrcDirPath({
         "projectDirPath": process.cwd()
     });
 
-    const emailThemeSrcDirPath = pathJoin(themeSrcDirPath, "email");
+    if (emailThemeSrcDirPath === undefined) {
+        logger.warn("Couldn't locate your theme source directory");
+
+        process.exit(-1);
+    }
 
     if (fs.existsSync(emailThemeSrcDirPath)) {
         logger.warn(`There is already a ${pathRelative(process.cwd(), emailThemeSrcDirPath)} directory in your project. Aborting.`);

src/bin/keycloakify/BuildOptions.ts

@@ -17,7 +17,9 @@ export namespace BuildOptions {
         themeVersion: string;
         themeName: string;
         extraThemeNames: string[];
-        extraThemeProperties: string[] | undefined;
+        extraLoginPages: string[] | undefined;
+        extraAccountPages: string[] | undefined;
+        extraThemeProperties?: string[];
         groupId: string;
         artifactId: string;
         bundler: Bundler;
@@ -26,6 +28,7 @@ export namespace BuildOptions {
         reactAppBuildDirPath: string;
         /** Directory that keycloakify outputs to. Defaults to {cwd}/build_keycloak */
         keycloakifyBuildDirPath: string;
+        customUserAttributes: string[];
     };
 
     export type Standalone = Common & {
@@ -106,7 +109,17 @@ export function readBuildOptions(params: { projectDirPath: string; processArgv:
     const common: BuildOptions.Common = (() => {
         const { name, keycloakify = {}, version, homepage } = parsedPackageJson;
 
-        const { extraThemeProperties, groupId, artifactId, bundler, keycloakVersionDefaultAssets, extraThemeNames = [] } = keycloakify ?? {};
+        const {
+            extraPages,
+            extraLoginPages,
+            extraAccountPages,
+            extraThemeProperties,
+            groupId,
+            artifactId,
+            bundler,
+            keycloakVersionDefaultAssets,
+            extraThemeNames = []
+        } = keycloakify ?? {};
 
         const themeName =
             keycloakify.themeName ??
@@ -148,6 +161,8 @@ export function readBuildOptions(params: { projectDirPath: string; processArgv:
                 );
             })(),
             "themeVersion": process.env.KEYCLOAKIFY_THEME_VERSION ?? process.env.KEYCLOAKIFY_VERSION ?? version ?? "0.0.0",
+            "extraLoginPages": [...(extraPages ?? []), ...(extraLoginPages ?? [])],
+            extraAccountPages,
             extraThemeProperties,
             "isSilent": isSilentCliParamProvided,
             "keycloakVersionDefaultAssets": keycloakVersionDefaultAssets ?? "11.0.3",
@@ -184,7 +199,8 @@ export function readBuildOptions(params: { projectDirPath: string; processArgv:
                 }
 
                 return keycloakifyBuildDirPath;
-            })()
+            })(),
+            "customUserAttributes": keycloakify.customUserAttributes ?? []
         };
     })();
 

src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl

@@ -8,7 +8,13 @@
     out["advancedMsg"]= function(){ throw new Error("use import { useKcMessage } from 'keycloakify'"); };
 
     out["messagesPerField"]= {
-        <#assign fieldNames = [ FIELD_NAMES_eKsIY4ZsZ4xeM ]>
+        <#assign fieldNames = [
+            "global", "userLabel", "username", "email", "firstName", "lastName", "password", "password-confirm",
+            "totp", "totpSecret", "SAMLRequest", "SAMLResponse", "relayState", "device_user_code", "code", 
+            "password-new", "rememberMe", "login", "authenticationExecution", "cancel-aia", "clientDataJSON", 
+            "authenticatorData", "signature", "credentialId", "userHandle", "error", "authn_use_chk", "authenticationExecution", 
+            "isSetRetry", "try-again", "attestationObject", "publicKeyCredentialId", "authenticatorLabel"CUSTOM_USER_ATTRIBUTES_eKsIY4ZsZ4xeM
+        ]>
     
         <#attempt>
             <#if profile?? && profile.attributes?? && profile.attributes?is_enumerable>
@@ -22,374 +28,85 @@
         <#recover>
         </#attempt>
     
-        "printIfExists": function (fieldName, text) {
-
-            <#if !messagesPerField?? || !(messagesPerField?is_hash)>   
-                throw new Error("You're not supposed to use messagesPerField.printIfExists in this page");
+        "printIfExists": function (fieldName, x) {
+            <#if !messagesPerField?? >
+                return undefined;
             <#else>
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
-
-                        <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
-                        <#if !messagesPerField.existsError??>
-
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistMessageForUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
-                                <#recover>
-                                    <#assign doExistMessageForUsernameOrPassword = true>
-                                </#attempt>
-
-                                <#if !doExistMessageForUsernameOrPassword>
-                                    <#attempt>
-                                        <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
-                                    <#recover>
-                                        <#assign doExistMessageForUsernameOrPassword = true>
-                                    </#attempt>
-                                </#if>
-
-                                return <#if doExistMessageForUsernameOrPassword>text<#else>undefined</#if>;
-
+                        <#attempt>
+                            <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
+                                return <#if messagesPerField.existsError('username', 'password')>x<#else>undefined</#if>;
                             <#else>
-
-                                <#assign doExistMessageForField = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
-                                <#recover>
-                                    <#assign doExistMessageForField = true>
-                                </#attempt>
-
-                                return <#if doExistMessageForField>text<#else>undefined</#if>;
-
+                                return <#if messagesPerField.existsError('${fieldName}')>x<#else>undefined</#if>;
                             </#if>
-
-                        <#else>
-
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistErrorOnUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
-                                <#recover>
-                                    <#assign doExistErrorOnUsernameOrPassword = true>
-                                </#attempt>
-
-                                <#if doExistErrorOnUsernameOrPassword>
-                                    return text;
-                                <#else>
-
-                                    <#assign doExistMessageForField = "">
-
-                                    <#attempt>
-                                        <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
-                                    <#recover>
-                                        <#assign doExistMessageForField = true>
-                                    </#attempt>
-
-                                    return <#if doExistMessageForField>text<#else>undefined</#if>;
-
-                                </#if>
-
-                            <#else>
-
-                                <#assign doExistMessageForField = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
-                                <#recover>
-                                    <#assign doExistMessageForField = true>
-                                </#attempt>
-
-                                return <#if doExistMessageForField>text<#else>undefined</#if>;
-
-                            </#if>
-
-                        </#if>
-
+                        <#recover>
+                        </#attempt>
                     }
                 </#list>
-
-                throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
+                throw new Error("There is no " + fieldName + " field");
             </#if>
-
         },
         "existsError": function (fieldName) {
-
-            <#if !messagesPerField?? || !(messagesPerField?is_hash)>   
-                throw new Error("You're not supposed to use messagesPerField.printIfExists in this page");
+            <#if !messagesPerField?? >
+                return false;
             <#else>
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
-
-                        <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
-                        <#if !messagesPerField.existsError??>
-
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistMessageForUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
-                                <#recover>
-                                    <#assign doExistMessageForUsernameOrPassword = true>
-                                </#attempt>
-
-                                <#if !doExistMessageForUsernameOrPassword>
-                                    <#attempt>
-                                        <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
-                                    <#recover>
-                                        <#assign doExistMessageForUsernameOrPassword = true>
-                                    </#attempt>
-                                </#if>
-
-                                return <#if doExistMessageForUsernameOrPassword>true<#else>false</#if>;
-
+                        <#attempt>
+                            <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
+                                return <#if messagesPerField.existsError('username', 'password')>true<#else>false</#if>;
                             <#else>
-
-                                <#assign doExistMessageForField = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
-                                <#recover>
-                                    <#assign doExistMessageForField = true>
-                                </#attempt>
-
-                                return <#if doExistMessageForField>true<#else>false</#if>;
-
+                                return <#if messagesPerField.existsError('${fieldName}')>true<#else>false</#if>;
                             </#if>
-
-                        <#else>
-
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistErrorOnUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
-                                <#recover>
-                                    <#assign doExistErrorOnUsernameOrPassword = true>
-                                </#attempt>
-
-                                return <#if doExistErrorOnUsernameOrPassword>true<#else>false</#if>;
-
-                            <#else>
-
-                                <#assign doExistErrorMessageForField = "">
-
-                                <#attempt>
-                                    <#assign doExistErrorMessageForField = messagesPerField.existsError('${fieldName}')>
-                                <#recover>
-                                    <#assign doExistErrorMessageForField = true>
-                                </#attempt>
-
-                                return <#if doExistErrorMessageForField>true<#else>false</#if>;
-
-                            </#if>
-
-                        </#if>
-
+                        <#recover>
+                        </#attempt>
                     }
                 </#list>
-
-                throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
-
+                throw new Error("There is no " + fieldName + " field");
             </#if>
-
         },
         "get": function (fieldName) {
-
-
-            <#if !messagesPerField?? || !(messagesPerField?is_hash)>   
-                throw new Error("You're not supposed to use messagesPerField.get in this page");
+            <#if !messagesPerField?? >
+                return '';
             <#else>
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
-
-                        <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
-                        <#if !messagesPerField.existsError??>
-
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistMessageForUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
-                                <#recover>
-                                    <#assign doExistMessageForUsernameOrPassword = true>
-                                </#attempt>
-
-                                <#if !doExistMessageForUsernameOrPassword>
-                                    <#attempt>
-                                        <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
-                                    <#recover>
-                                        <#assign doExistMessageForUsernameOrPassword = true>
-                                    </#attempt>
+                        <#attempt>
+                            <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
+                                <#if messagesPerField.existsError('username', 'password')>
+                                    return 'Invalid username or password.';
                                 </#if>
-
-                                <#if !doExistMessageForUsernameOrPassword>
-                                    return "";
-                                <#else>
-                                    <#attempt>
-                                        return "${kcSanitize(msg('invalidUserMessage'))?no_esc}";
-                                    <#recover>
-                                        return "Invalid username or password.";
-                                    </#attempt>
-                                </#if>
-
                             <#else>
-
-                                <#attempt>
+                                <#if messagesPerField.existsError('${fieldName}')>
                                     return "${messagesPerField.get('${fieldName}')?no_esc}";
-                                <#recover>
-                                    return "invalid field";
-                                </#attempt>
-
-                            </#if>
-
-                        <#else>
-
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistErrorOnUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
-                                <#recover>
-                                    <#assign doExistErrorOnUsernameOrPassword = true>
-                                </#attempt>
-
-                                <#if doExistErrorOnUsernameOrPassword>
-
-                                    <#attempt>
-                                        return "${kcSanitize(msg('invalidUserMessage'))?no_esc}";
-                                    <#recover>
-                                        return "Invalid username or password.";
-                                    </#attempt>
-
-                                <#else>
-
-                                    <#attempt>
-                                        return "${messagesPerField.get('${fieldName}')?no_esc}";
-                                    <#recover>
-                                        return "";
-                                    </#attempt>
-
                                 </#if>
-
-                            <#else>
-
-                                <#attempt>
-                                    return "${messagesPerField.get('${fieldName}')?no_esc}";
-                                <#recover>
-                                    return "invalid field";
-                                </#attempt>
-
                             </#if>
-
-                        </#if>
-
+                        <#recover>
+                        </#attempt>
                     }
                 </#list>
-
-                throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
-
+                throw new Error("There is no " + fieldName + " field");
             </#if>
-
         },
         "exists": function (fieldName) {
-
-            <#if !messagesPerField?? || !(messagesPerField?is_hash)>   
-                throw new Error("You're not supposed to use messagesPerField.exists in this page");
+            <#if !messagesPerField?? >
+                return false;
             <#else>
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
-
-                        <#-- https://github.com/keycloakify/keycloakify/pull/359 Compat with Keycloak prior v12 -->
-                        <#if !messagesPerField.existsError??>
-
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistMessageForUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('username')>
-                                <#recover>
-                                    <#assign doExistMessageForUsernameOrPassword = true>
-                                </#attempt>
-
-                                <#if !doExistMessageForUsernameOrPassword>
-                                    <#attempt>
-                                        <#assign doExistMessageForUsernameOrPassword = messagesPerField.exists('password')>
-                                    <#recover>
-                                        <#assign doExistMessageForUsernameOrPassword = true>
-                                    </#attempt>
-                                </#if>
-
-                                return <#if doExistMessageForUsernameOrPassword>true<#else>false</#if>;
-
+                        <#attempt>
+                            <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
+                                return <#if messagesPerField.exists('username') ||  messagesPerField.exists('password')>true<#else>false</#if>;
                             <#else>
-
-                                <#assign doExistMessageForField = "">
-
-                                <#attempt>
-                                    <#assign doExistMessageForField = messagesPerField.exists('${fieldName}')>
-                                <#recover>
-                                    <#assign doExistMessageForField = true>
-                                </#attempt>
-
-                                return <#if doExistMessageForField>true<#else>false</#if>;
-
+                                return <#if messagesPerField.exists('${fieldName}')>true<#else>false</#if>;
                             </#if>
-
-                        <#else>
-
-                            <#-- https://github.com/keycloakify/keycloakify/pull/218 -->
-                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && pageId != 'register.ftl' && pageId != 'register-user-profile.ftl'>
-
-                                <#assign doExistErrorOnUsernameOrPassword = "">
-
-                                <#attempt>
-                                    <#assign doExistErrorOnUsernameOrPassword = messagesPerField.existsError('username', 'password')>
-                                <#recover>
-                                    <#assign doExistErrorOnUsernameOrPassword = true>
-                                </#attempt>
-
-                                return <#if doExistErrorOnUsernameOrPassword>true<#else>false</#if>;
-
-                            <#else>
-
-                                <#assign doExistErrorMessageForField = "">
-
-                                <#attempt>
-                                    <#assign doExistErrorMessageForField = messagesPerField.exists('${fieldName}')>
-                                <#recover>
-                                    <#assign doExistErrorMessageForField = true>
-                                </#attempt>
-
-                                return <#if doExistErrorMessageForField>true<#else>false</#if>;
-
-                            </#if>
-
-                        </#if>
-
+                        <#recover>
+                        </#attempt>
                     }
                 </#list>
-
-                throw new Error(fieldName + "is probably runtime generated, see: https://docs.keycloakify.dev/limitations#field-names-cant-be-runtime-generated");
+                throw new Error("There is no " + fieldName + " field");
             </#if>
-
         }
     };
 
@@ -457,12 +174,8 @@
                         <#-- https://github.com/keycloakify/keycloakify/issues/357 -->
                         key == "loginAction" && 
                         are_same_path(path, ["url"]) && 
-                        ["saml-post-form.ftl", "error.ftl", "info.ftl", "login-oauth-grant.ftl", "logout-confirm.ftl"]?seq_contains(pageId) &&
+                        ["saml-post-form.ftl", "error.ftl", "info.ftl", "login-oauth-grant.ftl"]?seq_contains(pageId) &&
                         !(auth?has_content && auth.showTryAnotherWayLink())
-                    ) || (
-                        <#-- https://github.com/keycloakify/keycloakify/issues/362 -->
-                        ["secretData", "value"]?seq_contains(key) && 
-                        are_same_path(path, [ "totp", "otpCredentials", "*" ])
                     ) || (
                         ["contextData", "idpConfig", "idp", "authenticationSession"]?seq_contains(key) &&
                         are_same_path(path, ["brokerContext"]) &&

src/bin/keycloakify/generateFtl/generateFtl.ts

@@ -18,6 +18,7 @@ export type BuildOptionsLike = BuildOptionsLike.Standalone | BuildOptionsLike.Ex
 export namespace BuildOptionsLike {
     export type Common = {
         themeName: string;
+        customUserAttributes: string[];
         themeVersion: string;
     };
 
@@ -56,9 +57,8 @@ export function generateFtlFilesCodeFactory(params: {
     buildOptions: BuildOptionsLike;
     keycloakifyVersion: string;
     themeType: ThemeType;
-    fieldNames: string[];
 }) {
-    const { cssGlobalsToDefine, indexHtmlCode, buildOptions, keycloakifyVersion, themeType, fieldNames } = params;
+    const { cssGlobalsToDefine, indexHtmlCode, buildOptions, keycloakifyVersion, themeType } = params;
 
     const $ = cheerio.load(indexHtmlCode);
 
@@ -129,7 +129,10 @@ export function generateFtlFilesCodeFactory(params: {
             .readFileSync(pathJoin(__dirname, "ftl_object_to_js_code_declaring_an_object.ftl"))
             .toString("utf8")
             .match(/^<script>const _=((?:.|\n)+)<\/script>[\n]?$/)![1]
-            .replace("FIELD_NAMES_eKsIY4ZsZ4xeM", fieldNames.map(name => `"${name}"`).join(", "))
+            .replace(
+                "CUSTOM_USER_ATTRIBUTES_eKsIY4ZsZ4xeM",
+                buildOptions.customUserAttributes.length === 0 ? "" : ", " + buildOptions.customUserAttributes.map(name => `"${name}"`).join(", ")
+            )
             .replace("KEYCLOAKIFY_VERSION_xEdKd3xEdr", keycloakifyVersion)
             .replace("KEYCLOAKIFY_THEME_VERSION_sIgKd3xEdr3dx", buildOptions.themeVersion)
             .replace("KEYCLOAKIFY_THEME_TYPE_dExKd3xEdr", themeType)

src/bin/keycloakify/generateJavaStackFiles.ts

@@ -0,0 +1,87 @@
+import * as fs from "fs";
+import { join as pathJoin, dirname as pathDirname } from "path";
+import { themeTypes } from "./generateFtl/generateFtl";
+import { assert } from "tsafe/assert";
+import { Reflect } from "tsafe/Reflect";
+import type { BuildOptions } from "./BuildOptions";
+
+export type BuildOptionsLike = {
+    themeName: string;
+    extraThemeNames: string[];
+    groupId: string;
+    artifactId?: string;
+    themeVersion: string;
+};
+
+{
+    const buildOptions = Reflect<BuildOptions>();
+
+    assert<typeof buildOptions extends BuildOptionsLike ? true : false>();
+}
+
+export function generateJavaStackFiles(params: {
+    keycloakThemeBuildingDirPath: string;
+    doBundlesEmailTemplate: boolean;
+    buildOptions: BuildOptionsLike;
+}): {
+    jarFilePath: string;
+} {
+    const {
+        buildOptions: { groupId, themeName, extraThemeNames, themeVersion, artifactId },
+        keycloakThemeBuildingDirPath,
+        doBundlesEmailTemplate
+    } = params;
+
+    {
+        const { pomFileCode } = (function generatePomFileCode(): {
+            pomFileCode: string;
+        } {
+            const pomFileCode = [
+                `<?xml version="1.0"?>`,
+                `<project xmlns="http://maven.apache.org/POM/4.0.0"`,
+                `	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`,
+                `	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">`,
+                `	<modelVersion>4.0.0</modelVersion>`,
+                `	<groupId>${groupId}</groupId>`,
+                `	<artifactId>${artifactId}</artifactId>`,
+                `	<version>${themeVersion}</version>`,
+                `	<name>${artifactId}</name>`,
+                `	<description />`,
+                `</project>`
+            ].join("\n");
+
+            return { pomFileCode };
+        })();
+
+        fs.writeFileSync(pathJoin(keycloakThemeBuildingDirPath, "pom.xml"), Buffer.from(pomFileCode, "utf8"));
+    }
+
+    {
+        const themeManifestFilePath = pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "META-INF", "keycloak-themes.json");
+
+        try {
+            fs.mkdirSync(pathDirname(themeManifestFilePath));
+        } catch {}
+
+        fs.writeFileSync(
+            themeManifestFilePath,
+            Buffer.from(
+                JSON.stringify(
+                    {
+                        "themes": [themeName, ...extraThemeNames].map(themeName => ({
+                            "name": themeName,
+                            "types": [...themeTypes, ...(doBundlesEmailTemplate ? ["email"] : [])]
+                        }))
+                    },
+                    null,
+                    2
+                ),
+                "utf8"
+            )
+        );
+    }
+
+    return {
+        "jarFilePath": pathJoin(keycloakThemeBuildingDirPath, "target", `${artifactId}-${themeVersion}.jar`)
+    };
+}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/AccountPages.java

@@ -1,33 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public enum AccountPages {
-  ACCOUNT,
-  PASSWORD,
-  TOTP,
-  FEDERATED_IDENTITY,
-  LOG,
-  SESSIONS,
-  APPLICATIONS,
-  RESOURCES,
-  RESOURCE_DETAIL;
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/AccountProvider.java

@@ -1,76 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account;
-
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.UriInfo;
-import java.util.List;
-import org.keycloak.events.Event;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.models.UserSessionModel;
-import org.keycloak.models.utils.FormMessage;
-import org.keycloak.provider.Provider;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public interface AccountProvider extends Provider {
-
-  AccountProvider setUriInfo(UriInfo uriInfo);
-
-  AccountProvider setHttpHeaders(HttpHeaders httpHeaders);
-
-  Response createResponse(AccountPages page);
-
-  AccountProvider setError(Response.Status status, String message, Object... parameters);
-
-  AccountProvider setErrors(Response.Status status, List<FormMessage> messages);
-
-  AccountProvider setSuccess(String message, Object... parameters);
-
-  AccountProvider setWarning(String message, Object... parameters);
-
-  AccountProvider setUser(UserModel user);
-
-  AccountProvider setProfileFormData(MultivaluedMap<String, String> formData);
-
-  AccountProvider setRealm(RealmModel realm);
-
-  AccountProvider setReferrer(String[] referrer);
-
-  AccountProvider setEvents(List<Event> events);
-
-  AccountProvider setSessions(List<UserSessionModel> sessions);
-
-  AccountProvider setPasswordSet(boolean passwordSet);
-
-  AccountProvider setStateChecker(String stateChecker);
-
-  AccountProvider setIdTokenHint(String idTokenHint);
-
-  AccountProvider setFeatures(
-      boolean social,
-      boolean events,
-      boolean passwordUpdateSupported,
-      boolean authorizationSupported);
-
-  AccountProvider setAttribute(String key, String value);
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/AccountProviderFactory.java

@@ -1,25 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account;
-
-import org.keycloak.provider.ProviderFactory;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public interface AccountProviderFactory extends ProviderFactory<AccountProvider> {}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/AccountSpi.java

@@ -1,50 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account;
-
-import com.google.auto.service.AutoService;
-import org.keycloak.provider.Provider;
-import org.keycloak.provider.ProviderFactory;
-import org.keycloak.provider.Spi;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-@AutoService(Spi.class)
-public class AccountSpi implements Spi {
-
-  @Override
-  public boolean isInternal() {
-    return true;
-  }
-
-  @Override
-  public String getName() {
-    return "account";
-  }
-
-  @Override
-  public Class<? extends Provider> getProviderClass() {
-    return AccountProvider.class;
-  }
-
-  @Override
-  public Class<? extends ProviderFactory> getProviderFactoryClass() {
-    return AccountProviderFactory.class;
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/FreeMarkerAccountProvider.java

@@ -1,424 +0,0 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.keycloak.forms.account.freemarker;
-
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.UriBuilder;
-import jakarta.ws.rs.core.UriInfo;
-import java.io.IOException;
-import java.net.URI;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
-import org.jboss.logging.Logger;
-import org.keycloak.events.Event;
-import org.keycloak.forms.account.AccountPages;
-import org.keycloak.forms.account.AccountProvider;
-import org.keycloak.forms.account.freemarker.model.AccountBean;
-import org.keycloak.forms.account.freemarker.model.AccountFederatedIdentityBean;
-import org.keycloak.forms.account.freemarker.model.ApplicationsBean;
-import org.keycloak.forms.account.freemarker.model.AuthorizationBean;
-import org.keycloak.forms.account.freemarker.model.FeaturesBean;
-import org.keycloak.forms.account.freemarker.model.LogBean;
-import org.keycloak.forms.account.freemarker.model.PasswordBean;
-import org.keycloak.forms.account.freemarker.model.RealmBean;
-import org.keycloak.forms.account.freemarker.model.ReferrerBean;
-import org.keycloak.forms.account.freemarker.model.SessionsBean;
-import org.keycloak.forms.account.freemarker.model.TotpBean;
-import org.keycloak.forms.account.freemarker.model.UrlBean;
-import org.keycloak.forms.login.MessageType;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.models.UserSessionModel;
-import org.keycloak.models.utils.FormMessage;
-import org.keycloak.services.util.CacheControlUtil;
-import org.keycloak.theme.FreeMarkerException;
-import org.keycloak.theme.Theme;
-import org.keycloak.theme.beans.AdvancedMessageFormatterMethod;
-import org.keycloak.theme.beans.LocaleBean;
-import org.keycloak.theme.beans.MessageBean;
-import org.keycloak.theme.beans.MessageFormatterMethod;
-import org.keycloak.theme.beans.MessagesPerFieldBean;
-import org.keycloak.theme.freemarker.FreeMarkerProvider;
-import org.keycloak.utils.MediaType;
-import org.keycloak.utils.StringUtil;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class FreeMarkerAccountProvider implements AccountProvider {
-
-  private static final Logger logger = Logger.getLogger(FreeMarkerAccountProvider.class);
-
-  protected UserModel user;
-  protected MultivaluedMap<String, String> profileFormData;
-  protected Response.Status status = Response.Status.OK;
-  protected RealmModel realm;
-  protected String[] referrer;
-  protected List<Event> events;
-  protected String stateChecker;
-  protected String idTokenHint;
-  protected List<UserSessionModel> sessions;
-  protected boolean identityProviderEnabled;
-  protected boolean eventsEnabled;
-  protected boolean passwordUpdateSupported;
-  protected boolean passwordSet;
-  protected KeycloakSession session;
-  protected FreeMarkerProvider freeMarker;
-  protected HttpHeaders headers;
-  protected Map<String, Object> attributes;
-
-  protected UriInfo uriInfo;
-
-  protected List<FormMessage> messages = null;
-  protected MessageType messageType = MessageType.ERROR;
-  private boolean authorizationSupported;
-
-  public FreeMarkerAccountProvider(KeycloakSession session) {
-    this.session = session;
-    this.freeMarker = session.getProvider(FreeMarkerProvider.class);
-  }
-
-  public AccountProvider setUriInfo(UriInfo uriInfo) {
-    this.uriInfo = uriInfo;
-    return this;
-  }
-
-  @Override
-  public AccountProvider setHttpHeaders(HttpHeaders httpHeaders) {
-    this.headers = httpHeaders;
-    return this;
-  }
-
-  @Override
-  public Response createResponse(AccountPages page) {
-    Map<String, Object> attributes = new HashMap<>();
-
-    if (this.attributes != null) {
-      attributes.putAll(this.attributes);
-    }
-
-    Theme theme;
-    try {
-      theme = getTheme();
-    } catch (IOException e) {
-      logger.error("Failed to create theme", e);
-      return Response.serverError().build();
-    }
-
-    Locale locale = session.getContext().resolveLocale(user);
-    Properties messagesBundle = handleThemeResources(theme, locale, attributes);
-
-    URI baseUri = uriInfo.getBaseUri();
-    UriBuilder baseUriBuilder = uriInfo.getBaseUriBuilder();
-    for (Map.Entry<String, List<String>> e : uriInfo.getQueryParameters().entrySet()) {
-      baseUriBuilder.queryParam(e.getKey(), e.getValue().toArray());
-    }
-    URI baseQueryUri = baseUriBuilder.build();
-
-    if (stateChecker != null) {
-      attributes.put("stateChecker", stateChecker);
-    }
-
-    handleMessages(locale, messagesBundle, attributes);
-
-    if (referrer != null) {
-      attributes.put("referrer", new ReferrerBean(referrer));
-    }
-
-    if (realm != null) {
-      attributes.put("realm", new RealmBean(realm));
-    }
-
-    attributes.put(
-        "url",
-        new UrlBean(realm, theme, baseUri, baseQueryUri, uriInfo.getRequestUri(), idTokenHint));
-
-    if (realm.isInternationalizationEnabled()) {
-      UriBuilder b = UriBuilder.fromUri(baseQueryUri).path(uriInfo.getPath());
-      attributes.put("locale", new LocaleBean(realm, locale, b, messagesBundle));
-    }
-
-    attributes.put(
-        "features",
-        new FeaturesBean(
-            identityProviderEnabled,
-            eventsEnabled,
-            passwordUpdateSupported,
-            authorizationSupported));
-    attributes.put("account", new AccountBean(user, profileFormData));
-
-    switch (page) {
-      case TOTP:
-        attributes.put("totp", new TotpBean(session, realm, user, uriInfo.getRequestUriBuilder()));
-        break;
-      case FEDERATED_IDENTITY:
-        attributes.put(
-            "federatedIdentity",
-            new AccountFederatedIdentityBean(
-                session, realm, user, uriInfo.getBaseUri(), stateChecker));
-        break;
-      case LOG:
-        attributes.put("log", new LogBean(events));
-        break;
-      case SESSIONS:
-        attributes.put("sessions", new SessionsBean(realm, sessions));
-        break;
-      case APPLICATIONS:
-        attributes.put("applications", new ApplicationsBean(session, realm, user));
-        attributes.put("advancedMsg", new AdvancedMessageFormatterMethod(locale, messagesBundle));
-        break;
-      case PASSWORD:
-        attributes.put("password", new PasswordBean(passwordSet));
-        break;
-      case RESOURCES:
-        if (!realm.isUserManagedAccessAllowed()) {
-          return Response.status(Status.FORBIDDEN).build();
-        }
-        attributes.put("authorization", new AuthorizationBean(session, realm, user, uriInfo));
-      case RESOURCE_DETAIL:
-        if (!realm.isUserManagedAccessAllowed()) {
-          return Response.status(Status.FORBIDDEN).build();
-        }
-        attributes.put("authorization", new AuthorizationBean(session, realm, user, uriInfo));
-    }
-
-    return processTemplate(theme, page, attributes, locale);
-  }
-
-  /**
-   * Get Theme used for page rendering.
-   *
-   * @return theme for page rendering, never null
-   * @throws IOException in case of Theme loading problem
-   */
-  protected Theme getTheme() throws IOException {
-    return session.theme().getTheme(Theme.Type.ACCOUNT);
-  }
-
-  /**
-   * Load message bundle and place it into <code>msg</code> template attribute. Also load Theme
-   * properties and place them into <code>properties</code> template attribute.
-   *
-   * @param theme actual Theme to load bundle from
-   * @param locale to load bundle for
-   * @param attributes template attributes to add resources to
-   * @return message bundle for other use
-   */
-  protected Properties handleThemeResources(
-      Theme theme, Locale locale, Map<String, Object> attributes) {
-    Properties messagesBundle = new Properties();
-    try {
-      if (!StringUtil.isNotBlank(realm.getDefaultLocale())) {
-        messagesBundle.putAll(realm.getRealmLocalizationTextsByLocale(realm.getDefaultLocale()));
-      }
-      messagesBundle.putAll(theme.getMessages(locale));
-      messagesBundle.putAll(realm.getRealmLocalizationTextsByLocale(locale.toLanguageTag()));
-      attributes.put("msg", new MessageFormatterMethod(locale, messagesBundle));
-    } catch (IOException e) {
-      logger.warn("Failed to load messages", e);
-      messagesBundle = new Properties();
-    }
-    try {
-      attributes.put("properties", theme.getProperties());
-    } catch (IOException e) {
-      logger.warn("Failed to load properties", e);
-    }
-    return messagesBundle;
-  }
-
-  /**
-   * Handle messages to be shown on the page - set them to template attributes
-   *
-   * @param locale to be used for message text loading
-   * @param messagesBundle to be used for message text loading
-   * @param attributes template attributes to messages related info to
-   * @see #messageType
-   * @see #messages
-   */
-  protected void handleMessages(
-      Locale locale, Properties messagesBundle, Map<String, Object> attributes) {
-    MessagesPerFieldBean messagesPerField = new MessagesPerFieldBean();
-    if (messages != null) {
-      MessageBean wholeMessage = new MessageBean(null, messageType);
-      for (FormMessage message : this.messages) {
-        String formattedMessageText = formatMessage(message, messagesBundle, locale);
-        if (formattedMessageText != null) {
-          wholeMessage.appendSummaryLine(formattedMessageText);
-          messagesPerField.addMessage(message.getField(), formattedMessageText, messageType);
-        }
-      }
-      attributes.put("message", wholeMessage);
-    }
-    attributes.put("messagesPerField", messagesPerField);
-  }
-
-  /**
-   * Process FreeMarker template and prepare Response. Some fields are used for rendering also.
-   *
-   * @param theme to be used (provided by <code>getTheme()</code>)
-   * @param page to be rendered
-   * @param attributes pushed to the template
-   * @param locale to be used
-   * @return Response object to be returned to the browser, never null
-   */
-  protected Response processTemplate(
-      Theme theme, AccountPages page, Map<String, Object> attributes, Locale locale) {
-    try {
-      String result = freeMarker.processTemplate(attributes, Templates.getTemplate(page), theme);
-      Response.ResponseBuilder builder =
-          Response.status(status)
-              .type(MediaType.TEXT_HTML_UTF_8_TYPE)
-              .language(locale)
-              .entity(result);
-      builder.cacheControl(CacheControlUtil.noCache());
-      return builder.build();
-    } catch (FreeMarkerException e) {
-      logger.error("Failed to process template", e);
-      return Response.serverError().build();
-    }
-  }
-
-  public AccountProvider setPasswordSet(boolean passwordSet) {
-    this.passwordSet = passwordSet;
-    return this;
-  }
-
-  protected void setMessage(MessageType type, String message, Object... parameters) {
-    messageType = type;
-    messages = new ArrayList<>();
-    messages.add(new FormMessage(null, message, parameters));
-  }
-
-  protected String formatMessage(FormMessage message, Properties messagesBundle, Locale locale) {
-    if (message == null) return null;
-    if (messagesBundle.containsKey(message.getMessage())) {
-      return new MessageFormat(messagesBundle.getProperty(message.getMessage()), locale)
-          .format(message.getParameters());
-    } else {
-      return message.getMessage();
-    }
-  }
-
-  @Override
-  public AccountProvider setErrors(Response.Status status, List<FormMessage> messages) {
-    this.status = status;
-    this.messageType = MessageType.ERROR;
-    this.messages = new ArrayList<>(messages);
-    return this;
-  }
-
-  @Override
-  public AccountProvider setError(Response.Status status, String message, Object... parameters) {
-    this.status = status;
-    setMessage(MessageType.ERROR, message, parameters);
-    return this;
-  }
-
-  @Override
-  public AccountProvider setSuccess(String message, Object... parameters) {
-    setMessage(MessageType.SUCCESS, message, parameters);
-    return this;
-  }
-
-  @Override
-  public AccountProvider setWarning(String message, Object... parameters) {
-    setMessage(MessageType.WARNING, message, parameters);
-    return this;
-  }
-
-  @Override
-  public AccountProvider setUser(UserModel user) {
-    this.user = user;
-    return this;
-  }
-
-  @Override
-  public AccountProvider setProfileFormData(MultivaluedMap<String, String> formData) {
-    this.profileFormData = formData;
-    return this;
-  }
-
-  @Override
-  public AccountProvider setRealm(RealmModel realm) {
-    this.realm = realm;
-    return this;
-  }
-
-  @Override
-  public AccountProvider setReferrer(String[] referrer) {
-    this.referrer = referrer;
-    return this;
-  }
-
-  @Override
-  public AccountProvider setEvents(List<Event> events) {
-    this.events = events;
-    return this;
-  }
-
-  @Override
-  public AccountProvider setSessions(List<UserSessionModel> sessions) {
-    this.sessions = sessions;
-    return this;
-  }
-
-  @Override
-  public AccountProvider setStateChecker(String stateChecker) {
-    this.stateChecker = stateChecker;
-    return this;
-  }
-
-  @Override
-  public AccountProvider setIdTokenHint(String idTokenHint) {
-    this.idTokenHint = idTokenHint;
-    return this;
-  }
-
-  @Override
-  public AccountProvider setFeatures(
-      boolean identityProviderEnabled,
-      boolean eventsEnabled,
-      boolean passwordUpdateSupported,
-      boolean authorizationSupported) {
-    this.identityProviderEnabled = identityProviderEnabled;
-    this.eventsEnabled = eventsEnabled;
-    this.passwordUpdateSupported = passwordUpdateSupported;
-    this.authorizationSupported = authorizationSupported;
-    return this;
-  }
-
-  @Override
-  public AccountProvider setAttribute(String key, String value) {
-    if (attributes == null) {
-      attributes = new HashMap<>();
-    }
-    attributes.put(key, value);
-    return this;
-  }
-
-  @Override
-  public void close() {}
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/FreeMarkerAccountProviderFactory.java

@@ -1,51 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker;
-
-import com.google.auto.service.AutoService;
-import org.keycloak.Config;
-import org.keycloak.forms.account.AccountProvider;
-import org.keycloak.forms.account.AccountProviderFactory;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.KeycloakSessionFactory;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-@AutoService(AccountProviderFactory.class)
-public class FreeMarkerAccountProviderFactory implements AccountProviderFactory {
-
-  @Override
-  public AccountProvider create(KeycloakSession session) {
-    return new FreeMarkerAccountProvider(session);
-  }
-
-  @Override
-  public void init(Config.Scope config) {}
-
-  @Override
-  public void postInit(KeycloakSessionFactory factory) {}
-
-  @Override
-  public void close() {}
-
-  @Override
-  public String getId() {
-    return "freemarker";
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/Templates.java

@@ -1,51 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker;
-
-import org.keycloak.forms.account.AccountPages;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class Templates {
-
-  public static String getTemplate(AccountPages page) {
-    switch (page) {
-      case ACCOUNT:
-        return "account.ftl";
-      case PASSWORD:
-        return "password.ftl";
-      case TOTP:
-        return "totp.ftl";
-      case FEDERATED_IDENTITY:
-        return "federatedIdentity.ftl";
-      case LOG:
-        return "log.ftl";
-      case SESSIONS:
-        return "sessions.ftl";
-      case APPLICATIONS:
-        return "applications.ftl";
-      case RESOURCES:
-        return "resources.ftl";
-      case RESOURCE_DETAIL:
-        return "resource-detail.ftl";
-      default:
-        throw new IllegalArgumentException();
-    }
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/AccountBean.java

@@ -1,91 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker.model;
-
-import jakarta.ws.rs.core.MultivaluedMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.jboss.logging.Logger;
-import org.keycloak.models.Constants;
-import org.keycloak.models.UserModel;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class AccountBean {
-
-  private static final Logger logger = Logger.getLogger(AccountBean.class);
-
-  private final UserModel user;
-  private final MultivaluedMap<String, String> profileFormData;
-
-  // TODO: More proper multi-value attribute support
-  private final Map<String, String> attributes = new HashMap<>();
-
-  public AccountBean(UserModel user, MultivaluedMap<String, String> profileFormData) {
-    this.user = user;
-    this.profileFormData = profileFormData;
-
-    for (Map.Entry<String, List<String>> attr : user.getAttributes().entrySet()) {
-      List<String> attrValue = attr.getValue();
-      if (attrValue.size() > 0) {
-        attributes.put(attr.getKey(), attrValue.get(0));
-      }
-
-      if (attrValue.size() > 1) {
-        logger.warnf(
-            "There are more values for attribute '%s' of user '%s' . Will display just first value",
-            attr.getKey(), user.getUsername());
-      }
-    }
-
-    if (profileFormData != null) {
-      for (String key : profileFormData.keySet()) {
-        if (key.startsWith(Constants.USER_ATTRIBUTES_PREFIX)) {
-          String attribute = key.substring(Constants.USER_ATTRIBUTES_PREFIX.length());
-          attributes.put(attribute, profileFormData.getFirst(key));
-        }
-      }
-    }
-  }
-
-  public String getFirstName() {
-    return profileFormData != null ? profileFormData.getFirst("firstName") : user.getFirstName();
-  }
-
-  public String getLastName() {
-    return profileFormData != null ? profileFormData.getFirst("lastName") : user.getLastName();
-  }
-
-  public String getUsername() {
-    if (profileFormData != null && profileFormData.containsKey("username")) {
-      return profileFormData.getFirst("username");
-    } else {
-      return user.getUsername();
-    }
-  }
-
-  public String getEmail() {
-    return profileFormData != null ? profileFormData.getFirst("email") : user.getEmail();
-  }
-
-  public Map<String, String> getAttributes() {
-    return attributes;
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/AccountFederatedIdentityBean.java

@@ -1,157 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker.model;
-
-import java.net.URI;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.keycloak.models.FederatedIdentityModel;
-import org.keycloak.models.IdentityProviderModel;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.OrderedModel;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.models.utils.KeycloakModelUtils;
-import org.keycloak.services.resources.account.AccountFormService;
-
-/**
- * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
- * @author <a href="mailto:velias@redhat.com">Vlastimil Elias</a>
- */
-public class AccountFederatedIdentityBean {
-
-  private static OrderedModel.OrderedModelComparator<FederatedIdentityEntry>
-      IDP_COMPARATOR_INSTANCE = new OrderedModel.OrderedModelComparator<>();
-
-  private final List<FederatedIdentityEntry> identities;
-  private final boolean removeLinkPossible;
-  private final KeycloakSession session;
-
-  public AccountFederatedIdentityBean(
-      KeycloakSession session, RealmModel realm, UserModel user, URI baseUri, String stateChecker) {
-    this.session = session;
-
-    AtomicInteger availableIdentities = new AtomicInteger(0);
-    this.identities =
-        realm
-            .getIdentityProvidersStream()
-            .filter(IdentityProviderModel::isEnabled)
-            .map(
-                provider -> {
-                  String providerId = provider.getAlias();
-
-                  FederatedIdentityModel identity =
-                      getIdentity(
-                          session.users().getFederatedIdentitiesStream(realm, user), providerId);
-
-                  if (identity != null) {
-                    availableIdentities.getAndIncrement();
-                  }
-
-                  String displayName =
-                      KeycloakModelUtils.getIdentityProviderDisplayName(session, provider);
-                  return new FederatedIdentityEntry(
-                      identity,
-                      displayName,
-                      provider.getAlias(),
-                      provider.getAlias(),
-                      provider.getConfig() != null ? provider.getConfig().get("guiOrder") : null);
-                })
-            .sorted(IDP_COMPARATOR_INSTANCE)
-            .collect(Collectors.toList());
-
-    // Removing last social provider is not possible if you don't have other possibility to
-    // authenticate
-    this.removeLinkPossible =
-        availableIdentities.get() > 1
-            || user.getFederationLink() != null
-            || AccountFormService.isPasswordSet(session, realm, user);
-  }
-
-  private FederatedIdentityModel getIdentity(
-      Stream<FederatedIdentityModel> identities, String providerId) {
-    return identities
-        .filter(
-            federatedIdentityModel ->
-                Objects.equals(federatedIdentityModel.getIdentityProvider(), providerId))
-        .findFirst()
-        .orElse(null);
-  }
-
-  public List<FederatedIdentityEntry> getIdentities() {
-    return identities;
-  }
-
-  public boolean isRemoveLinkPossible() {
-    return removeLinkPossible;
-  }
-
-  public static class FederatedIdentityEntry implements OrderedModel {
-
-    private FederatedIdentityModel federatedIdentityModel;
-    private final String providerId;
-    private final String providerName;
-    private final String guiOrder;
-    private final String displayName;
-
-    public FederatedIdentityEntry(
-        FederatedIdentityModel federatedIdentityModel,
-        String displayName,
-        String providerId,
-        String providerName,
-        String guiOrder) {
-      this.federatedIdentityModel = federatedIdentityModel;
-      this.displayName = displayName;
-      this.providerId = providerId;
-      this.providerName = providerName;
-      this.guiOrder = guiOrder;
-    }
-
-    public String getProviderId() {
-      return providerId;
-    }
-
-    public String getProviderName() {
-      return providerName;
-    }
-
-    public String getUserId() {
-      return federatedIdentityModel != null ? federatedIdentityModel.getUserId() : null;
-    }
-
-    public String getUserName() {
-      return federatedIdentityModel != null ? federatedIdentityModel.getUserName() : null;
-    }
-
-    public boolean isConnected() {
-      return federatedIdentityModel != null;
-    }
-
-    @Override
-    public String getGuiOrder() {
-      return guiOrder;
-    }
-
-    public String getDisplayName() {
-      return displayName;
-    }
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/ApplicationsBean.java

@@ -1,258 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker.model;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.keycloak.common.util.MultivaluedHashMap;
-import org.keycloak.models.ClientModel;
-import org.keycloak.models.ClientScopeModel;
-import org.keycloak.models.Constants;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.OrderedModel;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.RoleModel;
-import org.keycloak.models.UserConsentModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.protocol.oidc.TokenManager;
-import org.keycloak.services.managers.UserSessionManager;
-import org.keycloak.services.resources.admin.permissions.AdminPermissions;
-import org.keycloak.services.util.ResolveRelative;
-import org.keycloak.storage.StorageId;
-
-/**
- * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
- */
-public class ApplicationsBean {
-
-  private List<ApplicationEntry> applications = new LinkedList<>();
-
-  public ApplicationsBean(KeycloakSession session, RealmModel realm, UserModel user) {
-    Set<ClientModel> offlineClients =
-        new UserSessionManager(session).findClientsWithOfflineToken(realm, user);
-
-    this.applications =
-        this.getApplications(session, realm, user)
-            .filter(
-                client ->
-                    !isAdminClient(client)
-                        || AdminPermissions.realms(session, realm, user).isAdmin())
-            .map(client -> toApplicationEntry(session, realm, user, client, offlineClients))
-            .filter(Objects::nonNull)
-            .collect(Collectors.toList());
-  }
-
-  public static boolean isAdminClient(ClientModel client) {
-    return client.getClientId().equals(Constants.ADMIN_CLI_CLIENT_ID)
-        || client.getClientId().equals(Constants.ADMIN_CONSOLE_CLIENT_ID);
-  }
-
-  private Stream<ClientModel> getApplications(
-      KeycloakSession session, RealmModel realm, UserModel user) {
-    Predicate<ClientModel> bearerOnly = ClientModel::isBearerOnly;
-    Stream<ClientModel> clients = realm.getClientsStream().filter(bearerOnly.negate());
-
-    Predicate<ClientModel> isLocal = client -> new StorageId(client.getId()).isLocal();
-    return Stream.concat(
-            clients,
-            session
-                .users()
-                .getConsentsStream(realm, user.getId())
-                .map(UserConsentModel::getClient)
-                .filter(isLocal.negate()))
-        .distinct();
-  }
-
-  private void processRoles(
-      Set<RoleModel> inputRoles,
-      List<RoleModel> realmRoles,
-      MultivaluedHashMap<String, ClientRoleEntry> clientRoles) {
-    for (RoleModel role : inputRoles) {
-      if (role.getContainer() instanceof RealmModel) {
-        realmRoles.add(role);
-      } else {
-        ClientModel currentClient = (ClientModel) role.getContainer();
-        ClientRoleEntry clientRole =
-            new ClientRoleEntry(
-                currentClient.getClientId(),
-                currentClient.getName(),
-                role.getName(),
-                role.getDescription());
-        clientRoles.add(currentClient.getClientId(), clientRole);
-      }
-    }
-  }
-
-  public List<ApplicationEntry> getApplications() {
-    return applications;
-  }
-
-  public static class ApplicationEntry {
-
-    private KeycloakSession session;
-    private final List<RoleModel> realmRolesAvailable;
-    private final MultivaluedHashMap<String, ClientRoleEntry> resourceRolesAvailable;
-    private final ClientModel client;
-    private final List<String> clientScopesGranted;
-    private final List<String> additionalGrants;
-
-    public ApplicationEntry(
-        KeycloakSession session,
-        List<RoleModel> realmRolesAvailable,
-        MultivaluedHashMap<String, ClientRoleEntry> resourceRolesAvailable,
-        ClientModel client,
-        List<String> clientScopesGranted,
-        List<String> additionalGrants) {
-      this.session = session;
-      this.realmRolesAvailable = realmRolesAvailable;
-      this.resourceRolesAvailable = resourceRolesAvailable;
-      this.client = client;
-      this.clientScopesGranted = clientScopesGranted;
-      this.additionalGrants = additionalGrants;
-    }
-
-    public List<RoleModel> getRealmRolesAvailable() {
-      return realmRolesAvailable;
-    }
-
-    public MultivaluedHashMap<String, ClientRoleEntry> getResourceRolesAvailable() {
-      return resourceRolesAvailable;
-    }
-
-    public List<String> getClientScopesGranted() {
-      return clientScopesGranted;
-    }
-
-    public String getEffectiveUrl() {
-      return ResolveRelative.resolveRelativeUri(
-          session, getClient().getRootUrl(), getClient().getBaseUrl());
-    }
-
-    public ClientModel getClient() {
-      return client;
-    }
-
-    public List<String> getAdditionalGrants() {
-      return additionalGrants;
-    }
-  }
-
-  // Same class used in OAuthGrantBean as well. Maybe should be merged into common-freemarker...
-  public static class ClientRoleEntry {
-
-    private final String clientId;
-    private final String clientName;
-    private final String roleName;
-    private final String roleDescription;
-
-    public ClientRoleEntry(
-        String clientId, String clientName, String roleName, String roleDescription) {
-      this.clientId = clientId;
-      this.clientName = clientName;
-      this.roleName = roleName;
-      this.roleDescription = roleDescription;
-    }
-
-    public String getClientId() {
-      return clientId;
-    }
-
-    public String getClientName() {
-      return clientName;
-    }
-
-    public String getRoleName() {
-      return roleName;
-    }
-
-    public String getRoleDescription() {
-      return roleDescription;
-    }
-  }
-
-  /**
-   * Constructs a {@link ApplicationEntry} from the specified parameters.
-   *
-   * @param session a reference to the {@code Keycloak} session.
-   * @param realm a reference to the realm.
-   * @param user a reference to the user.
-   * @param client a reference to the client that contains the applications.
-   * @param offlineClients a {@link Set} containing the offline clients.
-   * @return the constructed {@link ApplicationEntry} instance or {@code null} if the user can't
-   *     access the applications in the specified client.
-   */
-  private ApplicationEntry toApplicationEntry(
-      final KeycloakSession session,
-      final RealmModel realm,
-      final UserModel user,
-      final ClientModel client,
-      final Set<ClientModel> offlineClients) {
-
-    // Construct scope parameter with all optional scopes to see all potentially available roles
-    Stream<ClientScopeModel> allClientScopes =
-        Stream.concat(
-            client.getClientScopes(true).values().stream(),
-            client.getClientScopes(false).values().stream());
-    allClientScopes = Stream.concat(allClientScopes, Stream.of(client)).distinct();
-
-    Set<RoleModel> availableRoles = TokenManager.getAccess(user, client, allClientScopes);
-
-    // Don't show applications, which user doesn't have access into (any available roles)
-    // unless this is can be changed by approving/revoking consent
-    if (!isAdminClient(client) && availableRoles.isEmpty() && !client.isConsentRequired()) {
-      return null;
-    }
-
-    List<RoleModel> realmRolesAvailable = new LinkedList<>();
-    MultivaluedHashMap<String, ClientRoleEntry> resourceRolesAvailable = new MultivaluedHashMap<>();
-    processRoles(availableRoles, realmRolesAvailable, resourceRolesAvailable);
-
-    List<ClientScopeModel> orderedScopes = new LinkedList<>();
-    if (client.isConsentRequired()) {
-      UserConsentModel consent =
-          session.users().getConsentByClient(realm, user.getId(), client.getId());
-
-      if (consent != null) {
-        orderedScopes.addAll(consent.getGrantedClientScopes());
-      }
-    }
-    List<String> clientScopesGranted =
-        orderedScopes.stream()
-            .sorted(OrderedModel.OrderedModelComparator.getInstance())
-            .map(ClientScopeModel::getConsentScreenText)
-            .collect(Collectors.toList());
-
-    List<String> additionalGrants = new ArrayList<>();
-    if (offlineClients.contains(client)) {
-      additionalGrants.add("${offlineToken}");
-    }
-    return new ApplicationEntry(
-        session,
-        realmRolesAvailable,
-        resourceRolesAvailable,
-        client,
-        clientScopesGranted,
-        additionalGrants);
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/AuthorizationBean.java

@@ -1,515 +0,0 @@
-/*
- * Copyright 2022 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker.model;
-
-import jakarta.ws.rs.core.UriInfo;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.keycloak.authorization.AuthorizationProvider;
-import org.keycloak.authorization.model.PermissionTicket;
-import org.keycloak.authorization.model.Policy;
-import org.keycloak.authorization.model.Resource;
-import org.keycloak.authorization.model.ResourceServer;
-import org.keycloak.authorization.model.Scope;
-import org.keycloak.authorization.store.PermissionTicketStore;
-import org.keycloak.common.util.Time;
-import org.keycloak.models.ClientModel;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.models.utils.ModelToRepresentation;
-import org.keycloak.representations.idm.authorization.ScopeRepresentation;
-import org.keycloak.services.util.ResolveRelative;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class AuthorizationBean {
-
-  private final KeycloakSession session;
-  private final RealmModel realm;
-  private final UserModel user;
-  private final AuthorizationProvider authorization;
-  private final UriInfo uriInfo;
-  private ResourceBean resource;
-  private List<ResourceBean> resources;
-  private Collection<ResourceBean> userSharedResources;
-  private Collection<ResourceBean> requestsWaitingPermission;
-  private Collection<ResourceBean> resourcesWaitingOthersApproval;
-
-  public AuthorizationBean(
-      KeycloakSession session, RealmModel realm, UserModel user, UriInfo uriInfo) {
-    this.session = session;
-    this.realm = realm;
-    this.user = user;
-    this.uriInfo = uriInfo;
-    authorization = session.getProvider(AuthorizationProvider.class);
-    List<String> pathParameters = uriInfo.getPathParameters().get("resource_id");
-
-    if (pathParameters != null && !pathParameters.isEmpty()) {
-      Resource resource =
-          authorization
-              .getStoreFactory()
-              .getResourceStore()
-              .findById(realm, null, pathParameters.get(0));
-
-      if (resource != null && !resource.getOwner().equals(user.getId())) {
-        throw new RuntimeException(
-            "User [" + user.getUsername() + "] can not access resource [" + resource.getId() + "]");
-      }
-    }
-  }
-
-  public Collection<ResourceBean> getResourcesWaitingOthersApproval() {
-    if (resourcesWaitingOthersApproval == null) {
-      Map<PermissionTicket.FilterOption, String> filters =
-          new EnumMap<>(PermissionTicket.FilterOption.class);
-
-      filters.put(PermissionTicket.FilterOption.REQUESTER, user.getId());
-      filters.put(PermissionTicket.FilterOption.GRANTED, Boolean.FALSE.toString());
-
-      resourcesWaitingOthersApproval = toResourceRepresentation(findPermissions(filters));
-    }
-
-    return resourcesWaitingOthersApproval;
-  }
-
-  public Collection<ResourceBean> getResourcesWaitingApproval() {
-    if (requestsWaitingPermission == null) {
-      Map<PermissionTicket.FilterOption, String> filters =
-          new EnumMap<>(PermissionTicket.FilterOption.class);
-
-      filters.put(PermissionTicket.FilterOption.OWNER, user.getId());
-      filters.put(PermissionTicket.FilterOption.GRANTED, Boolean.FALSE.toString());
-
-      requestsWaitingPermission = toResourceRepresentation(findPermissions(filters));
-    }
-
-    return requestsWaitingPermission;
-  }
-
-  public List<ResourceBean> getResources() {
-    if (resources == null) {
-      resources =
-          authorization
-              .getStoreFactory()
-              .getResourceStore()
-              .findByOwner(realm, null, user.getId())
-              .stream()
-              .filter(Resource::isOwnerManagedAccess)
-              .map(ResourceBean::new)
-              .collect(Collectors.toList());
-    }
-    return resources;
-  }
-
-  public Collection<ResourceBean> getSharedResources() {
-    if (userSharedResources == null) {
-      Map<PermissionTicket.FilterOption, String> filters =
-          new EnumMap<>(PermissionTicket.FilterOption.class);
-
-      filters.put(PermissionTicket.FilterOption.REQUESTER, user.getId());
-      filters.put(PermissionTicket.FilterOption.GRANTED, Boolean.TRUE.toString());
-
-      PermissionTicketStore ticketStore =
-          authorization.getStoreFactory().getPermissionTicketStore();
-
-      userSharedResources =
-          toResourceRepresentation(ticketStore.find(realm, null, filters, null, null));
-    }
-    return userSharedResources;
-  }
-
-  public ResourceBean getResource() {
-    if (resource == null) {
-      String resourceId = uriInfo.getPathParameters().getFirst("resource_id");
-
-      if (resourceId != null) {
-        resource = getResource(resourceId);
-      }
-    }
-
-    return resource;
-  }
-
-  private ResourceBean getResource(String id) {
-    return new ResourceBean(
-        authorization.getStoreFactory().getResourceStore().findById(realm, null, id));
-  }
-
-  public static class RequesterBean {
-
-    private final Long createdTimestamp;
-    private final Long grantedTimestamp;
-    private UserModel requester;
-    private List<PermissionScopeBean> scopes = new ArrayList<>();
-    private boolean granted;
-
-    public RequesterBean(PermissionTicket ticket, AuthorizationProvider authorization) {
-      this.requester =
-          authorization
-              .getKeycloakSession()
-              .users()
-              .getUserById(authorization.getRealm(), ticket.getRequester());
-      granted = ticket.isGranted();
-      createdTimestamp = ticket.getCreatedTimestamp();
-      grantedTimestamp = ticket.getGrantedTimestamp();
-    }
-
-    public UserModel getRequester() {
-      return requester;
-    }
-
-    public List<PermissionScopeBean> getScopes() {
-      return scopes;
-    }
-
-    private void addScope(PermissionTicket ticket) {
-      if (ticket != null) {
-        scopes.add(new PermissionScopeBean(ticket));
-      }
-    }
-
-    public boolean isGranted() {
-      return (granted && scopes.isEmpty())
-          || scopes.stream().filter(permissionScopeBean -> permissionScopeBean.isGranted()).count()
-              > 0;
-    }
-
-    public Date getCreatedDate() {
-      return Time.toDate(createdTimestamp);
-    }
-
-    public Date getGrantedDate() {
-      if (grantedTimestamp == null) {
-        PermissionScopeBean permission =
-            scopes.stream()
-                .filter(permissionScopeBean -> permissionScopeBean.isGranted())
-                .findFirst()
-                .orElse(null);
-
-        if (permission == null) {
-          return null;
-        }
-
-        return permission.getGrantedDate();
-      }
-      return Time.toDate(grantedTimestamp);
-    }
-  }
-
-  public static class PermissionScopeBean {
-
-    private final Scope scope;
-    private final PermissionTicket ticket;
-
-    public PermissionScopeBean(PermissionTicket ticket) {
-      this.ticket = ticket;
-      scope = ticket.getScope();
-    }
-
-    public String getId() {
-      return ticket.getId();
-    }
-
-    public Scope getScope() {
-      return scope;
-    }
-
-    public boolean isGranted() {
-      return ticket.isGranted();
-    }
-
-    private Date getGrantedDate() {
-      if (isGranted()) {
-        return Time.toDate(ticket.getGrantedTimestamp());
-      }
-      return null;
-    }
-  }
-
-  public class ResourceBean {
-
-    private final ResourceServerBean resourceServer;
-    private final String ownerName;
-    private final UserModel userOwner;
-    private ClientModel clientOwner;
-    private Resource resource;
-    private Map<String, RequesterBean> permissions = new HashMap<>();
-    private Collection<RequesterBean> shares;
-
-    public ResourceBean(Resource resource) {
-      RealmModel realm = authorization.getRealm();
-      ResourceServer resourceServerModel = resource.getResourceServer();
-      resourceServer =
-          new ResourceServerBean(
-              realm.getClientById(resourceServerModel.getClientId()), resourceServerModel);
-      this.resource = resource;
-      userOwner =
-          authorization.getKeycloakSession().users().getUserById(realm, resource.getOwner());
-      if (userOwner == null) {
-        clientOwner = realm.getClientById(resource.getOwner());
-        ownerName = clientOwner.getClientId();
-      } else if (userOwner.getEmail() != null) {
-        ownerName = userOwner.getEmail();
-      } else {
-        ownerName = userOwner.getUsername();
-      }
-    }
-
-    public String getId() {
-      return resource.getId();
-    }
-
-    public String getName() {
-      return resource.getName();
-    }
-
-    public String getDisplayName() {
-      return resource.getDisplayName();
-    }
-
-    public String getIconUri() {
-      return resource.getIconUri();
-    }
-
-    public String getOwnerName() {
-      return ownerName;
-    }
-
-    public UserModel getUserOwner() {
-      return userOwner;
-    }
-
-    public ClientModel getClientOwner() {
-      return clientOwner;
-    }
-
-    public List<ScopeRepresentation> getScopes() {
-      return resource.getScopes().stream()
-          .map(ModelToRepresentation::toRepresentation)
-          .collect(Collectors.toList());
-    }
-
-    public Collection<RequesterBean> getShares() {
-      if (shares == null) {
-        Map<PermissionTicket.FilterOption, String> filters =
-            new EnumMap<>(PermissionTicket.FilterOption.class);
-
-        filters.put(PermissionTicket.FilterOption.RESOURCE_ID, this.resource.getId());
-        filters.put(PermissionTicket.FilterOption.GRANTED, Boolean.TRUE.toString());
-
-        shares = toPermissionRepresentation(findPermissions(filters));
-      }
-
-      return shares;
-    }
-
-    public Collection<ManagedPermissionBean> getPolicies() {
-      ResourceServer resourceServer = getResourceServer().getResourceServerModel();
-      RealmModel realm = resourceServer.getRealm();
-      Map<Policy.FilterOption, String[]> filters = new EnumMap<>(Policy.FilterOption.class);
-
-      filters.put(Policy.FilterOption.TYPE, new String[] {"uma"});
-      filters.put(Policy.FilterOption.RESOURCE_ID, new String[] {this.resource.getId()});
-      if (getUserOwner() != null) {
-        filters.put(Policy.FilterOption.OWNER, new String[] {getUserOwner().getId()});
-      } else {
-        filters.put(Policy.FilterOption.OWNER, new String[] {getClientOwner().getId()});
-      }
-
-      List<Policy> policies =
-          authorization
-              .getStoreFactory()
-              .getPolicyStore()
-              .find(realm, resourceServer, filters, null, null);
-
-      if (policies.isEmpty()) {
-        return Collections.emptyList();
-      }
-
-      return policies.stream()
-          .filter(
-              policy -> {
-                Map<PermissionTicket.FilterOption, String> filters1 =
-                    new EnumMap<>(PermissionTicket.FilterOption.class);
-
-                filters1.put(PermissionTicket.FilterOption.POLICY_ID, policy.getId());
-
-                return authorization
-                    .getStoreFactory()
-                    .getPermissionTicketStore()
-                    .find(realm, resourceServer, filters1, -1, 1)
-                    .isEmpty();
-              })
-          .map(ManagedPermissionBean::new)
-          .collect(Collectors.toList());
-    }
-
-    public ResourceServerBean getResourceServer() {
-      return resourceServer;
-    }
-
-    public Collection<RequesterBean> getPermissions() {
-      return permissions.values();
-    }
-
-    private void addPermission(PermissionTicket ticket, AuthorizationProvider authorization) {
-      permissions
-          .computeIfAbsent(ticket.getRequester(), key -> new RequesterBean(ticket, authorization))
-          .addScope(ticket);
-    }
-  }
-
-  private Collection<RequesterBean> toPermissionRepresentation(
-      List<PermissionTicket> permissionRequests) {
-    Map<String, RequesterBean> requests = new HashMap<>();
-
-    for (PermissionTicket ticket : permissionRequests) {
-      Resource resource = ticket.getResource();
-
-      if (!resource.isOwnerManagedAccess()) {
-        continue;
-      }
-
-      requests
-          .computeIfAbsent(
-              ticket.getRequester(), resourceId -> new RequesterBean(ticket, authorization))
-          .addScope(ticket);
-    }
-
-    return requests.values();
-  }
-
-  private Collection<ResourceBean> toResourceRepresentation(List<PermissionTicket> tickets) {
-    Map<String, ResourceBean> requests = new HashMap<>();
-
-    for (PermissionTicket ticket : tickets) {
-      Resource resource = ticket.getResource();
-
-      if (!resource.isOwnerManagedAccess()) {
-        continue;
-      }
-
-      requests
-          .computeIfAbsent(resource.getId(), resourceId -> getResource(resourceId))
-          .addPermission(ticket, authorization);
-    }
-
-    return requests.values();
-  }
-
-  private List<PermissionTicket> findPermissions(
-      Map<PermissionTicket.FilterOption, String> filters) {
-    return authorization
-        .getStoreFactory()
-        .getPermissionTicketStore()
-        .find(realm, null, filters, null, null);
-  }
-
-  public class ResourceServerBean {
-
-    private ClientModel clientModel;
-    private ResourceServer resourceServer;
-
-    public ResourceServerBean(ClientModel clientModel, ResourceServer resourceServer) {
-      this.clientModel = clientModel;
-      this.resourceServer = resourceServer;
-    }
-
-    public String getId() {
-      return resourceServer.getId();
-    }
-
-    public String getName() {
-      String name = clientModel.getName();
-
-      if (name != null) {
-        return name;
-      }
-
-      return clientModel.getClientId();
-    }
-
-    public String getClientId() {
-      return clientModel.getClientId();
-    }
-
-    public String getRedirectUri() {
-      Set<String> redirectUris = clientModel.getRedirectUris();
-
-      if (redirectUris.isEmpty()) {
-        return null;
-      }
-
-      return redirectUris.iterator().next();
-    }
-
-    public String getBaseUri() {
-      return ResolveRelative.resolveRelativeUri(
-          session, clientModel.getRootUrl(), clientModel.getBaseUrl());
-    }
-
-    public ResourceServer getResourceServerModel() {
-      return resourceServer;
-    }
-  }
-
-  public class ManagedPermissionBean {
-
-    private final Policy policy;
-    private List<ManagedPermissionBean> policies;
-
-    public ManagedPermissionBean(Policy policy) {
-      this.policy = policy;
-    }
-
-    public String getId() {
-      return policy.getId();
-    }
-
-    public Collection<ScopeRepresentation> getScopes() {
-      return policy.getScopes().stream()
-          .map(ModelToRepresentation::toRepresentation)
-          .collect(Collectors.toList());
-    }
-
-    public String getDescription() {
-      return this.policy.getDescription();
-    }
-
-    public Collection<ManagedPermissionBean> getPolicies() {
-      if (this.policies == null) {
-        this.policies =
-            policy.getAssociatedPolicies().stream()
-                .map(ManagedPermissionBean::new)
-                .collect(Collectors.toList());
-      }
-
-      return this.policies;
-    }
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/FeaturesBean.java

@@ -1,56 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker.model;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class FeaturesBean {
-
-  private final boolean identityFederation;
-  private final boolean log;
-  private final boolean passwordUpdateSupported;
-  private boolean authorization;
-
-  public FeaturesBean(
-      boolean identityFederation,
-      boolean log,
-      boolean passwordUpdateSupported,
-      boolean authorization) {
-    this.identityFederation = identityFederation;
-    this.log = log;
-    this.passwordUpdateSupported = passwordUpdateSupported;
-    this.authorization = authorization;
-  }
-
-  public boolean isIdentityFederation() {
-    return identityFederation;
-  }
-
-  public boolean isLog() {
-    return log;
-  }
-
-  public boolean isPasswordUpdateSupported() {
-    return passwordUpdateSupported;
-  }
-
-  public boolean isAuthorization() {
-    return authorization;
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/LogBean.java

@@ -1,95 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker.model;
-
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import org.keycloak.events.Event;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class LogBean {
-
-  private List<EventBean> events;
-
-  public LogBean(List<Event> events) {
-    this.events = new LinkedList<EventBean>();
-    for (Event e : events) {
-      this.events.add(new EventBean(e));
-    }
-  }
-
-  public List<EventBean> getEvents() {
-    return events;
-  }
-
-  public static class EventBean {
-
-    private Event event;
-
-    public EventBean(Event event) {
-      this.event = event;
-    }
-
-    public Date getDate() {
-      return new Date(event.getTime());
-    }
-
-    public String getEvent() {
-      return event.getType().toString().toLowerCase().replace("_", " ");
-    }
-
-    public String getClient() {
-      return event.getClientId();
-    }
-
-    public String getIpAddress() {
-      return event.getIpAddress();
-    }
-
-    public List<DetailBean> getDetails() {
-      List<DetailBean> details = new LinkedList<DetailBean>();
-      if (event.getDetails() != null) {
-        for (Map.Entry<String, String> e : event.getDetails().entrySet()) {
-          details.add(new DetailBean(e));
-        }
-      }
-      return details;
-    }
-  }
-
-  public static class DetailBean {
-
-    private Map.Entry<String, String> entry;
-
-    public DetailBean(Map.Entry<String, String> entry) {
-      this.entry = entry;
-    }
-
-    public String getKey() {
-      return entry.getKey();
-    }
-
-    public String getValue() {
-      return entry.getValue().replace("_", " ");
-    }
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/PasswordBean.java

@@ -1,34 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker.model;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class PasswordBean {
-
-  private boolean passwordSet;
-
-  public PasswordBean(boolean passwordSet) {
-    this.passwordSet = passwordSet;
-  }
-
-  public boolean isPasswordSet() {
-    return passwordSet;
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/RealmBean.java

@@ -1,75 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.keycloak.forms.account.freemarker.model;
-
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.keycloak.models.RealmModel;
-
-/**
- * @author <a href="mailto:gerbermichi@me.com">Michael Gerber</a>
- */
-public class RealmBean {
-
-  private RealmModel realm;
-
-  public RealmBean(RealmModel realmModel) {
-    realm = realmModel;
-  }
-
-  public String getName() {
-    return realm.getName();
-  }
-
-  public String getDisplayName() {
-    String displayName = realm.getDisplayName();
-    if (displayName != null && displayName.length() > 0) {
-      return displayName;
-    } else {
-      return getName();
-    }
-  }
-
-  public String getDisplayNameHtml() {
-    String displayNameHtml = realm.getDisplayNameHtml();
-    if (displayNameHtml != null && displayNameHtml.length() > 0) {
-      return displayNameHtml;
-    } else {
-      return getDisplayName();
-    }
-  }
-
-  public boolean isInternationalizationEnabled() {
-    return realm.isInternationalizationEnabled();
-  }
-
-  public Set<String> getSupportedLocales() {
-    return realm.getSupportedLocalesStream().collect(Collectors.toSet());
-  }
-
-  public boolean isEditUsernameAllowed() {
-    return realm.isEditUsernameAllowed();
-  }
-
-  public boolean isRegistrationEmailAsUsername() {
-    return realm.isRegistrationEmailAsUsername();
-  }
-
-  public boolean isUserManagedAccessAllowed() {
-    return realm.isUserManagedAccessAllowed();
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/ReferrerBean.java

@@ -1,38 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker.model;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class ReferrerBean {
-
-  private String[] referrer;
-
-  public ReferrerBean(String[] referrer) {
-    this.referrer = referrer;
-  }
-
-  public String getName() {
-    return referrer[0];
-  }
-
-  public String getUrl() {
-    return referrer[1];
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/SessionsBean.java

@@ -1,93 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker.model;
-
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import org.keycloak.common.util.Time;
-import org.keycloak.models.ClientModel;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.UserSessionModel;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class SessionsBean {
-
-  private List<UserSessionBean> events;
-  private RealmModel realm;
-
-  public SessionsBean(RealmModel realm, List<UserSessionModel> sessions) {
-    this.events = new LinkedList<>();
-    for (UserSessionModel session : sessions) {
-      this.events.add(new UserSessionBean(realm, session));
-    }
-  }
-
-  public List<UserSessionBean> getSessions() {
-    return events;
-  }
-
-  public static class UserSessionBean {
-
-    private UserSessionModel session;
-    private RealmModel realm;
-
-    public UserSessionBean(RealmModel realm, UserSessionModel session) {
-      this.realm = realm;
-      this.session = session;
-    }
-
-    public String getId() {
-      return session.getId();
-    }
-
-    public String getIpAddress() {
-      return session.getIpAddress();
-    }
-
-    public Date getStarted() {
-      return Time.toDate(session.getStarted());
-    }
-
-    public Date getLastAccess() {
-      return Time.toDate(session.getLastSessionRefresh());
-    }
-
-    public Date getExpires() {
-      int maxLifespan =
-          session.isRememberMe() && realm.getSsoSessionMaxLifespanRememberMe() > 0
-              ? realm.getSsoSessionMaxLifespanRememberMe()
-              : realm.getSsoSessionMaxLifespan();
-      int max = session.getStarted() + maxLifespan;
-      return Time.toDate(max);
-    }
-
-    public Set<String> getClients() {
-      Set<String> clients = new HashSet<>();
-      for (String clientUUID : session.getAuthenticatedClientSessions().keySet()) {
-        ClientModel client = realm.getClientById(clientUUID);
-        clients.add(client.getClientId());
-      }
-      return clients;
-    }
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/TotpBean.java

@@ -1,125 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker.model;
-
-import static org.keycloak.utils.CredentialHelper.createUserStorageCredentialRepresentation;
-
-import jakarta.ws.rs.core.UriBuilder;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.keycloak.authentication.otp.OTPApplicationProvider;
-import org.keycloak.credential.CredentialModel;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.OTPPolicy;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.models.credential.OTPCredentialModel;
-import org.keycloak.models.utils.HmacOTP;
-import org.keycloak.models.utils.RepresentationToModel;
-import org.keycloak.representations.idm.CredentialRepresentation;
-import org.keycloak.utils.TotpUtils;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class TotpBean {
-
-  private final RealmModel realm;
-  private final String totpSecret;
-  private final String totpSecretEncoded;
-  private final String totpSecretQrCode;
-  private final boolean enabled;
-  private KeycloakSession session;
-  private final UriBuilder uriBuilder;
-  private final List<CredentialModel> otpCredentials;
-  private final List<String> supportedApplications;
-
-  public TotpBean(
-      KeycloakSession session, RealmModel realm, UserModel user, UriBuilder uriBuilder) {
-    this.session = session;
-    this.uriBuilder = uriBuilder;
-    this.enabled = user.credentialManager().isConfiguredFor(OTPCredentialModel.TYPE);
-    if (enabled) {
-      List<CredentialModel> otpCredentials =
-          user.credentialManager()
-              .getStoredCredentialsByTypeStream(OTPCredentialModel.TYPE)
-              .collect(Collectors.toList());
-
-      if (otpCredentials.isEmpty()) {
-        // Credential is configured on userStorage side. Create the "fake" credential similar like
-        // we do for the new account console
-        CredentialRepresentation credential =
-            createUserStorageCredentialRepresentation(OTPCredentialModel.TYPE);
-        this.otpCredentials = Collections.singletonList(RepresentationToModel.toModel(credential));
-      } else {
-        this.otpCredentials = otpCredentials;
-      }
-    } else {
-      this.otpCredentials = Collections.EMPTY_LIST;
-    }
-
-    this.realm = realm;
-    this.totpSecret = HmacOTP.generateSecret(20);
-    this.totpSecretEncoded = TotpUtils.encode(totpSecret);
-    this.totpSecretQrCode = TotpUtils.qrCode(totpSecret, realm, user);
-
-    OTPPolicy otpPolicy = realm.getOTPPolicy();
-    this.supportedApplications =
-        session.getAllProviders(OTPApplicationProvider.class).stream()
-            .filter(p -> p.supports(otpPolicy))
-            .map(OTPApplicationProvider::getName)
-            .collect(Collectors.toList());
-  }
-
-  public boolean isEnabled() {
-    return enabled;
-  }
-
-  public String getTotpSecret() {
-    return totpSecret;
-  }
-
-  public String getTotpSecretEncoded() {
-    return totpSecretEncoded;
-  }
-
-  public String getTotpSecretQrCode() {
-    return totpSecretQrCode;
-  }
-
-  public String getManualUrl() {
-    return uriBuilder.replaceQueryParam("mode", "manual").build().toString();
-  }
-
-  public String getQrUrl() {
-    return uriBuilder.replaceQueryParam("mode", "qr").build().toString();
-  }
-
-  public OTPPolicy getPolicy() {
-    return realm.getOTPPolicy();
-  }
-
-  public List<String> getSupportedApplications() {
-    return supportedApplications;
-  }
-
-  public List<CredentialModel> getOtpCredentials() {
-    return otpCredentials;
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/forms/account/freemarker/model/UrlBean.java

@@ -1,121 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.forms.account.freemarker.model;
-
-import java.io.IOException;
-import java.net.URI;
-import org.jboss.logging.Logger;
-import org.keycloak.models.RealmModel;
-import org.keycloak.services.AccountUrls;
-import org.keycloak.theme.Theme;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class UrlBean {
-
-  private static final Logger logger = Logger.getLogger(UrlBean.class);
-  private String realm;
-  private Theme theme;
-  private URI baseURI;
-  private URI baseQueryURI;
-  private URI currentURI;
-  private String idTokenHint;
-
-  public UrlBean(
-      RealmModel realm,
-      Theme theme,
-      URI baseURI,
-      URI baseQueryURI,
-      URI currentURI,
-      String idTokenHint) {
-    this.realm = realm.getName();
-    this.theme = theme;
-    this.baseURI = baseURI;
-    this.baseQueryURI = baseQueryURI;
-    this.currentURI = currentURI;
-    this.idTokenHint = idTokenHint;
-  }
-
-  public String getApplicationsUrl() {
-    return AccountUrls.accountApplicationsPage(baseQueryURI, realm).toString();
-  }
-
-  public String getAccountUrl() {
-    return AccountUrls.accountPage(baseQueryURI, realm).toString();
-  }
-
-  public String getPasswordUrl() {
-    return AccountUrls.accountPasswordPage(baseQueryURI, realm).toString();
-  }
-
-  public String getSocialUrl() {
-    return AccountUrls.accountFederatedIdentityPage(baseQueryURI, realm).toString();
-  }
-
-  public String getTotpUrl() {
-    return AccountUrls.accountTotpPage(baseQueryURI, realm).toString();
-  }
-
-  public String getLogUrl() {
-    return AccountUrls.accountLogPage(baseQueryURI, realm).toString();
-  }
-
-  public String getSessionsUrl() {
-    return AccountUrls.accountSessionsPage(baseQueryURI, realm).toString();
-  }
-
-  public String getLogoutUrl() {
-    return AccountUrls.accountLogout(baseQueryURI, currentURI, realm, idTokenHint).toString();
-  }
-
-  public String getResourceUrl() {
-    return AccountUrls.accountResourcesPage(baseQueryURI, realm).toString();
-  }
-
-  public String getResourceDetailUrl(String id) {
-    return AccountUrls.accountResourceDetailPage(id, baseQueryURI, realm).toString();
-  }
-
-  public String getResourceGrant(String id) {
-    return AccountUrls.accountResourceGrant(id, baseQueryURI, realm).toString();
-  }
-
-  public String getResourceShare(String id) {
-    return AccountUrls.accountResourceShare(id, baseQueryURI, realm).toString();
-  }
-
-  public String getResourcesPath() {
-    URI uri = AccountUrls.themeRoot(baseURI);
-    return uri.getPath() + "/" + theme.getType().toString().toLowerCase() + "/" + theme.getName();
-  }
-
-  public String getResourcesCommonPath() {
-    URI uri = AccountUrls.themeRoot(baseURI);
-    String commonPath = "";
-    try {
-      commonPath = theme.getProperties().getProperty("import");
-    } catch (IOException ex) {
-      logger.warn("Failed to load properties", ex);
-    }
-    if (commonPath == null || commonPath.isEmpty()) {
-      commonPath = "/common/keycloak";
-    }
-    return uri.getPath() + "/" + commonPath;
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/services/AccountUrls.java

@@ -1,115 +0,0 @@
-package org.keycloak.services;
-
-import jakarta.ws.rs.core.UriBuilder;
-import java.net.URI;
-import lombok.extern.jbosslog.JBossLog;
-import org.keycloak.OAuth2Constants;
-import org.keycloak.protocol.oidc.OIDCLoginProtocol;
-import org.keycloak.protocol.oidc.OIDCLoginProtocolService;
-import org.keycloak.services.resources.LoginActionsService;
-import org.keycloak.services.resources.RealmsResource;
-import org.keycloak.services.resources.account.AccountFormService;
-
-@JBossLog
-public class AccountUrls extends Urls {
-
-  private static UriBuilder realmLogout(URI baseUri) {
-    return tokenBase(baseUri).path(OIDCLoginProtocolService.class, "logout");
-  }
-
-  public static UriBuilder accountBase(URI baseUri) {
-    return realmBase(baseUri).path(RealmsResource.class, "getAccountService");
-  }
-
-  private static UriBuilder tokenBase(URI baseUri) {
-    return realmBase(baseUri).path("{realm}/protocol/" + OIDCLoginProtocol.LOGIN_PROTOCOL);
-  }
-
-  public static URI accountApplicationsPage(URI baseUri, String realmName) {
-    return accountBase(baseUri).path(AccountFormService.class, "applicationsPage").build(realmName);
-  }
-
-  public static URI accountPage(URI baseUri, String realmName) {
-    return accountPageBuilder(baseUri).build(realmName);
-  }
-
-  public static UriBuilder accountPageBuilder(URI baseUri) {
-    return accountBase(baseUri).path(AccountFormService.class, "accountPage");
-  }
-
-  public static URI accountPasswordPage(URI baseUri, String realmName) {
-    return accountBase(baseUri).path(AccountFormService.class, "passwordPage").build(realmName);
-  }
-
-  public static URI accountFederatedIdentityPage(URI baseUri, String realmName) {
-    return accountBase(baseUri)
-        .path(AccountFormService.class, "federatedIdentityPage")
-        .build(realmName);
-  }
-
-  public static URI accountFederatedIdentityUpdate(URI baseUri, String realmName) {
-    return accountBase(baseUri)
-        .path(AccountFormService.class, "processFederatedIdentityUpdate")
-        .build(realmName);
-  }
-
-  public static URI accountTotpPage(URI baseUri, String realmName) {
-    return accountBase(baseUri).path(AccountFormService.class, "totpPage").build(realmName);
-  }
-
-  public static URI accountLogPage(URI baseUri, String realmName) {
-    return accountBase(baseUri).path(AccountFormService.class, "logPage").build(realmName);
-  }
-
-  public static URI accountSessionsPage(URI baseUri, String realmName) {
-    return accountBase(baseUri).path(AccountFormService.class, "sessionsPage").build(realmName);
-  }
-
-  public static URI accountLogout(
-      URI baseUri, URI redirectUri, String realmName, String idTokenHint) {
-    return realmLogout(baseUri)
-        .queryParam(OAuth2Constants.POST_LOGOUT_REDIRECT_URI, redirectUri)
-        .queryParam(OAuth2Constants.ID_TOKEN_HINT, idTokenHint)
-        .build(realmName);
-  }
-
-  public static URI accountResourcesPage(URI baseUri, String realmName) {
-    return accountBase(baseUri).path(AccountFormService.class, "resourcesPage").build(realmName);
-  }
-
-  public static URI accountResourceDetailPage(String resourceId, URI baseUri, String realmName) {
-    return accountBase(baseUri)
-        .path(AccountFormService.class, "resourceDetailPage")
-        .build(realmName, resourceId);
-  }
-
-  public static URI accountResourceGrant(String resourceId, URI baseUri, String realmName) {
-    return accountBase(baseUri)
-        .path(AccountFormService.class, "grantPermission")
-        .build(realmName, resourceId);
-  }
-
-  public static URI accountResourceShare(String resourceId, URI baseUri, String realmName) {
-    return accountBase(baseUri)
-        .path(AccountFormService.class, "shareResource")
-        .build(realmName, resourceId);
-  }
-
-  public static URI loginActionUpdatePassword(URI baseUri, String realmName) {
-    return loginActionsBase(baseUri)
-        .path(LoginActionsService.class, "updatePassword")
-        .build(realmName);
-  }
-
-  public static URI loginActionUpdateTotp(URI baseUri, String realmName) {
-    return loginActionsBase(baseUri).path(LoginActionsService.class, "updateTotp").build(realmName);
-  }
-
-  public static URI loginActionEmailVerification(URI baseUri, String realmName) {
-    return loginActionEmailVerificationBuilder(baseUri).build(realmName);
-  }
-
-  public static String localeCookiePath(URI baseUri, String realmName) {
-    return realmBase(baseUri).path(realmName).build().getRawPath();
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/account-v1-java/services/resources/account/AccountFormServiceFactory.java

@@ -1,64 +0,0 @@
-package org.keycloak.services.resources.account;
-
-import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import java.util.Map;
-import lombok.extern.jbosslog.JBossLog;
-import org.keycloak.Config.Scope;
-import org.keycloak.events.EventBuilder;
-import org.keycloak.models.ClientModel;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.KeycloakSessionFactory;
-import org.keycloak.models.ProtocolMapperModel;
-import org.keycloak.models.RealmModel;
-import org.keycloak.provider.ProviderEvent;
-import org.keycloak.services.resource.AccountResourceProvider;
-import org.keycloak.services.resource.AccountResourceProviderFactory;
-import jakarta.ws.rs.NotFoundException;
-import org.keycloak.models.Constants;
-
-@JBossLog
-@AutoService(AccountResourceProviderFactory.class)
-public class AccountFormServiceFactory implements AccountResourceProviderFactory {
-
-  public static final String ID = "account-v1";
-
-  @Override
-  public String getId() {
-    return ID;
-  }
-
-  private ClientModel getAccountManagementClient(RealmModel realm) {
-    ClientModel client = realm.getClientByClientId(Constants.ACCOUNT_MANAGEMENT_CLIENT_ID);
-    if (client == null || !client.isEnabled()) {
-      log.debug("account management not enabled");
-      throw new NotFoundException("account management not enabled");
-    }
-    return client;
-  }
-
-  @Override
-  public AccountResourceProvider create(KeycloakSession session) {
-    log.info("create");
-    RealmModel realm = session.getContext().getRealm();
-    ClientModel client = getAccountManagementClient(realm);
-    EventBuilder event = new EventBuilder​(realm, session, session.getContext().getConnection());
-    return new AccountFormService(session, client, event);
-  }
-
-  @Override
-  public void init(Scope config) {
-    log.info("init");
-  }
-
-  @Override
-  public void postInit(KeycloakSessionFactory factory) {
-    log.info("postInit");
-  }
-
-  @Override
-  public void close() {
-    log.info("close");
-  }
-}

src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts

@@ -1,249 +0,0 @@
-import * as fs from "fs";
-import { join as pathJoin, dirname as pathDirname, basename as pathBasename } from "path";
-import { assert } from "tsafe/assert";
-import { Reflect } from "tsafe/Reflect";
-import type { BuildOptions } from "../BuildOptions";
-import type { ThemeType } from "../generateFtl";
-import { downloadBuiltinKeycloakTheme } from "../../download-builtin-keycloak-theme";
-import { transformCodebase } from "../../tools/transformCodebase";
-
-export type BuildOptionsLike = {
-    themeName: string;
-    extraThemeNames: string[];
-    groupId: string;
-    artifactId: string;
-    themeVersion: string;
-};
-
-{
-    const buildOptions = Reflect<BuildOptions>();
-
-    assert<typeof buildOptions extends BuildOptionsLike ? true : false>();
-}
-
-export const accountV1Keycloak = "account-v1-keycloak";
-
-export async function generateJavaStackFiles(params: {
-    keycloakThemeBuildingDirPath: string;
-    implementedThemeTypes: Record<ThemeType | "email", boolean>;
-    buildOptions: BuildOptionsLike;
-}): Promise<{
-    jarFilePath: string;
-}> {
-    const {
-        buildOptions: { groupId, themeName, extraThemeNames, themeVersion, artifactId },
-        keycloakThemeBuildingDirPath,
-        implementedThemeTypes
-    } = params;
-
-    {
-        const { pomFileCode } = (function generatePomFileCode(): {
-            pomFileCode: string;
-        } {
-            const pomFileCode = [
-                `<?xml version="1.0"?>`,
-                `<project xmlns="http://maven.apache.org/POM/4.0.0"`,
-                `	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`,
-                `	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">`,
-                `	<modelVersion>4.0.0</modelVersion>`,
-                `	<groupId>${groupId}</groupId>`,
-                `	<artifactId>${artifactId}</artifactId>`,
-                `	<version>${themeVersion}</version>`,
-                `	<name>${artifactId}</name>`,
-                `	<description />`,
-                `	<packaging>jar</packaging>`,
-                `	<properties>`,
-                `	    <java.version>17</java.version>`,
-                `	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>`,
-                `	    <keycloak.version>999.0.0-SNAPSHOT</keycloak.version>`,
-                `	    <guava.version>32.0.0-jre</guava.version>`,
-                `	    <lombok.version>1.18.28</lombok.version>`,
-                `	    <auto-service.version>1.1.1</auto-service.version>`,
-                `	</properties>`,
-                `	<build>`,
-                `	    <plugins>`,
-                `	        <plugin>`,
-                `	            <artifactId>maven-compiler-plugin</artifactId>`,
-                `	            <version>3.11.0</version>`,
-                `	            <configuration>`,
-                `	                <source>\${java.version}</source>`,
-                `	                <target>\${java.version}</target>`,
-                `	                <compilerArgument>-Xlint:unchecked</compilerArgument>`,
-                `	                <compilerArgument>-Xlint:deprecation</compilerArgument>`,
-                `	                <useIncrementalCompilation>false</useIncrementalCompilation>`,
-                `	                <annotationProcessorPaths>`,
-                `	                    <path>`,
-                `	                        <groupId>com.google.auto.service</groupId>`,
-                `	                        <artifactId>auto-service</artifactId>`,
-                `	                        <version>\${auto-service.version}</version>`,
-                `	                    </path>`,
-                `	                    <path>`,
-                `	                        <groupId>org.projectlombok</groupId>`,
-                `	                        <artifactId>lombok</artifactId>`,
-                `	                        <version>\${lombok.version}</version>`,
-                `	                    </path>`,
-                `	                </annotationProcessorPaths>`,
-                `	            </configuration>`,
-                `	        </plugin>`,
-                `	        <plugin>`,
-                `	            <groupId>org.apache.maven.plugins</groupId>`,
-                `	            <artifactId>maven-jar-plugin</artifactId>`,
-                `	            <version>3.2.0</version>`,
-                `	            <configuration>`,
-                `	                <archive>`,
-                `	                    <manifestEntries>`,
-                `	                        <Dependencies>`,
-                `	                            <![CDATA[org.keycloak.keycloak-common,org.keycloak.keycloak-core,org.keycloak.keycloak-server-spi,org.keycloak.keycloak-server-spi-private,org.keycloak.keycloak-services,com.google.guava]]>`,
-                `	                        </Dependencies>`,
-                `	                    </manifestEntries>`,
-                `	                </archive>`,
-                `	            </configuration>`,
-                `	        </plugin>`,
-                `	        <plugin>`,
-                `	            <groupId>com.spotify.fmt</groupId>`,
-                `	            <artifactId>fmt-maven-plugin</artifactId>`,
-                `	            <version>2.20</version>`,
-                `	        </plugin>`,
-                `	    </plugins>`,
-                `	</build>`,
-                `	<dependencies>`,
-                `	    <dependency>`,
-                `	        <groupId>org.projectlombok</groupId>`,
-                `	        <artifactId>lombok</artifactId>`,
-                `	        <version>\${lombok.version}</version>`,
-                `	        <scope>provided</scope>`,
-                `	    </dependency>`,
-                `	    <dependency>`,
-                `	        <groupId>com.google.auto.service</groupId>`,
-                `	        <artifactId>auto-service</artifactId>`,
-                `	        <version>\${auto-service.version}</version>`,
-                `	        <scope>provided</scope>`,
-                `	    </dependency>`,
-                `	    <dependency>`,
-                `	        <groupId>org.keycloak</groupId>`,
-                `	        <artifactId>keycloak-server-spi</artifactId>`,
-                `	        <version>\${keycloak.version}</version>`,
-                `	        <scope>provided</scope>`,
-                `	    </dependency>`,
-                `	    <dependency>`,
-                `	        <groupId>org.keycloak</groupId>`,
-                `	        <artifactId>keycloak-server-spi-private</artifactId>`,
-                `	        <version>\${keycloak.version}</version>`,
-                `	        <scope>provided</scope>`,
-                `	    </dependency>`,
-                `	    <dependency>`,
-                `	        <groupId>org.keycloak</groupId>`,
-                `	        <artifactId>keycloak-services</artifactId>`,
-                `	        <version>\${keycloak.version}</version>`,
-                `	        <scope>provided</scope>`,
-                `	    </dependency>`,
-                `	    <dependency>`,
-                `	        <groupId>jakarta.ws.rs</groupId>`,
-                `	        <artifactId>jakarta.ws.rs-api</artifactId>`,
-                `	        <version>3.1.0</version>`,
-                `	        <scope>provided</scope>`,
-                `	    </dependency>`,
-                `	    <dependency>`,
-                `	        <groupId>com.google.guava</groupId>`,
-                `	        <artifactId>guava</artifactId>`,
-                `	        <version>\${guava.version}</version>`,
-                `	        <scope>provided</scope>`,
-                `	    </dependency>`,
-                `	</dependencies>`,
-                `</project>`
-            ].join("\n");
-
-            return { pomFileCode };
-        })();
-
-        fs.writeFileSync(pathJoin(keycloakThemeBuildingDirPath, "pom.xml"), Buffer.from(pomFileCode, "utf8"));
-    }
-
-    const accountV1 = "account-v1";
-
-    {
-        const builtinKeycloakThemeTmpDirPath = pathJoin(keycloakThemeBuildingDirPath, "..", "tmp_yxdE2_builtin_keycloak_theme");
-
-        await downloadBuiltinKeycloakTheme({
-            "destDirPath": builtinKeycloakThemeTmpDirPath,
-            "isSilent": true,
-            "keycloakVersion": "21.1.2"
-        });
-
-        transformCodebase({
-            "srcDirPath": pathJoin(builtinKeycloakThemeTmpDirPath, "base", "account"),
-            "destDirPath": pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme", accountV1, "account")
-        });
-
-        transformCodebase({
-            "srcDirPath": pathJoin(builtinKeycloakThemeTmpDirPath, "keycloak", "common"),
-            "destDirPath": pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme", accountV1Keycloak, "common")
-        });
-
-        transformCodebase({
-            "srcDirPath": pathJoin(builtinKeycloakThemeTmpDirPath, "keycloak", "account"),
-            "destDirPath": pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme", accountV1Keycloak, "account"),
-            "transformSourceCode": ({ sourceCode, filePath }) => {
-                if (pathBasename(filePath) === "theme.properties") {
-                    sourceCode = Buffer.from(sourceCode.toString("utf8").replace("parent=base", `parent=${accountV1}`), "utf8");
-                    sourceCode = Buffer.from(
-                        sourceCode.toString("utf8").replace("import=common/keycloak", `import=common/${accountV1Keycloak}`),
-                        "utf8"
-                    );
-                }
-
-                return {
-                    "modifiedSourceCode": sourceCode
-                };
-            }
-        });
-
-        fs.rmdirSync(builtinKeycloakThemeTmpDirPath, { "recursive": true });
-    }
-
-    transformCodebase({
-        "srcDirPath": pathJoin(__dirname, "account-v1-java"),
-        "destDirPath": pathJoin(keycloakThemeBuildingDirPath, "src", "main", "java", "org", "keycloak")
-    });
-
-    {
-        const themeManifestFilePath = pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "META-INF", "keycloak-themes.json");
-
-        try {
-            fs.mkdirSync(pathDirname(themeManifestFilePath));
-        } catch {}
-
-        fs.writeFileSync(
-            themeManifestFilePath,
-            Buffer.from(
-                JSON.stringify(
-                    {
-                        "themes": [
-                            {
-                                "name": "account-v1",
-                                "types": ["account"]
-                            },
-                            {
-                                "name": "account-v1-keycloak",
-                                "types": ["account"]
-                            },
-                            ...[themeName, ...extraThemeNames].map(themeName => ({
-                                "name": themeName,
-                                "types": Object.entries(implementedThemeTypes)
-                                    .filter(([, isImplemented]) => isImplemented)
-                                    .map(([themeType]) => themeType)
-                            }))
-                        ]
-                    },
-                    null,
-                    2
-                ),
-                "utf8"
-            )
-        );
-    }
-
-    return {
-        "jarFilePath": pathJoin(keycloakThemeBuildingDirPath, "target", `${artifactId}-${themeVersion}.jar`)
-    };
-}

src/bin/keycloakify/generateJavaStackFiles/index.ts

@@ -1 +0,0 @@
-export * from "./generateJavaStackFiles";

src/bin/keycloakify/generateStartKeycloakTestingContainer.ts

@@ -33,6 +33,7 @@ export function generateStartKeycloakTestingContainer(params: {
 
     fs.writeFileSync(
         pathJoin(keycloakThemeBuildingDirPath, generateStartKeycloakTestingContainer.basename),
+
         Buffer.from(
             [
                 "#!/usr/bin/env bash",
@@ -46,6 +47,7 @@ export function generateStartKeycloakTestingContainer(params: {
                 `   --name ${containerName} \\`,
                 "   -e KEYCLOAK_ADMIN=admin \\",
                 "   -e KEYCLOAK_ADMIN_PASSWORD=admin \\",
+                "   -e JAVA_OPTS=-Dkeycloak.profile=preview \\",
                 ...[themeName, ...extraThemeNames].map(
                     themeName =>
                         `   -v "${pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme", themeName).replace(
@@ -54,7 +56,7 @@ export function generateStartKeycloakTestingContainer(params: {
                         )}":"/opt/keycloak/themes/${themeName}":rw \\`
                 ),
                 `   -it quay.io/keycloak/keycloak:${keycloakVersion} \\`,
-                `   start-dev --features=declarative-user-profile`,
+                `   start-dev`,
                 ""
             ].join("\n"),
             "utf8"

src/bin/keycloakify/generateTheme/generateMessageProperties.ts

@@ -1,179 +0,0 @@
-import type { ThemeType } from "../generateFtl";
-import { crawl } from "../../tools/crawl";
-import { join as pathJoin } from "path";
-import { readFileSync } from "fs";
-import { symToStr } from "tsafe/symToStr";
-import { removeDuplicates } from "evt/tools/reducers/removeDuplicates";
-import * as recast from "recast";
-import * as babelParser from "@babel/parser";
-import babelGenerate from "@babel/generator";
-import * as babelTypes from "@babel/types";
-
-export function generateMessageProperties(params: {
-    themeSrcDirPath: string;
-    themeType: ThemeType;
-}): { languageTag: string; propertiesFileSource: string }[] {
-    const { themeSrcDirPath, themeType } = params;
-
-    let files = crawl({
-        "dirPath": pathJoin(themeSrcDirPath, themeType),
-        "returnedPathsType": "absolute"
-    });
-
-    files = files.filter(file => {
-        const regex = /\.(js|ts|tsx)$/;
-        return regex.test(file);
-    });
-
-    files = files.sort((a, b) => {
-        const regex = /\.i18n\.(ts|js|tsx)$/;
-        const aIsI18nFile = regex.test(a);
-        const bIsI18nFile = regex.test(b);
-        return aIsI18nFile === bIsI18nFile ? 0 : aIsI18nFile ? -1 : 1;
-    });
-
-    files = files.sort((a, b) => a.length - b.length);
-
-    files = files.filter(file => readFileSync(file).toString("utf8").includes("createUseI18n"));
-
-    if (files.length === 0) {
-        return [];
-    }
-
-    const extraMessages = files
-        .map(file => {
-            const root = recast.parse(readFileSync(file).toString("utf8"), {
-                "parser": {
-                    "parse": (code: string) => babelParser.parse(code, { "sourceType": "module", "plugins": ["typescript"] }),
-                    "generator": babelGenerate,
-                    "types": babelTypes
-                }
-            });
-
-            const codes: string[] = [];
-
-            recast.visit(root, {
-                "visitCallExpression": function (path) {
-                    if (path.node.callee.type === "Identifier" && path.node.callee.name === "createUseI18n") {
-                        codes.push(babelGenerate(path.node.arguments[0] as any).code);
-                    }
-                    this.traverse(path);
-                }
-            });
-
-            return codes;
-        })
-        .flat()
-        .map(code => {
-            let extraMessages: { [languageTag: string]: Record<string, string> } = {};
-
-            try {
-                eval(`${symToStr({ extraMessages })} = ${code}`);
-            } catch {
-                console.warn(
-                    [
-                        "WARNING: Make sure that the first argument of createUseI18n can be evaluated in a javascript",
-                        "runtime where only the node globals are available.",
-                        "This is important because we need to put your i18n messages in messages_*.properties files",
-                        "or they won't be available server side.",
-                        "\n",
-                        "The following code could not be evaluated:",
-                        "\n",
-                        code
-                    ].join(" ")
-                );
-            }
-
-            return extraMessages;
-        });
-
-    const languageTags = extraMessages
-        .map(extraMessage => Object.keys(extraMessage))
-        .flat()
-        .reduce(...removeDuplicates<string>());
-
-    const keyValueMapByLanguageTag: Record<string, Record<string, string>> = {};
-
-    for (const languageTag of languageTags) {
-        const keyValueMap: Record<string, string> = {};
-
-        for (const extraMessage of extraMessages) {
-            const keyValueMap_i = extraMessage[languageTag];
-
-            if (keyValueMap_i === undefined) {
-                continue;
-            }
-
-            for (const [key, value] of Object.entries(keyValueMap_i)) {
-                if (keyValueMap[key] !== undefined) {
-                    console.warn(
-                        [
-                            "WARNING: The following key is defined multiple times:",
-                            "\n",
-                            key,
-                            "\n",
-                            "The following value will be ignored:",
-                            "\n",
-                            value,
-                            "\n",
-                            "The following value was already defined:",
-                            "\n",
-                            keyValueMap[key]
-                        ].join(" ")
-                    );
-                    continue;
-                }
-
-                keyValueMap[key] = value;
-            }
-        }
-
-        keyValueMapByLanguageTag[languageTag] = keyValueMap;
-    }
-
-    const out: { languageTag: string; propertiesFileSource: string }[] = [];
-
-    for (const [languageTag, keyValueMap] of Object.entries(keyValueMapByLanguageTag)) {
-        const propertiesFileSource = Object.entries(keyValueMap)
-            .map(([key, value]) => `${key}=${escapeString(value)}`)
-            .join("\n");
-
-        out.push({
-            languageTag,
-            "propertiesFileSource": ["# This file was generated by keycloakify", "", "parent=base", "", propertiesFileSource, ""].join("\n")
-        });
-    }
-
-    return out;
-}
-
-// Convert a JavaScript string to UTF-16 encoding
-function toUTF16(codePoint: number): string {
-    if (codePoint <= 0xffff) {
-        // BMP character
-        return "\\u" + codePoint.toString(16).padStart(4, "0");
-    } else {
-        // Non-BMP character
-        codePoint -= 0x10000;
-        let highSurrogate = (codePoint >> 10) + 0xd800;
-        let lowSurrogate = (codePoint % 0x400) + 0xdc00;
-        return "\\u" + highSurrogate.toString(16).padStart(4, "0") + "\\u" + lowSurrogate.toString(16).padStart(4, "0");
-    }
-}
-
-// Escapes special characters and converts unicode to UTF-16 encoding
-function escapeString(str: string): string {
-    let escapedStr = "";
-    for (const char of [...str]) {
-        const codePoint = char.codePointAt(0);
-        if (!codePoint) continue;
-        if (char === "'") {
-            escapedStr += "''"; // double single quotes
-        } else if (codePoint > 0x7f) {
-            escapedStr += toUTF16(codePoint); // non-ascii characters
-        } else {
-            escapedStr += char;
-        }
-    }
-    return escapedStr;
-}

src/bin/keycloakify/generateTheme/generateTheme.ts

@@ -9,18 +9,17 @@ import { isInside } from "../../tools/isInside";
 import type { BuildOptions } from "../BuildOptions";
 import { assert } from "tsafe/assert";
 import { downloadKeycloakStaticResources } from "./downloadKeycloakStaticResources";
-import { readFieldNameUsage } from "./readFieldNameUsage";
-import { readExtraPagesNames } from "./readExtraPageNames";
-import { generateMessageProperties } from "./generateMessageProperties";
-import { accountV1Keycloak } from "../generateJavaStackFiles/generateJavaStackFiles";
 
 export type BuildOptionsLike = BuildOptionsLike.Standalone | BuildOptionsLike.ExternalAssets;
 
 export namespace BuildOptionsLike {
     export type Common = {
         themeName: string;
-        extraThemeProperties: string[] | undefined;
+        extraLoginPages?: string[];
+        extraAccountPages?: string[];
+        extraThemeProperties?: string[];
         isSilent: boolean;
+        customUserAttributes: string[];
         themeVersion: string;
         keycloakVersionDefaultAssets: string;
     };
@@ -54,12 +53,11 @@ assert<BuildOptions extends BuildOptionsLike ? true : false>();
 export async function generateTheme(params: {
     reactAppBuildDirPath: string;
     keycloakThemeBuildingDirPath: string;
-    themeSrcDirPath: string;
-    keycloakifySrcDirPath: string;
+    emailThemeSrcDirPath: string | undefined;
     buildOptions: BuildOptionsLike;
     keycloakifyVersion: string;
-}): Promise<void> {
-    const { reactAppBuildDirPath, keycloakThemeBuildingDirPath, themeSrcDirPath, keycloakifySrcDirPath, buildOptions, keycloakifyVersion } = params;
+}): Promise<{ doBundlesEmailTemplate: boolean }> {
+    const { reactAppBuildDirPath, keycloakThemeBuildingDirPath, emailThemeSrcDirPath, buildOptions, keycloakifyVersion } = params;
 
     const getThemeDirPath = (themeType: ThemeType | "email") =>
         pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme", buildOptions.themeName, themeType);
@@ -69,10 +67,6 @@ export async function generateTheme(params: {
     let generateFtlFilesCode_glob: ReturnType<typeof generateFtlFilesCodeFactory>["generateFtlFilesCode"] | undefined = undefined;
 
     for (const themeType of themeTypes) {
-        if (!fs.existsSync(pathJoin(themeSrcDirPath, themeType))) {
-            continue;
-        }
-
         const themeDirPath = getThemeDirPath(themeType);
 
         copy_app_resources_to_theme_path: {
@@ -138,21 +132,21 @@ export async function generateTheme(params: {
             });
         }
 
-        const generateFtlFilesCode =
-            generateFtlFilesCode_glob !== undefined
-                ? generateFtlFilesCode_glob
-                : generateFtlFilesCodeFactory({
-                      "indexHtmlCode": fs.readFileSync(pathJoin(reactAppBuildDirPath, "index.html")).toString("utf8"),
-                      "cssGlobalsToDefine": allCssGlobalsToDefine,
-                      buildOptions,
-                      keycloakifyVersion,
-                      themeType,
-                      "fieldNames": readFieldNameUsage({
-                          keycloakifySrcDirPath,
-                          themeSrcDirPath,
-                          themeType
-                      })
-                  }).generateFtlFilesCode;
+        const generateFtlFilesCode = (() => {
+            if (generateFtlFilesCode_glob !== undefined) {
+                return generateFtlFilesCode_glob;
+            }
+
+            const { generateFtlFilesCode } = generateFtlFilesCodeFactory({
+                "indexHtmlCode": fs.readFileSync(pathJoin(reactAppBuildDirPath, "index.html")).toString("utf8"),
+                "cssGlobalsToDefine": allCssGlobalsToDefine,
+                buildOptions,
+                keycloakifyVersion,
+                themeType
+            });
+
+            return generateFtlFilesCode;
+        })();
 
         [
             ...(() => {
@@ -163,10 +157,14 @@ export async function generateTheme(params: {
                         return accountThemePageIds;
                 }
             })(),
-            ...readExtraPagesNames({
-                themeType,
-                themeSrcDirPath
-            })
+            ...((() => {
+                switch (themeType) {
+                    case "login":
+                        return buildOptions.extraLoginPages;
+                    case "account":
+                        return buildOptions.extraAccountPages;
+                }
+            })() ?? [])
         ].forEach(pageId => {
             const { ftlCode } = generateFtlFilesCode({ pageId });
 
@@ -175,19 +173,6 @@ export async function generateTheme(params: {
             fs.writeFileSync(pathJoin(themeDirPath, pageId), Buffer.from(ftlCode, "utf8"));
         });
 
-        generateMessageProperties({
-            themeSrcDirPath,
-            themeType
-        }).forEach(({ languageTag, propertiesFileSource }) => {
-            const messagesDirPath = pathJoin(themeDirPath, "messages");
-
-            fs.mkdirSync(pathJoin(themeDirPath, "messages"), { "recursive": true });
-
-            const propertiesFilePath = pathJoin(messagesDirPath, `messages_${languageTag}.properties`);
-
-            fs.writeFileSync(propertiesFilePath, Buffer.from(propertiesFileSource, "utf8"));
-        });
-
         //TODO: Remove this block we left it for now only for backward compatibility
         // we now have a separate script for this
         copy_keycloak_resources_to_public: {
@@ -231,33 +216,25 @@ export async function generateTheme(params: {
 
         fs.writeFileSync(
             pathJoin(themeDirPath, "theme.properties"),
-            Buffer.from(
-                [
-                    `parent=${(() => {
-                        switch (themeType) {
-                            case "login":
-                                return "keycloak";
-                            case "account":
-                                return accountV1Keycloak;
-                        }
-                    })()}`,
-                    ...(buildOptions.extraThemeProperties ?? [])
-                ].join("\n\n"),
-                "utf8"
-            )
+            Buffer.from(["parent=keycloak", ...(buildOptions.extraThemeProperties ?? [])].join("\n\n"), "utf8")
         );
     }
 
-    email: {
-        const emailThemeSrcDirPath = pathJoin(themeSrcDirPath, "email");
+    let doBundlesEmailTemplate: boolean;
 
-        if (!fs.existsSync(emailThemeSrcDirPath)) {
+    email: {
+        if (emailThemeSrcDirPath === undefined) {
+            doBundlesEmailTemplate = false;
             break email;
         }
 
+        doBundlesEmailTemplate = true;
+
         transformCodebase({
             "srcDirPath": emailThemeSrcDirPath,
             "destDirPath": getThemeDirPath("email")
         });
     }
+
+    return { doBundlesEmailTemplate };
 }

src/bin/keycloakify/generateTheme/readExtraPageNames.ts

@@ -1,38 +0,0 @@
-import { crawl } from "../../tools/crawl";
-import { type ThemeType, accountThemePageIds, loginThemePageIds } from "../generateFtl";
-import { id } from "tsafe/id";
-import { removeDuplicates } from "evt/tools/reducers/removeDuplicates";
-import * as fs from "fs";
-import { join as pathJoin } from "path";
-
-export function readExtraPagesNames(params: { themeSrcDirPath: string; themeType: ThemeType }): string[] {
-    const { themeSrcDirPath, themeType } = params;
-
-    const filePaths = crawl({
-        "dirPath": pathJoin(themeSrcDirPath, themeType),
-        "returnedPathsType": "absolute"
-    }).filter(filePath => /\.(ts|tsx|js|jsx)$/.test(filePath));
-
-    const candidateFilePaths = filePaths.filter(filePath => /kcContext\.[^.]+$/.test(filePath));
-
-    if (candidateFilePaths.length === 0) {
-        candidateFilePaths.push(...filePaths);
-    }
-
-    const extraPages: string[] = [];
-
-    for (const candidateFilPath of candidateFilePaths) {
-        const rawSourceFile = fs.readFileSync(candidateFilPath).toString("utf8");
-
-        extraPages.push(...Array.from(rawSourceFile.matchAll(/["']?pageId["']?\s*:\s*["']([^.]+.ftl)["']/g), m => m[1]));
-    }
-
-    return extraPages.reduce(...removeDuplicates<string>()).filter(pageId => {
-        switch (themeType) {
-            case "account":
-                return !id<readonly string[]>(accountThemePageIds).includes(pageId);
-            case "login":
-                return !id<readonly string[]>(loginThemePageIds).includes(pageId);
-        }
-    });
-}

src/bin/keycloakify/generateTheme/readFieldNameUsage.ts

@@ -1,35 +0,0 @@
-import { crawl } from "../../tools/crawl";
-import { removeDuplicates } from "evt/tools/reducers/removeDuplicates";
-import { join as pathJoin } from "path";
-import * as fs from "fs";
-import type { ThemeType } from "../generateFtl";
-import { exclude } from "tsafe/exclude";
-
-/** Assumes the theme type exists */
-export function readFieldNameUsage(params: { keycloakifySrcDirPath: string; themeSrcDirPath: string; themeType: ThemeType }): string[] {
-    const { keycloakifySrcDirPath, themeSrcDirPath, themeType } = params;
-
-    const fieldNames: string[] = [];
-
-    for (const srcDirPath of ([pathJoin(keycloakifySrcDirPath, themeType), pathJoin(themeSrcDirPath, themeType)] as const).filter(
-        exclude(undefined)
-    )) {
-        const filePaths = crawl({ "dirPath": srcDirPath, "returnedPathsType": "absolute" }).filter(filePath => /\.(ts|tsx|js|jsx)$/.test(filePath));
-
-        for (const filePath of filePaths) {
-            const rawSourceFile = fs.readFileSync(filePath).toString("utf8");
-
-            if (!rawSourceFile.includes("messagesPerField")) {
-                continue;
-            }
-
-            fieldNames.push(
-                ...Array.from(rawSourceFile.matchAll(/(?:(?:printIfExists)|(?:existsError)|(?:get)|(?:exists))\(\s*["']([^"']+)["']/g), m => m[1])
-            );
-        }
-    }
-
-    const out = fieldNames.reduce(...removeDuplicates<string>());
-
-    return out;
-}

src/bin/keycloakify/keycloakify.ts

@@ -9,9 +9,8 @@ import { getLogger } from "../tools/logger";
 import jar from "../tools/jar";
 import { assert } from "tsafe/assert";
 import { Equals } from "tsafe";
-import { getThemeSrcDirPath } from "../getSrcDirPath";
+import { getEmailThemeSrcDirPath } from "../getSrcDirPath";
 import { getProjectRoot } from "../tools/getProjectRoot";
-import { objectKeys } from "tsafe/objectKeys";
 
 export async function main() {
     const projectDirPath = process.cwd();
@@ -24,48 +23,42 @@ export async function main() {
     const logger = getLogger({ "isSilent": buildOptions.isSilent });
     logger.log("🔏 Building the keycloak theme...⌚");
 
-    const keycloakifyDirPath = getProjectRoot();
-
-    const { themeSrcDirPath } = getThemeSrcDirPath({ projectDirPath });
+    let doBundlesEmailTemplate: boolean | undefined;
 
     for (const themeName of [buildOptions.themeName, ...buildOptions.extraThemeNames]) {
-        await generateTheme({
-            "keycloakThemeBuildingDirPath": buildOptions.keycloakifyBuildDirPath,
-            themeSrcDirPath,
-            "keycloakifySrcDirPath": pathJoin(keycloakifyDirPath, "src"),
+        const { doBundlesEmailTemplate: doBundlesEmailTemplate_ } = await generateTheme({
+            keycloakThemeBuildingDirPath: buildOptions.keycloakifyBuildDirPath,
+            "emailThemeSrcDirPath": (() => {
+                const { emailThemeSrcDirPath } = getEmailThemeSrcDirPath({ projectDirPath });
+
+                if (emailThemeSrcDirPath === undefined || !fs.existsSync(emailThemeSrcDirPath)) {
+                    return;
+                }
+
+                return emailThemeSrcDirPath;
+            })(),
             "reactAppBuildDirPath": buildOptions.reactAppBuildDirPath,
             "buildOptions": {
                 ...buildOptions,
                 "themeName": themeName
             },
             "keycloakifyVersion": (() => {
-                const version = JSON.parse(fs.readFileSync(pathJoin(keycloakifyDirPath, "package.json")).toString("utf8"))["version"];
+                const version = JSON.parse(fs.readFileSync(pathJoin(getProjectRoot(), "package.json")).toString("utf8"))["version"];
 
                 assert(typeof version === "string");
 
                 return version;
             })()
         });
+
+        doBundlesEmailTemplate ??= doBundlesEmailTemplate_;
     }
 
-    const { jarFilePath } = await generateJavaStackFiles({
-        "keycloakThemeBuildingDirPath": buildOptions.keycloakifyBuildDirPath,
-        "implementedThemeTypes": (() => {
-            const implementedThemeTypes = {
-                "login": false,
-                "account": false,
-                "email": false
-            };
+    assert(doBundlesEmailTemplate !== undefined);
 
-            for (const themeType of objectKeys(implementedThemeTypes)) {
-                if (!fs.existsSync(pathJoin(themeSrcDirPath, themeType))) {
-                    continue;
-                }
-                implementedThemeTypes[themeType] = true;
-            }
-
-            return implementedThemeTypes;
-        })(),
+    const { jarFilePath } = generateJavaStackFiles({
+        keycloakThemeBuildingDirPath: buildOptions.keycloakifyBuildDirPath,
+        doBundlesEmailTemplate,
         buildOptions
     });
 
@@ -92,7 +85,7 @@ export async function main() {
     }
 
     // We want, however, to test in a container running the latest Keycloak version
-    const containerKeycloakVersion = "21.1.2";
+    const containerKeycloakVersion = "20.0.1";
 
     generateStartKeycloakTestingContainer({
         keycloakThemeBuildingDirPath: buildOptions.keycloakifyBuildDirPath,

src/bin/keycloakify/parsedPackageJson.ts

@@ -11,6 +11,10 @@ export type ParsedPackageJson = {
     version?: string;
     homepage?: string;
     keycloakify?: {
+        /** @deprecated: use extraLoginPages instead */
+        extraPages?: string[];
+        extraLoginPages?: string[];
+        extraAccountPages?: string[];
         extraThemeProperties?: string[];
         areAppAndKeycloakServerSharingSameDomain?: boolean;
         artifactId?: string;
@@ -19,6 +23,7 @@ export type ParsedPackageJson = {
         keycloakVersionDefaultAssets?: string;
         reactAppBuildDirPath?: string;
         keycloakifyBuildDirPath?: string;
+        customUserAttributes?: string[];
         themeName?: string;
         extraThemeNames?: string[];
     };
@@ -30,6 +35,9 @@ export const zParsedPackageJson = z.object({
     "homepage": z.string().optional(),
     "keycloakify": z
         .object({
+            "extraPages": z.array(z.string()).optional(),
+            "extraLoginPages": z.array(z.string()).optional(),
+            "extraAccountPages": z.array(z.string()).optional(),
             "extraThemeProperties": z.array(z.string()).optional(),
             "areAppAndKeycloakServerSharingSameDomain": z.boolean().optional(),
             "artifactId": z.string().optional(),
@@ -38,6 +46,7 @@ export const zParsedPackageJson = z.object({
             "keycloakVersionDefaultAssets": z.string().optional(),
             "reactAppBuildDirPath": z.string().optional(),
             "keycloakifyBuildDirPath": z.string().optional(),
+            "customUserAttributes": z.array(z.string()).optional(),
             "themeName": z.string().optional(),
             "extraThemeNames": z.array(z.string()).optional()
         })

src/bin/tools/crawl.ts

@@ -1,32 +1,27 @@
 import * as fs from "fs";
 import * as path from "path";
 
-const crawlRec = (dir_path: string, paths: string[]) => {
-    for (const file_name of fs.readdirSync(dir_path)) {
-        const file_path = path.join(dir_path, file_name);
-
-        if (fs.lstatSync(file_path).isDirectory()) {
-            crawlRec(file_path, paths);
-
-            continue;
-        }
-
-        paths.push(file_path);
-    }
-};
-
 /** List all files in a given directory return paths relative to the dir_path */
-export function crawl(params: { dirPath: string; returnedPathsType: "absolute" | "relative to dirPath" }): string[] {
-    const { dirPath, returnedPathsType } = params;
+export const crawl = (() => {
+    const crawlRec = (dir_path: string, paths: string[]) => {
+        for (const file_name of fs.readdirSync(dir_path)) {
+            const file_path = path.join(dir_path, file_name);
 
-    const filePaths: string[] = [];
+            if (fs.lstatSync(file_path).isDirectory()) {
+                crawlRec(file_path, paths);
 
-    crawlRec(dirPath, filePaths);
+                continue;
+            }
 
-    switch (returnedPathsType) {
-        case "absolute":
-            return filePaths;
-        case "relative to dirPath":
-            return filePaths.map(filePath => path.relative(dirPath, filePath));
-    }
-}
+            paths.push(file_path);
+        }
+    };
+
+    return function crawl(dir_path: string): string[] {
+        const paths: string[] = [];
+
+        crawlRec(dir_path, paths);
+
+        return paths.map(file_path => path.relative(dir_path, file_path));
+    };
+})();

src/bin/tools/downloadAndUnzip.ts

@@ -2,8 +2,8 @@ import { exec as execCallback } from "child_process";
 import { createHash } from "crypto";
 import { mkdir, readFile, stat, writeFile } from "fs/promises";
 import fetch, { type FetchOptions } from "make-fetch-happen";
-import { dirname as pathDirname, join as pathJoin, resolve as pathResolve, sep as pathSep } from "path";
-import { assert } from "tsafe/assert";
+import { dirname as pathDirname, join as pathJoin } from "path";
+import { assert } from "tsafe";
 import { promisify } from "util";
 import { getProjectRoot } from "./getProjectRoot";
 import { transformCodebase } from "./transformCodebase";
@@ -48,28 +48,9 @@ async function getNmpConfig() {
     return readNpmConfig().then(parseNpmConfig);
 }
 
-function readNpmConfig(): Promise<string> {
-    return (async function callee(depth: number): Promise<string> {
-        const cwd = pathResolve(pathJoin(...[process.cwd(), ...Array(depth).fill("..")]));
-
-        let stdout: string;
-
-        try {
-            stdout = await exec("npm config get", { "encoding": "utf8", cwd }).then(({ stdout }) => stdout);
-        } catch (error) {
-            console.log(String(error), error);
-
-            if (String(error).includes("ENOWORKSPACES")) {
-                assert(cwd !== pathSep);
-
-                return callee(depth + 1);
-            }
-
-            throw error;
-        }
-
-        return stdout;
-    })(0);
+async function readNpmConfig() {
+    const { stdout } = await exec("npm config get", { encoding: "utf8" });
+    return stdout;
 }
 
 function parseNpmConfig(stdout: string) {

src/bin/tools/transformCodebase.ts

@@ -20,12 +20,12 @@ export function transformCodebase(params: { srcDirPath: string; destDirPath: str
         }))
     } = params;
 
-    for (const file_relative_path of crawl({ "dirPath": srcDirPath, "returnedPathsType": "relative to dirPath" })) {
+    for (const file_relative_path of crawl(srcDirPath)) {
         const filePath = path.join(srcDirPath, file_relative_path);
 
         const transformSourceCodeResult = transformSourceCode({
             "sourceCode": fs.readFileSync(filePath),
-            filePath
+            "filePath": path.join(srcDirPath, file_relative_path)
         });
 
         if (transformSourceCodeResult === undefined) {

src/login/i18n/i18n.tsx

@@ -211,8 +211,7 @@ const keycloakifyExtraMessages = {
         "shouldBeDifferent": "{0} should be different to {1}",
         "shouldMatchPattern": "Pattern should match: `/{0}/`",
         "mustBeAnInteger": "Must be an integer",
-        "notAValidOption": "Not a valid option",
-        "selectAnOption": "Select an option"
+        "notAValidOption": "Not a valid option"
     },
     "fr": {
         /* spell-checker: disable */
@@ -224,8 +223,7 @@ const keycloakifyExtraMessages = {
 
         "logoutConfirmTitle": "Déconnexion",
         "logoutConfirmHeader": "Êtes-vous sûr(e) de vouloir vous déconnecter ?",
-        "doLogout": "Se déconnecter",
-        "selectAnOption": "Sélectionner une option"
+        "doLogout": "Se déconnecter"
         /* spell-checker: enable */
     }
 };

src/login/index.ts

@@ -5,7 +5,6 @@ export default Fallback;
 export { useDownloadTerms } from "keycloakify/login/lib/useDownloadTerms";
 export { getKcContext } from "keycloakify/login/kcContext/getKcContext";
 export { createGetKcContext } from "keycloakify/login/kcContext/createGetKcContext";
-export type { LoginThemePageId as PageId } from "keycloakify/bin/keycloakify/generateFtl";
 export { createUseI18n } from "keycloakify/login/i18n/i18n";
 
 export type { PageProps } from "keycloakify/login/pages/PageProps";

src/login/kcContext/KcContext.ts

@@ -81,34 +81,9 @@ export declare namespace KcContext {
         };
         isAppInitiatedAction: boolean;
         messagesPerField: {
-            /**
-             * Return text if message for given field exists. Useful eg. to add css styles for fields with message.
-             *
-             * @param fieldName to check for
-             * @param text to return
-             * @return text if message exists for given field, else undefined
-             */
-            printIfExists: <T extends string>(fieldName: string, text: T) => T | undefined;
-            /**
-             * Check if exists error message for given fields
-             *
-             * @param fields
-             * @return boolean
-             */
+            printIfExists: <T>(fieldName: string, x: T) => T | undefined;
             existsError: (fieldName: string) => boolean;
-            /**
-             * Get message for given field.
-             *
-             * @param fieldName
-             * @return message text or empty string
-             */
             get: (fieldName: string) => string;
-            /**
-             * Check if message for given field exists
-             *
-             * @param field
-             * @return boolean
-             */
             exists: (fieldName: string) => boolean;
         };
     };

src/login/kcContext/kcContextMocks.ts

@@ -6,7 +6,7 @@ import { id } from "tsafe/id";
 import { assert, type Equals } from "tsafe/assert";
 import type { LoginThemePageId } from "keycloakify/bin/keycloakify/generateFtl";
 
-const PUBLIC_URL = (typeof process !== "object" ? undefined : process.env?.["PUBLIC_URL"]) || "/";
+const PUBLIC_URL = process.env["PUBLIC_URL"] ?? "/";
 
 const attributes: Attribute[] = [
     {

src/login/lib/useFormValidation.tsx

@@ -25,7 +25,16 @@ export function useFormValidation(params: {
     passwordValidators?: Validators;
     i18n: I18n;
 }) {
-    const { kcContext, passwordValidators = {}, i18n } = params;
+    const {
+        kcContext,
+        passwordValidators = {
+            "length": {
+                "ignore.empty.value": true,
+                "min": "4"
+            }
+        },
+        i18n
+    } = params;
 
     const attributesWithPassword = useMemo(
         () =>
@@ -202,7 +211,7 @@ function useGetErrors(params: {
         const { value: defaultValue, validators } = attributes.find(attribute => attribute.name === name)!;
 
         block: {
-            if ((defaultValue ?? "") !== value) {
+            if (defaultValue !== value) {
                 break block;
             }
 

src/login/pages/LoginUpdatePassword.tsx

@@ -123,7 +123,7 @@ export default function LoginUpdatePassword(props: PageProps<Extract<KcContext,
                                     getClassName("kcButtonLargeClass")
                                 )}
                                 type="submit"
-                                value={msgStr("doSubmit")}
+                                defaultValue={msgStr("doSubmit")}
                             />
                         )}
                     </div>

src/login/pages/shared/UserProfileFormFields.tsx

@@ -17,7 +17,7 @@ export type UserProfileFormFieldsProps = {
 export function UserProfileFormFields(props: UserProfileFormFieldsProps) {
     const { kcContext, onIsFormSubmittableValueChange, i18n, getClassName, BeforeField, AfterField } = props;
 
-    const { advancedMsg, msg } = i18n;
+    const { advancedMsg } = i18n;
 
     const {
         formValidationState: { fieldStateByAttributeName, isFormSubmittable },
@@ -98,16 +98,11 @@ export function UserProfileFormFields(props: UserProfileFormFieldsProps) {
                                                 }
                                                 value={value}
                                             >
-                                                <>
-                                                    <option value="" selected disabled hidden>
-                                                        {msg("selectAnOption")}
+                                                {options.options.map(option => (
+                                                    <option key={option} value={option}>
+                                                        {option}
                                                     </option>
-                                                    {options.options.map(option => (
-                                                        <option key={option} value={option}>
-                                                            {option}
-                                                        </option>
-                                                    ))}
-                                                </>
+                                                ))}
                                             </select>
                                         );
                                     }

test/bin/tools/crawl.spec.ts

@@ -1,68 +0,0 @@
-import path from "path";
-import { it, describe, expect, vi, beforeAll, afterAll } from "vitest";
-import { crawl } from "keycloakify/bin/tools/crawl";
-
-describe("crawl", () => {
-    describe("crawRec", () => {
-        beforeAll(() => {
-            vi.mock("node:fs", async () => {
-                const mod = await vi.importActual<typeof import("fs")>("fs");
-                return {
-                    ...mod,
-                    readdirSync: vi.fn().mockImplementation((dir_path: string) => {
-                        switch (dir_path) {
-                            case "root_dir":
-                                return ["sub_1_dir", "file_1", "sub_2_dir", "file_2"];
-                            case path.join("root_dir", "sub_1_dir"):
-                                return ["file_3", "sub_3_dir", "file_4"];
-                            case path.join("root_dir", "sub_1_dir", "sub_3_dir"):
-                                return ["file_5"];
-                            case path.join("root_dir", "sub_2_dir"):
-                                return [];
-                            default: {
-                                const enoent = new Error(`ENOENT: no such file or directory, scandir '${dir_path}'`);
-                                // @ts-ignore
-                                enoent.code = "ENOENT";
-                                // @ts-ignore
-                                enoent.syscall = "open";
-                                // @ts-ignore
-                                enoent.path = dir_path;
-                                throw enoent;
-                            }
-                        }
-                    }),
-                    lstatSync: vi.fn().mockImplementation((file_path: string) => {
-                        return { isDirectory: () => file_path.endsWith("_dir") };
-                    })
-                };
-            });
-        });
-        afterAll(() => {
-            vi.resetAllMocks();
-        });
-        it("returns files under a given dir_path", async () => {
-            const paths = crawl({ "dirPath": "root_dir/sub_1_dir/sub_3_dir", "returnedPathsType": "absolute" });
-            expect(paths).toEqual(["root_dir/sub_1_dir/sub_3_dir/file_5"]);
-        });
-        it("returns files recursively under a given dir_path", async () => {
-            const paths = crawl({ "dirPath": "root_dir", "returnedPathsType": "absolute" });
-            expect(paths).toEqual([
-                "root_dir/sub_1_dir/file_3",
-                "root_dir/sub_1_dir/sub_3_dir/file_5",
-                "root_dir/sub_1_dir/file_4",
-                "root_dir/file_1",
-                "root_dir/file_2"
-            ]);
-        });
-        it("throw dir_path does not exist", async () => {
-            try {
-                crawl({ "dirPath": "404", "returnedPathsType": "absolute" });
-            } catch {
-                expect(true);
-                return;
-            }
-
-            expect(false);
-        });
-    });
-});

yarn.lock

@@ -75,16 +75,6 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.22.9":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d"
-  integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==
-  dependencies:
-    "@babel/types" "^7.22.5"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
@@ -279,21 +269,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
   integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
-"@babel/helper-string-parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
-  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
-
 "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
-"@babel/helper-validator-identifier@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
-  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
-
 "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
@@ -332,11 +312,6 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
   integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
 
-"@babel/parser@^7.22.7":
-  version "7.22.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae"
-  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
-
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -1145,15 +1120,6 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
-  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
-  dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
-    to-fast-properties "^2.0.0"
-
 "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.2.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.4.4":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4"
@@ -2797,13 +2763,6 @@
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc"
   integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==
 
-"@types/babel__generator@^7.6.4":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7"
-  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
 "@types/chai-subset@^1.3.3":
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.3.tgz#97893814e92abd2c534de422cb377e0e0bdaac94"
@@ -3857,16 +3816,6 @@ assert@^1.1.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
-assert@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
-  integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
-  dependencies:
-    es6-object-assign "^1.1.0"
-    is-nan "^1.2.1"
-    object-is "^1.0.1"
-    util "^0.12.0"
-
 assertion-error@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
@@ -3884,13 +3833,6 @@ ast-types@^0.14.2:
   dependencies:
     tslib "^2.0.1"
 
-ast-types@^0.16.1:
-  version "0.16.1"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.16.1.tgz#7a9da1617c9081bc121faafe91711b4c8bb81da2"
-  integrity sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==
-  dependencies:
-    tslib "^2.0.1"
-
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -5797,11 +5739,6 @@ es6-iterator@^2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-object-assign@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
-  integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==
-
 es6-shim@^0.35.5:
   version "0.35.8"
   resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.8.tgz#89216f6fbf8bacba3f897c8c0e814d2a41c05fb7"
@@ -5916,7 +5853,7 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc"
   integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
 
-esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
+esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -7240,7 +7177,7 @@ is-alphanumerical@^1.0.0:
     is-alphabetical "^1.0.0"
     is-decimal "^1.0.0"
 
-is-arguments@^1.0.4, is-arguments@^1.1.1:
+is-arguments@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
   integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
@@ -7414,13 +7351,6 @@ is-function@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
   integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
 
-is-generator-function@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
-  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
 is-glob@^3.0.0, is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -7450,14 +7380,6 @@ is-map@^2.0.1, is-map@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
   integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
-is-nan@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
-  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -7574,13 +7496,6 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.9:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
-is-typed-array@^1.1.3:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
-  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
-  dependencies:
-    which-typed-array "^1.1.11"
-
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -8854,7 +8769,7 @@ object-inspect@^1.12.3, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
   integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
-object-is@^1.0.1, object-is@^1.1.5:
+object-is@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
   integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
@@ -10001,17 +9916,6 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-recast@^0.23.3:
-  version "0.23.3"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.3.tgz#f205d1f46b2c6f730de413ab18f96c166263d85f"
-  integrity sha512-HbCVFh2ANP6a09nzD4lx7XthsxMOJWKX5pIcUwtLrmeEIl3I0DwjCoVXDE0Aobk+7k/mS3H50FK4iuYArpcT6Q==
-  dependencies:
-    assert "^2.0.0"
-    ast-types "^0.16.1"
-    esprima "~4.0.0"
-    source-map "~0.6.1"
-    tslib "^2.0.1"
-
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -11846,17 +11750,6 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
-util@^0.12.0:
-  version "0.12.5"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
-  integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
-  dependencies:
-    inherits "^2.0.3"
-    is-arguments "^1.0.4"
-    is-generator-function "^1.0.7"
-    is-typed-array "^1.1.3"
-    which-typed-array "^1.1.2"
-
 utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
@@ -12192,17 +12085,6 @@ which-pm-runs@^1.0.0:
   resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.1.0.tgz#35ccf7b1a0fce87bd8b92a478c9d045785d3bf35"
   integrity sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==
 
-which-typed-array@^1.1.11, which-typed-array@^1.1.2:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
-  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
-  dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
-
 which-typed-array@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"