keycloakify 10.0.0-rc.64 → 10.0.0-rc.66

package/bin/main.js

@@ -7666,7 +7666,7 @@ var _DefaultRenderer = class _DefaultRenderer {
   async render() {
     const { createLogUpdate } = await Promise.all(/* import() */[__nccwpck_require__.e(509), __nccwpck_require__.e(772)]).then(__nccwpck_require__.bind(__nccwpck_require__, 41772));
     const { default: truncate } = await Promise.all(/* import() */[__nccwpck_require__.e(509), __nccwpck_require__.e(420)]).then(__nccwpck_require__.bind(__nccwpck_require__, 32420));
-    const { default: wrap } = await Promise.all(/* import() */[__nccwpck_require__.e(509), __nccwpck_require__.e(480)]).then(__nccwpck_require__.bind(__nccwpck_require__, 19246));
+    const { default: wrap } = await Promise.all(/* import() */[__nccwpck_require__.e(509), __nccwpck_require__.e(246)]).then(__nccwpck_require__.bind(__nccwpck_require__, 19246));
     this.updater = createLogUpdate(this.logger.process.stdout);
     this.truncate = truncate;
     this.wrap = wrap;
@@ -9213,7 +9213,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(890), __nccwpck_require__.e(818), __nccwpck_require__.e(430), __nccwpck_require__.e(525), __nccwpck_require__.e(246), __nccwpck_require__.e(240), __nccwpck_require__.e(363)]).then(__nccwpck_require__.bind(__nccwpck_require__, 52363));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(456), __nccwpck_require__.e(430), __nccwpck_require__.e(525), __nccwpck_require__.e(490), __nccwpck_require__.e(751), __nccwpck_require__.e(837), __nccwpck_require__.e(363)]).then(__nccwpck_require__.bind(__nccwpck_require__, 52363));
         await command({ cliCommandOptions });
     }
 });
@@ -9261,7 +9261,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(890), __nccwpck_require__.e(818), __nccwpck_require__.e(430), __nccwpck_require__.e(180), __nccwpck_require__.e(36), __nccwpck_require__.e(240), __nccwpck_require__.e(526)]).then(__nccwpck_require__.bind(__nccwpck_require__, 80526));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(456), __nccwpck_require__.e(430), __nccwpck_require__.e(180), __nccwpck_require__.e(36), __nccwpck_require__.e(751), __nccwpck_require__.e(526)]).then(__nccwpck_require__.bind(__nccwpck_require__, 80526));
         await command({ cliCommandOptions });
     }
 });
@@ -9273,7 +9273,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(890), __nccwpck_require__.e(818), __nccwpck_require__.e(827), __nccwpck_require__.e(453)]).then(__nccwpck_require__.bind(__nccwpck_require__, 93453));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(456), __nccwpck_require__.e(751), __nccwpck_require__.e(453)]).then(__nccwpck_require__.bind(__nccwpck_require__, 93453));
         await command({ cliCommandOptions });
     }
 });
@@ -9285,7 +9285,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(890), __nccwpck_require__.e(818), __nccwpck_require__.e(827), __nccwpck_require__.e(97)]).then(__nccwpck_require__.bind(__nccwpck_require__, 98097));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(456), __nccwpck_require__.e(751), __nccwpck_require__.e(97)]).then(__nccwpck_require__.bind(__nccwpck_require__, 98097));
         await command({ cliCommandOptions });
     }
 });
@@ -9297,7 +9297,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(890), __nccwpck_require__.e(818), __nccwpck_require__.e(430), __nccwpck_require__.e(525), __nccwpck_require__.e(180), __nccwpck_require__.e(240), __nccwpck_require__.e(932)]).then(__nccwpck_require__.bind(__nccwpck_require__, 16932));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(456), __nccwpck_require__.e(430), __nccwpck_require__.e(525), __nccwpck_require__.e(180), __nccwpck_require__.e(751), __nccwpck_require__.e(837), __nccwpck_require__.e(932)]).then(__nccwpck_require__.bind(__nccwpck_require__, 16932));
         await command({ cliCommandOptions });
     }
 });
