keycloakify 10.0.0-rc.102 → 10.0.0-rc.104

package/src/bin/shared/buildContext.ts

@@ -63,6 +63,7 @@ export type BuildContext = {
               packageJsonDirPath: string;
               packageJsonScripts: Record<string, string>;
           };
+    doUseAccountV3: boolean;
 };
 
 export type BuildOptions = {
@@ -77,16 +78,17 @@ export type BuildOptions = {
     kcContextExclusionsFtl?: string;
     /** https://docs.keycloakify.dev/v/v10/targetting-specific-keycloak-versions */
     keycloakVersionTargets?: BuildOptions.KeycloakVersionTargets;
+    doUseAccountV3?: boolean;
 };
 
 export namespace BuildOptions {
     export type KeycloakVersionTargets =
         | ({ hasAccountTheme: true } & Record<
-              KeycloakVersionRange.WithAccountTheme,
+              KeycloakVersionRange.WithAccountV1Theme,
               string | boolean
           >)
         | ({ hasAccountTheme: false } & Record<
-              KeycloakVersionRange.WithoutAccountTheme,
+              KeycloakVersionRange.WithoutAccountV1Theme,
               string | boolean
           >);
 }
@@ -229,6 +231,7 @@ export function getBuildContext(params: {
             projectBuildDirPath?: string;
             staticDirPathInProjectBuildDirPath?: string;
             publicDirPath?: string;
+            doUseAccountV3?: boolean;
         };
 
         type ParsedPackageJson = {
@@ -297,7 +300,8 @@ export function getBuildContext(params: {
 
                                 return zKeycloakVersionTargets;
                             })()
-                        ).optional()
+                        ).optional(),
+                        doUseAccountV3: z.boolean().optional()
                     });
 
                     {
@@ -386,6 +390,8 @@ export function getBuildContext(params: {
 
     const bundler = resolvedViteConfig !== undefined ? "vite" : "webpack";
 
+    const doUseAccountV3 = buildOptions.doUseAccountV3 ?? false;
+
     return {
         bundler:
             resolvedViteConfig !== undefined
@@ -606,10 +612,10 @@ export function getBuildContext(params: {
                 }
 
                 const keycloakVersionRange: KeycloakVersionRange = (() => {
-                    const doesImplementAccountTheme =
-                        recordIsImplementedByThemeType.account;
+                    const doesImplementAccountV1Theme =
+                        !doUseAccountV3 && recordIsImplementedByThemeType.account;
 
-                    if (doesImplementAccountTheme) {
+                    if (doesImplementAccountV1Theme) {
                         const keycloakVersionRange = (() => {
                             if (buildForKeycloakMajorVersionNumber <= 21) {
                                 return "21-and-below" as const;
@@ -631,7 +637,7 @@ export function getBuildContext(params: {
                         assert<
                             Equals<
                                 typeof keycloakVersionRange,
-                                KeycloakVersionRange.WithAccountTheme
+                                KeycloakVersionRange.WithAccountV1Theme
                             >
                         >();
 
@@ -648,7 +654,7 @@ export function getBuildContext(params: {
                         assert<
                             Equals<
                                 typeof keycloakVersionRange,
-                                KeycloakVersionRange.WithoutAccountTheme
+                                KeycloakVersionRange.WithoutAccountV1Theme
                             >
                         >();
 
@@ -696,7 +702,7 @@ export function getBuildContext(params: {
             const jarTargets_default = (() => {
                 const jarTargets: BuildContext["jarTargets"] = [];
 
-                if (recordIsImplementedByThemeType.account) {
+                if (!doUseAccountV3 && recordIsImplementedByThemeType.account) {
                     for (const keycloakVersionRange of [
                         "21-and-below",
                         "23",
@@ -706,7 +712,7 @@ export function getBuildContext(params: {
                         assert<
                             Equals<
                                 typeof keycloakVersionRange,
-                                KeycloakVersionRange.WithAccountTheme
+                                KeycloakVersionRange.WithAccountV1Theme
                             >
                         >(true);
                         jarTargets.push({
@@ -723,7 +729,7 @@ export function getBuildContext(params: {
                         assert<
                             Equals<
                                 typeof keycloakVersionRange,
-                                KeycloakVersionRange.WithoutAccountTheme
+                                KeycloakVersionRange.WithoutAccountV1Theme
                             >
                         >(true);
                         jarTargets.push({
@@ -742,8 +748,9 @@ export function getBuildContext(params: {
             }
 
             if (
-                buildOptions.keycloakVersionTargets.hasAccountTheme !==
-                recordIsImplementedByThemeType.account
+                buildOptions.keycloakVersionTargets.hasAccountTheme !== doUseAccountV3
+                    ? false
+                    : recordIsImplementedByThemeType.account
             ) {
                 console.log(
                     chalk.red(
@@ -863,6 +870,7 @@ export function getBuildContext(params: {
             }
 
             return jarTargets;
-        })()
+        })(),
+        doUseAccountV3
     };
 }

package/src/bin/shared/downloadKeycloakDefaultTheme.ts

@@ -24,7 +24,7 @@ export async function downloadKeycloakDefaultTheme(params: {
         url: `https://repo1.maven.org/maven2/org/keycloak/keycloak-themes/${keycloakVersion}/keycloak-themes-${keycloakVersion}.jar`,
         cacheDirPath: buildContext.cacheDirPath,
         fetchOptions: buildContext.fetchOptions,
-        uniqueIdOfOnOnArchiveFile: "downloadKeycloakDefaultTheme",
+        uniqueIdOfOnArchiveFile: "downloadKeycloakDefaultTheme",
         onArchiveFile: async params => {
             const fileRelativePath = pathRelative("theme", params.fileRelativePath);
 

package/src/bin/tools/downloadAndExtractArchive.ts

@@ -10,7 +10,7 @@ import { rm } from "./fs.rm";
 
 export async function downloadAndExtractArchive(params: {
     url: string;
-    uniqueIdOfOnOnArchiveFile: string;
+    uniqueIdOfOnArchiveFile: string;
     onArchiveFile: (params: {
         fileRelativePath: string;
         readFile: () => Promise<Buffer>;
@@ -22,7 +22,7 @@ export async function downloadAndExtractArchive(params: {
     cacheDirPath: string;
     fetchOptions: FetchOptions | undefined;
 }): Promise<{ extractedDirPath: string }> {
-    const { url, uniqueIdOfOnOnArchiveFile, onArchiveFile, cacheDirPath, fetchOptions } =
+    const { url, uniqueIdOfOnArchiveFile, onArchiveFile, cacheDirPath, fetchOptions } =
         params;
 
     const archiveFileBasename = url.split("?")[0].split("/").reverse()[0];
@@ -63,7 +63,7 @@ export async function downloadAndExtractArchive(params: {
         });
     }
 
-    const extractDirBasename = `${archiveFileBasename.split(".")[0]}_${uniqueIdOfOnOnArchiveFile}_${crypto
+    const extractDirBasename = `${archiveFileBasename.split(".")[0]}_${uniqueIdOfOnArchiveFile}_${crypto
         .createHash("sha256")
         .update(onArchiveFile.toString())
         .digest("hex")

package/vite-plugin/index.js

@@ -4109,7 +4109,7 @@ var __rest = (undefined && undefined.__rest) || function (s, e) {
 
 
 function getBuildContext(params) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { cliCommandOptions } = params;
     const projectDirPath = cliCommandOptions.projectDirPath !== undefined
         ? getAbsoluteAndInOsFormatPath({
@@ -4240,7 +4240,8 @@ function getBuildContext(params) {
                             (0,assert.assert)();
                         }
                         return zKeycloakVersionTargets;
-                    })()).optional()
+                    })()).optional(),
+                    doUseAccountV3: z.boolean().optional()
                 });
                 {
                     (0,assert.assert)();
@@ -4298,6 +4299,7 @@ function getBuildContext(params) {
         return (0,external_path_.join)(projectDirPath, resolvedViteConfig.buildDir);
     })();
     const bundler = resolvedViteConfig !== undefined ? "vite" : "webpack";
+    const doUseAccountV3 = (_a = buildOptions.doUseAccountV3) !== null && _a !== void 0 ? _a : false;
     return {
         bundler: resolvedViteConfig !== undefined
             ? { type: "vite" }
@@ -4312,7 +4314,7 @@ function getBuildContext(params) {
                     packageJsonScripts: scripts !== null && scripts !== void 0 ? scripts : {}
                 };
             })(),
-        themeVersion: (_b = (_a = buildOptions.themeVersion) !== null && _a !== void 0 ? _a : parsedPackageJson.version) !== null && _b !== void 0 ? _b : "0.0.0",
+        themeVersion: (_c = (_b = buildOptions.themeVersion) !== null && _b !== void 0 ? _b : parsedPackageJson.version) !== null && _c !== void 0 ? _c : "0.0.0",
         themeNames,
         extraThemeProperties: buildOptions.extraThemeProperties,
         groupId: (() => {
@@ -4323,8 +4325,8 @@ function getBuildContext(params) {
                 : (_e = (_d = (_c = (0,external_url_.parse)(parsedPackageJson.homepage)
                     .host) === null || _c === void 0 ? void 0 : _c.replace(/:[0-9]+$/, "")) === null || _d === void 0 ? void 0 : _d.split(".").reverse().join(".")) !== null && _e !== void 0 ? _e : fallbackGroupId) + ".keycloak");
         })(),
-        artifactId: (_d = (_c = process.env.KEYCLOAKIFY_ARTIFACT_ID) !== null && _c !== void 0 ? _c : buildOptions.artifactId) !== null && _d !== void 0 ? _d : `${themeNames[0]}-keycloak-theme`,
-        loginThemeResourcesFromKeycloakVersion: (_e = buildOptions.loginThemeResourcesFromKeycloakVersion) !== null && _e !== void 0 ? _e : "24.0.4",
+        artifactId: (_e = (_d = process.env.KEYCLOAKIFY_ARTIFACT_ID) !== null && _d !== void 0 ? _d : buildOptions.artifactId) !== null && _e !== void 0 ? _e : `${themeNames[0]}-keycloak-theme`,
+        loginThemeResourcesFromKeycloakVersion: (_f = buildOptions.loginThemeResourcesFromKeycloakVersion) !== null && _f !== void 0 ? _f : "24.0.4",
         projectDirPath,
         projectBuildDirPath,
         keycloakifyBuildDirPath: (() => {
@@ -4417,7 +4419,7 @@ function getBuildContext(params) {
             }
             return buildOptions.kcContextExclusionsFtl;
         })(),
-        environmentVariables: (_f = buildOptions.environmentVariables) !== null && _f !== void 0 ? _f : [],
+        environmentVariables: (_g = buildOptions.environmentVariables) !== null && _g !== void 0 ? _g : [],
         recordIsImplementedByThemeType,
         themeSrcDirPath,
         fetchOptions: getProxyFetchOptions({
@@ -4455,8 +4457,8 @@ function getBuildContext(params) {
                     break build_for_specific_keycloak_major_version;
                 }
                 const keycloakVersionRange = (() => {
-                    const doesImplementAccountTheme = recordIsImplementedByThemeType.account;
-                    if (doesImplementAccountTheme) {
+                    const doesImplementAccountV1Theme = !doUseAccountV3 && recordIsImplementedByThemeType.account;
+                    if (doesImplementAccountV1Theme) {
                         const keycloakVersionRange = (() => {
                             if (buildForKeycloakMajorVersionNumber <= 21) {
                                 return "21-and-below";
@@ -4511,7 +4513,7 @@ function getBuildContext(params) {
             }
             const jarTargets_default = (() => {
                 const jarTargets = [];
-                if (recordIsImplementedByThemeType.account) {
+                if (!doUseAccountV3 && recordIsImplementedByThemeType.account) {
                     for (const keycloakVersionRange of [
                         "21-and-below",
                         "23",
@@ -4542,8 +4544,9 @@ function getBuildContext(params) {
             if (buildOptions.keycloakVersionTargets === undefined) {
                 return jarTargets_default;
             }
-            if (buildOptions.keycloakVersionTargets.hasAccountTheme !==
-                recordIsImplementedByThemeType.account) {
+            if (buildOptions.keycloakVersionTargets.hasAccountTheme !== doUseAccountV3
+                ? false
+                : recordIsImplementedByThemeType.account) {
                 console.log(source_default().red((() => {
                     const { keycloakVersionTargets } = buildOptions;
                     let message = `Bad ${(0,symToStr/* symToStr */.r)({ keycloakVersionTargets })} configuration.\n`;
@@ -4618,7 +4621,8 @@ function getBuildContext(params) {
                 process.exit(1);
             }
             return jarTargets;
-        })()
+        })(),
+        doUseAccountV3
     };
 }
 //# sourceMappingURL=buildContext.js.map
@@ -4941,7 +4945,7 @@ var fs_rm = __nccwpck_require__(8699);
 
 async function downloadAndExtractArchive(params) {
     var _a;
-    const { url, uniqueIdOfOnOnArchiveFile, onArchiveFile, cacheDirPath, fetchOptions } = params;
+    const { url, uniqueIdOfOnArchiveFile, onArchiveFile, cacheDirPath, fetchOptions } = params;
     const archiveFileBasename = url.split("?")[0].split("/").reverse()[0];
     const archiveFilePath = (0,external_path_.join)(cacheDirPath, archiveFileBasename);
     download: {
@@ -4969,7 +4973,7 @@ async function downloadAndExtractArchive(params) {
             archiveFileBasename
         });
     }
-    const extractDirBasename = `${archiveFileBasename.split(".")[0]}_${uniqueIdOfOnOnArchiveFile}_${external_crypto_.createHash("sha256")
+    const extractDirBasename = `${archiveFileBasename.split(".")[0]}_${uniqueIdOfOnArchiveFile}_${external_crypto_.createHash("sha256")
         .update(onArchiveFile.toString())
         .digest("hex")
         .substring(0, 5)}`;
@@ -5101,7 +5105,7 @@ async function downloadKeycloakDefaultTheme(params) {
         url: `https://repo1.maven.org/maven2/org/keycloak/keycloak-themes/${keycloakVersion}/keycloak-themes-${keycloakVersion}.jar`,
         cacheDirPath: buildContext.cacheDirPath,
         fetchOptions: buildContext.fetchOptions,
-        uniqueIdOfOnOnArchiveFile: "downloadKeycloakDefaultTheme",
+        uniqueIdOfOnArchiveFile: "downloadKeycloakDefaultTheme",
         onArchiveFile: async (params) => {
             const fileRelativePath = (0,external_path_.relative)("theme", params.fileRelativePath);
             if (fileRelativePath.startsWith("..")) {