@@ -9309,7 +9309,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(890), __nccwpck_require__.e(430), __nccwpck_require__.e(525), __nccwpck_require__.e(240), __nccwpck_require__.e(193)]).then(__nccwpck_require__.bind(__nccwpck_require__, 23193));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(456), __nccwpck_require__.e(430), __nccwpck_require__.e(525), __nccwpck_require__.e(751), __nccwpck_require__.e(837), __nccwpck_require__.e(193)]).then(__nccwpck_require__.bind(__nccwpck_require__, 23193));
         await command({ cliCommandOptions });
     }
 });
@@ -9321,7 +9321,7 @@ program
     .task({
     skip,
     handler: async (cliCommandOptions) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(890), __nccwpck_require__.e(818), __nccwpck_require__.e(538)]).then(__nccwpck_require__.bind(__nccwpck_require__, 1538));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(456), __nccwpck_require__.e(751), __nccwpck_require__.e(538)]).then(__nccwpck_require__.bind(__nccwpck_require__, 1538));
         await command({ cliCommandOptions });
     }
 });

package/bin/shared/buildContext.d.ts

@@ -1,4 +1,6 @@
 import type { CliCommandOptions } from "../main";
+import type { KeycloakVersionRange } from "./KeycloakVersionRange";
+import { type ThemeType } from "./constants";
 export type BuildContext = {
     bundler: "vite" | "webpack";
     themeVersion: string;
@@ -23,6 +25,12 @@ export type BuildContext = {
         name: string;
         default: string;
     }[];
+    themeSrcDirPath: string;
+    recordIsImplementedByThemeType: Readonly<Record<ThemeType | "email", boolean>>;
+    jarTargets: {
+        keycloakVersionRange: KeycloakVersionRange;
+        jarFileBasename: string;
+    }[];
 };
 export type BuildOptions = {
     themeName?: string | string[];
@@ -36,7 +44,15 @@ export type BuildOptions = {
     loginThemeResourcesFromKeycloakVersion?: string;
     keycloakifyBuildDirPath?: string;
     kcContextExclusionsFtl?: string;
+    keycloakVersionTargets?: BuildOptions.KeycloakVersionTargets;
 };
+export declare namespace BuildOptions {
+    type KeycloakVersionTargets = ({
+        hasAccountTheme: true;
+    } & Record<KeycloakVersionRange.WithAccountTheme, string | boolean>) | ({
+        hasAccountTheme: false;
+    } & Record<KeycloakVersionRange.WithoutAccountTheme, string | boolean>);
+}
 export type ResolvedViteConfig = {
     buildDir: string;
     publicDir: string;

package/bin/shared/constants.d.ts

@@ -10,7 +10,7 @@ export declare const vitePluginSubScriptEnvNames: {
     readonly runPostBuildScript: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT";
     readonly resolveViteConfig: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG";
 };
-export declare const onlyBuildJarFileBasenameEnvName = "KEYCLOAKIFY_ONLY_BUILD_JAR_FILE_BASENAME";
+export declare const buildForKeycloakMajorVersionEnvName = "KEYCLOAKIFY_BUILD_FOR_KEYCLOAK_MAJOR_VERSION";
 export declare const loginThemePageIds: readonly ["login.ftl", "login-username.ftl", "login-password.ftl", "webauthn-authenticate.ftl", "webauthn-register.ftl", "register.ftl", "info.ftl", "error.ftl", "login-reset-password.ftl", "login-verify-email.ftl", "terms.ftl", "login-oauth2-device-verify-user-code.ftl", "login-oauth-grant.ftl", "login-otp.ftl", "login-update-profile.ftl", "login-update-password.ftl", "login-idp-link-confirm.ftl", "login-idp-link-email.ftl", "login-page-expired.ftl", "login-config-totp.ftl", "logout-confirm.ftl", "idp-review-user-profile.ftl", "update-email.ftl", "select-authenticator.ftl", "saml-post-form.ftl", "delete-credential.ftl", "code.ftl", "delete-account-confirm.ftl", "frontchannel-logout.ftl", "login-recovery-authn-code-config.ftl", "login-recovery-authn-code-input.ftl", "login-reset-otp.ftl", "login-x509-info.ftl", "webauthn-error.ftl"];
 export declare const accountThemePageIds: readonly ["password.ftl", "account.ftl", "sessions.ftl", "totp.ftl", "applications.ftl", "log.ftl", "federatedIdentity.ftl"];
 export type LoginThemePageId = (typeof loginThemePageIds)[number];

package/bin/shared/constants.js

@@ -9,7 +9,7 @@ export const vitePluginSubScriptEnvNames = {
     runPostBuildScript: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
     resolveViteConfig: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
 };
-export const onlyBuildJarFileBasenameEnvName = "KEYCLOAKIFY_ONLY_BUILD_JAR_FILE_BASENAME";
+export const buildForKeycloakMajorVersionEnvName = "KEYCLOAKIFY_BUILD_FOR_KEYCLOAK_MAJOR_VERSION";
 export const loginThemePageIds = [
     "login.ftl",
     "login-username.ftl",

package/bin/shared/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/bin/shared/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,sDAAsD,GAC/D,yCAAyC,CAAC;AAC9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AACnD,MAAM,CAAC,MAAM,gCAAgC,GAAG,QAAQ,CAAC;AACzD,MAAM,CAAC,MAAM,oCAAoC,GAAG,OAAO,CAAC;AAE5D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;AACxD,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAI/C,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACvC,kBAAkB,EAAE,mCAAmC;IACvD,iBAAiB,EAAE,iCAAiC;CAC9C,CAAC;AAEX,MAAM,CAAC,MAAM,+BAA+B,GAAG,0CAA0C,CAAC;AAE1F,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,WAAW;IACX,oBAAoB;IACpB,oBAAoB;IACpB,2BAA2B;IAC3B,uBAAuB;IACvB,cAAc;IACd,UAAU;IACV,WAAW;IACX,0BAA0B;IAC1B,wBAAwB;IACxB,WAAW;IACX,0CAA0C;IAC1C,uBAAuB;IACvB,eAAe;IACf,0BAA0B;IAC1B,2BAA2B;IAC3B,4BAA4B;IAC5B,0BAA0B;IAC1B,wBAAwB;IACxB,uBAAuB;IACvB,oBAAoB;IACpB,6BAA6B;IAC7B,kBAAkB;IAClB,0BAA0B;IAC1B,oBAAoB;IACpB,uBAAuB;IACvB,UAAU;IACV,4BAA4B;IAC5B,yBAAyB;IACzB,sCAAsC;IACtC,qCAAqC;IACrC,qBAAqB;IACrB,qBAAqB;IACrB,oBAAoB;CACd,CAAC;AAEX,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,cAAc;IACd,aAAa;IACb,cAAc;IACd,UAAU;IACV,kBAAkB;IAClB,SAAS;IACT,uBAAuB;CACjB,CAAC;AAKX,MAAM,CAAC,MAAM,aAAa,GAAG,sBAAsB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/bin/shared/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,sDAAsD,GAC/D,yCAAyC,CAAC;AAC9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AACnD,MAAM,CAAC,MAAM,gCAAgC,GAAG,QAAQ,CAAC;AACzD,MAAM,CAAC,MAAM,oCAAoC,GAAG,OAAO,CAAC;AAE5D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;AACxD,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAI/C,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACvC,kBAAkB,EAAE,mCAAmC;IACvD,iBAAiB,EAAE,iCAAiC;CAC9C,CAAC;AAEX,MAAM,CAAC,MAAM,mCAAmC,GAC5C,8CAA8C,CAAC;AAEnD,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,WAAW;IACX,oBAAoB;IACpB,oBAAoB;IACpB,2BAA2B;IAC3B,uBAAuB;IACvB,cAAc;IACd,UAAU;IACV,WAAW;IACX,0BAA0B;IAC1B,wBAAwB;IACxB,WAAW;IACX,0CAA0C;IAC1C,uBAAuB;IACvB,eAAe;IACf,0BAA0B;IAC1B,2BAA2B;IAC3B,4BAA4B;IAC5B,0BAA0B;IAC1B,wBAAwB;IACxB,uBAAuB;IACvB,oBAAoB;IACpB,6BAA6B;IAC7B,kBAAkB;IAClB,0BAA0B;IAC1B,oBAAoB;IACpB,uBAAuB;IACvB,UAAU;IACV,4BAA4B;IAC5B,yBAAyB;IACzB,sCAAsC;IACtC,qCAAqC;IACrC,qBAAqB;IACrB,qBAAqB;IACrB,oBAAoB;CACd,CAAC;AAEX,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,cAAc;IACd,aAAa;IACb,cAAc;IACd,UAAU;IACV,kBAAkB;IAClB,SAAS;IACT,uBAAuB;CACjB,CAAC;AAKX,MAAM,CAAC,MAAM,aAAa,GAAG,sBAAsB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.64",
+    "version": "10.0.0-rc.66",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",
@@ -491,9 +491,6 @@
         "src/bin/shared/downloadKeycloakDefaultTheme.ts",
         "src/bin/shared/downloadKeycloakStaticResources.ts",
         "src/bin/shared/generateKcGenTs.ts",
-        "src/bin/shared/getImplementedThemeTypes.ts",
-        "src/bin/shared/getJarFileBasename.ts",
-        "src/bin/shared/getThemeSrcDirPath.ts",
         "src/bin/shared/metaInfKeycloakThemes.ts",
         "src/bin/shared/promptKeycloakVersion.ts",
         "src/bin/start-keycloak/appBuild.ts",
@@ -772,22 +769,21 @@
         "bin/main.js",
         "bin/180.index.js",
         "bin/193.index.js",
-        "bin/240.index.js",
         "bin/246.index.js",
         "bin/36.index.js",
         "bin/363.index.js",
         "bin/420.index.js",
         "bin/430.index.js",
         "bin/453.index.js",
-        "bin/480.index.js",
+        "bin/456.index.js",
+        "bin/490.index.js",
         "bin/509.index.js",
         "bin/525.index.js",
         "bin/526.index.js",
         "bin/538.index.js",
+        "bin/751.index.js",
         "bin/772.index.js",
-        "bin/818.index.js",
-        "bin/827.index.js",
-        "bin/890.index.js",
+        "bin/837.index.js",
         "bin/932.index.js",
         "bin/97.index.js",
         "bin/shared/constants.js",

package/src/account/KcContext/KcContext.ts

@@ -166,6 +166,7 @@ export declare namespace KcContext {
                 algorithm: "HmacSHA1" | "HmacSHA256" | "HmacSHA512";
                 digits: number;
                 lookAheadWindow: number;
+                getAlgorithmKey: () => string;
             } & (
                 | {
                       type: "totp";

package/src/account/KcContext/kcContextMocks.ts

@@ -148,7 +148,8 @@ export const kcContextMocks: KcContext[] = [
                 digits: 6,
                 lookAheadWindow: 1,
                 type: "totp",
-                period: 30
+                period: 30,
+                getAlgorithmKey: () => "SHA1"
             }
         },
         mode: "qr",

package/src/account/pages/Totp.tsx

@@ -16,12 +16,6 @@ export default function Totp(props: PageProps<Extract<KcContext, { pageId: "totp
 
     const { msg, msgStr, advancedMsg } = i18n;
 
-    const algToKeyUriAlg: Record<(typeof kcContext)["totp"]["policy"]["algorithm"], string> = {
-        HmacSHA1: "SHA1",
-        HmacSHA256: "SHA256",
-        HmacSHA512: "SHA512"
-    };
-
     return (
         <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} active="totp">
             <>
@@ -100,7 +94,7 @@ export default function Totp(props: PageProps<Extract<KcContext, { pageId: "totp
                                                 {msg("totpType")}: {msg(`totp.${totp.policy.type}`)}
                                             </li>
                                             <li id="kc-totp-algorithm">
-                                                {msg("totpAlgorithm")}: {algToKeyUriAlg?.[totp.policy.algorithm] ?? totp.policy.algorithm}
+                                                {msg("totpAlgorithm")}: {totp.policy.getAlgorithmKey()}
                                             </li>
                                             <li id="kc-totp-digits">
                                                 {msg("totpDigits")}: {totp.policy.digits}

package/src/bin/add-story.ts

@@ -13,7 +13,6 @@ import * as fs from "fs";
 import { join as pathJoin, relative as pathRelative, dirname as pathDirname } from "path";
 import { kebabCaseToCamelCase } from "./tools/kebabCaseToSnakeCase";
 import { assert, Equals } from "tsafe/assert";
-import { getThemeSrcDirPath } from "./shared/getThemeSrcDirPath";
 import type { CliCommandOptions } from "./main";
 import { getBuildContext } from "./shared/buildContext";
 import chalk from "chalk";
@@ -53,17 +52,13 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     console.log(`→ ${pageId}`);
 
-    const { themeSrcDirPath } = getThemeSrcDirPath({
-        projectDirPath: buildContext.projectDirPath
-    });
-
     const componentBasename = capitalize(kebabCaseToCamelCase(pageId)).replace(
         /ftl$/,
         "stories.tsx"
     );
 
     const targetFilePath = pathJoin(
-        themeSrcDirPath,
+        buildContext.themeSrcDirPath,
         themeType,
         "pages",
         componentBasename

package/src/bin/eject-page.ts

@@ -15,7 +15,6 @@ import * as fs from "fs";
 import { join as pathJoin, relative as pathRelative, dirname as pathDirname } from "path";
 import { kebabCaseToCamelCase } from "./tools/kebabCaseToSnakeCase";
 import { assert, Equals } from "tsafe/assert";
-import { getThemeSrcDirPath } from "./shared/getThemeSrcDirPath";
 import type { CliCommandOptions } from "./main";
 import { getBuildContext } from "./shared/buildContext";
 import chalk from "chalk";
@@ -68,10 +67,6 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     console.log(`→ ${pageIdOrComponent}`);
 
-    const { themeSrcDirPath } = getThemeSrcDirPath({
-        projectDirPath: buildContext.projectDirPath
-    });
-
     const componentBasename = (() => {
         if (pageIdOrComponent === templateValue) {
             return "Template.tsx";
@@ -96,7 +91,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
     })();
 
     const targetFilePath = pathJoin(
-        themeSrcDirPath,
+        buildContext.themeSrcDirPath,
         themeType,
         pagesOrDot,
         componentBasename
@@ -149,7 +144,11 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
             break edit_KcApp;
         }
 
-        const kcAppTsxPath = pathJoin(themeSrcDirPath, themeType, "KcPage.tsx");
+        const kcAppTsxPath = pathJoin(
+            buildContext.themeSrcDirPath,
+            themeType,
+            "KcPage.tsx"
+        );
 
         const kcAppTsxCode = fs.readFileSync(kcAppTsxPath).toString("utf8");
 
@@ -199,7 +198,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
             `${chalk.bold(
                 pathJoin(
                     ".",
-                    pathRelative(process.cwd(), themeSrcDirPath),
+                    pathRelative(process.cwd(), buildContext.themeSrcDirPath),
                     themeType,
                     "KcPage.tsx"
                 )

package/src/bin/initialize-email-theme.ts

@@ -4,7 +4,6 @@ import { transformCodebase } from "./tools/transformCodebase";
 import { promptKeycloakVersion } from "./shared/promptKeycloakVersion";
 import { getBuildContext } from "./shared/buildContext";
 import * as fs from "fs";
-import { getThemeSrcDirPath } from "./shared/getThemeSrcDirPath";
 import type { CliCommandOptions } from "./main";
 
 export async function command(params: { cliCommandOptions: CliCommandOptions }) {
@@ -12,11 +11,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     const buildContext = getBuildContext({ cliCommandOptions });
 
-    const { themeSrcDirPath } = getThemeSrcDirPath({
-        projectDirPath: buildContext.projectDirPath
-    });
-
-    const emailThemeSrcDirPath = pathJoin(themeSrcDirPath, "email");
+    const emailThemeSrcDirPath = pathJoin(buildContext.themeSrcDirPath, "email");
 
     if (fs.existsSync(emailThemeSrcDirPath)) {
         console.warn(

package/src/bin/keycloakify/buildJars/buildJars.ts

@@ -1,5 +1,4 @@
 import { assert } from "tsafe/assert";
-import { exclude } from "tsafe/exclude";
 import {
     keycloakAccountV1Versions,
     keycloakThemeAdditionalInfoExtensionVersions
@@ -7,32 +6,29 @@ import {
 import { getKeycloakVersionRangeForJar } from "./getKeycloakVersionRangeForJar";
 import { buildJar, BuildContextLike as BuildContextLike_buildJar } from "./buildJar";
 import type { BuildContext } from "../../shared/buildContext";
-import { getJarFileBasename } from "../../shared/getJarFileBasename";
-import { getImplementedThemeTypes } from "../../shared/getImplementedThemeTypes";
 
 export type BuildContextLike = BuildContextLike_buildJar & {
     projectDirPath: string;
     keycloakifyBuildDirPath: string;
+    recordIsImplementedByThemeType: BuildContext["recordIsImplementedByThemeType"];
+    jarTargets: BuildContext["jarTargets"];
 };
 
 assert<BuildContext extends BuildContextLike ? true : false>();
 
 export async function buildJars(params: {
     resourcesDirPath: string;
-    onlyBuildJarFileBasename: string | undefined;
     buildContext: BuildContextLike;
 }): Promise<void> {
-    const { onlyBuildJarFileBasename, resourcesDirPath, buildContext } = params;
+    const { resourcesDirPath, buildContext } = params;
 
-    const doesImplementAccountTheme = getImplementedThemeTypes({
-        projectDirPath: buildContext.projectDirPath
-    }).implementedThemeTypes.account;
+    const doesImplementAccountTheme = buildContext.recordIsImplementedByThemeType.account;
 
     await Promise.all(
         keycloakAccountV1Versions
             .map(keycloakAccountV1Version =>
-                keycloakThemeAdditionalInfoExtensionVersions
-                    .map(keycloakThemeAdditionalInfoExtensionVersion => {
+                keycloakThemeAdditionalInfoExtensionVersions.map(
+                    keycloakThemeAdditionalInfoExtensionVersion => {
                         const keycloakVersionRange = getKeycloakVersionRangeForJar({
                             doesImplementAccountTheme,
                             keycloakAccountV1Version,
@@ -43,48 +39,26 @@ export async function buildJars(params: {
                             return undefined;
                         }
 
-                        return {
-                            keycloakThemeAdditionalInfoExtensionVersion,
-                            keycloakVersionRange
-                        };
-                    })
-                    .filter(exclude(undefined))
-                    .map(
-                        ({
-                            keycloakThemeAdditionalInfoExtensionVersion,
-                            keycloakVersionRange
-                        }) => {
-                            const { jarFileBasename } = getJarFileBasename({
-                                keycloakVersionRange
-                            });
+                        const jarTarget = buildContext.jarTargets.find(
+                            jarTarget =>
+                                jarTarget.keycloakVersionRange === keycloakVersionRange
+                        );
 
-                            if (
-                                onlyBuildJarFileBasename !== undefined &&
-                                onlyBuildJarFileBasename !== jarFileBasename
-                            ) {
-                                return undefined;
-                            }
-
-                            return {
-                                keycloakThemeAdditionalInfoExtensionVersion,
-                                jarFileBasename
-                            };
+                        if (jarTarget === undefined) {
+                            return undefined;
                         }
-                    )
-                    .filter(exclude(undefined))
-                    .map(
-                        ({
+
+                        const { jarFileBasename } = jarTarget;
+
+                        return buildJar({
+                            jarFileBasename,
+                            keycloakAccountV1Version,
                             keycloakThemeAdditionalInfoExtensionVersion,
-                            jarFileBasename
-                        }) =>
-                            buildJar({
-                                jarFileBasename,
-                                keycloakAccountV1Version,
-                                keycloakThemeAdditionalInfoExtensionVersion,
-                                resourcesDirPath,
-                                buildContext
-                            })
-                    )
+                            resourcesDirPath,
+                            buildContext
+                        });
+                    }
+                )
             )
             .flat()
     );

package/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl

@@ -305,12 +305,14 @@ function decodeHtmlEntities(htmlStr){
             </#if>
 
             <#if are_same_path(path, ["totp", "policy", "getAlgorithmKey"])>
-                <#local returnValue = "">
-                <#attempt>
-                    <#local returnValue = totp.policy.getAlgorithmKey()>
-                <#recover>
-                    <#return "ABORT: Couldn't evaluate totp.policy.getAlgorithmKey()">
-                </#attempt>
+                <#local returnValue = "error">
+                <#if mode?? && mode = "manual">
+                    <#attempt>
+                        <#local returnValue = totp.policy.getAlgorithmKey()>
+                    <#recover>
+                        <#return "ABORT: Couldn't evaluate totp.policy.getAlgorithmKey()">
+                    </#attempt>
+                </#if>
                 <#return 'function(){ return "' + returnValue + '"; }'>
             </#if>
 

package/src/bin/keycloakify/generateResources/generateResourcesForMainTheme.ts

@@ -29,7 +29,6 @@ import {
     bringInAccountV1,
     type BuildContextLike as BuildContextLike_bringInAccountV1
 } from "./bringInAccountV1";
-import { getThemeSrcDirPath } from "../../shared/getThemeSrcDirPath";
 import { rmSync } from "../../tools/fs.rmSync";
 import { readThisNpmPackageVersion } from "../../tools/readThisNpmPackageVersion";
 import {
@@ -38,7 +37,6 @@ import {
 } from "../../shared/metaInfKeycloakThemes";
 import { objectEntries } from "tsafe/objectEntries";
 import { escapeStringForPropertiesFile } from "../../tools/escapeStringForPropertiesFile";
-import { getImplementedThemeTypes } from "../../shared/getImplementedThemeTypes";
 
 export type BuildContextLike = BuildContextLike_kcContextExclusionsFtlCode &
     BuildContextLike_downloadKeycloakStaticResources &
@@ -48,6 +46,8 @@ export type BuildContextLike = BuildContextLike_kcContextExclusionsFtlCode &
         projectDirPath: string;
         projectBuildDirPath: string;
         environmentVariables: { name: string; default: string }[];
+        recordIsImplementedByThemeType: BuildContext["recordIsImplementedByThemeType"];
+        themeSrcDirPath: string;
     };
 
 assert<BuildContext extends BuildContextLike ? true : false>();
@@ -59,14 +59,6 @@ export async function generateResourcesForMainTheme(params: {
 }): Promise<void> {
     const { themeName, resourcesDirPath, buildContext } = params;
 
-    const { themeSrcDirPath } = getThemeSrcDirPath({
-        projectDirPath: buildContext.projectDirPath
-    });
-
-    const { implementedThemeTypes } = getImplementedThemeTypes({
-        projectDirPath: buildContext.projectDirPath
-    });
-
     const getThemeTypeDirPath = (params: { themeType: ThemeType | "email" }) => {
         const { themeType } = params;
         return pathJoin(resourcesDirPath, "theme", themeName, themeType);
@@ -75,7 +67,7 @@ export async function generateResourcesForMainTheme(params: {
     const cssGlobalsToDefine: Record<string, string> = {};
 
     for (const themeType of ["login", "account"] as const) {
-        if (!implementedThemeTypes[themeType]) {
+        if (!buildContext.recordIsImplementedByThemeType[themeType]) {
             continue;
         }
 
@@ -91,7 +83,10 @@ export async function generateResourcesForMainTheme(params: {
             // NOTE: Prevent accumulation of files in the assets dir, as names are hashed they pile up.
             rmSync(destDirPath, { recursive: true, force: true });
 
-            if (themeType === "account" && implementedThemeTypes.login) {
+            if (
+                themeType === "account" &&
+                buildContext.recordIsImplementedByThemeType.login
+            ) {
                 // NOTE: We prevent doing it twice, it has been done for the login theme.
 
                 transformCodebase({
@@ -178,7 +173,7 @@ export async function generateResourcesForMainTheme(params: {
             keycloakifyVersion: readThisNpmPackageVersion(),
             themeType,
             fieldNames: readFieldNameUsage({
-                themeSrcDirPath,
+                themeSrcDirPath: buildContext.themeSrcDirPath,
                 themeType
             })
         });
@@ -194,7 +189,7 @@ export async function generateResourcesForMainTheme(params: {
             })(),
             ...readExtraPagesNames({
                 themeType,
-                themeSrcDirPath
+                themeSrcDirPath: buildContext.themeSrcDirPath
             })
         ].forEach(pageId => {
             const { ftlCode } = generateFtlFilesCode({ pageId });
@@ -206,7 +201,7 @@ export async function generateResourcesForMainTheme(params: {
         });
 
         generateMessageProperties({
-            themeSrcDirPath,
+            themeSrcDirPath: buildContext.themeSrcDirPath,
             themeType
         }).forEach(({ languageTag, propertiesFileSource }) => {
             const messagesDirPath = pathJoin(themeTypeDirPath, "messages");
@@ -265,11 +260,11 @@ export async function generateResourcesForMainTheme(params: {
     }
 
     email: {
-        if (!implementedThemeTypes.email) {
+        if (!buildContext.recordIsImplementedByThemeType.email) {
             break email;
         }
 
-        const emailThemeSrcDirPath = pathJoin(themeSrcDirPath, "email");
+        const emailThemeSrcDirPath = pathJoin(buildContext.themeSrcDirPath, "email");
 
         transformCodebase({
             srcDirPath: emailThemeSrcDirPath,
@@ -277,7 +272,7 @@ export async function generateResourcesForMainTheme(params: {
         });
     }
 
-    if (implementedThemeTypes.account) {
+    if (buildContext.recordIsImplementedByThemeType.account) {
         await bringInAccountV1({
             resourcesDirPath,
             buildContext
@@ -289,12 +284,12 @@ export async function generateResourcesForMainTheme(params: {
 
         metaInfKeycloakThemes.themes.push({
             name: themeName,
-            types: objectEntries(implementedThemeTypes)
+            types: objectEntries(buildContext.recordIsImplementedByThemeType)
                 .filter(([, isImplemented]) => isImplemented)
                 .map(([themeType]) => themeType)
         });
 
-        if (implementedThemeTypes.account) {
+        if (buildContext.recordIsImplementedByThemeType.account) {
             metaInfKeycloakThemes.themes.push({
                 name: accountV1ThemeName,
                 types: ["account"]

package/src/bin/keycloakify/keycloakify.ts

@@ -3,10 +3,7 @@ import { join as pathJoin, relative as pathRelative, sep as pathSep } from "path
 import * as child_process from "child_process";
 import * as fs from "fs";
 import { getBuildContext } from "../shared/buildContext";
-import {
-    vitePluginSubScriptEnvNames,
-    onlyBuildJarFileBasenameEnvName
-} from "../shared/constants";
+import { vitePluginSubScriptEnvNames } from "../shared/constants";
 import { buildJars } from "./buildJars";
 import type { CliCommandOptions } from "../main";
 import chalk from "chalk";
@@ -96,16 +93,17 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
             cwd: buildContext.projectDirPath,
             env: {
                 ...process.env,
-                [vitePluginSubScriptEnvNames.runPostBuildScript]:
-                    JSON.stringify(buildContext)
+                [vitePluginSubScriptEnvNames.runPostBuildScript]: JSON.stringify({
+                    resourcesDirPath,
+                    buildContext
+                })
             }
         });
     }
 
     await buildJars({
         resourcesDirPath,
-        buildContext,
-        onlyBuildJarFileBasename: process.env[onlyBuildJarFileBasenameEnvName]
+        buildContext
     });
 
     rmSync(resourcesDirPath, { recursive: true });