keycloakify 10.0.0-rc.62 → 10.0.0-rc.64

package/src/bin/start-keycloak/start-keycloak.ts

@@ -2,7 +2,7 @@ import { getBuildContext } from "../shared/buildContext";
 import { exclude } from "tsafe/exclude";
 import type { CliCommandOptions as CliCommandOptions_common } from "../main";
 import { promptKeycloakVersion } from "../shared/promptKeycloakVersion";
-import { readMetaInfKeycloakThemes_fromJar } from "../shared/metaInfKeycloakThemes";
+import { getImplementedThemeTypes } from "../shared/getImplementedThemeTypes";
 import { accountV1ThemeName, containerName } from "../shared/constants";
 import { SemVer } from "../tools/SemVer";
 import type { KeycloakVersionRange } from "../shared/KeycloakVersionRange";
@@ -91,66 +91,8 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     const buildContext = getBuildContext({ cliCommandOptions });
 
-    {
-        const { isAppBuildSuccess } = await appBuild({
-            buildContext
-        });
-
-        if (!isAppBuildSuccess) {
-            console.log(
-                chalk.red(
-                    `App build failed, exiting. Try running 'yarn build-keycloak-theme' and see what's wrong.`
-                )
-            );
-            process.exit(1);
-        }
-
-        const { isKeycloakifyBuildSuccess } = await keycloakifyBuild({
-            onlyBuildJarFileBasename: undefined,
-            buildContext
-        });
-
-        if (!isKeycloakifyBuildSuccess) {
-            console.log(
-                chalk.red(
-                    `Keycloakify build failed, exiting. Try running 'yarn build-keycloak-theme' and see what's wrong.`
-                )
-            );
-            process.exit(1);
-        }
-    }
-
-    const { doesImplementAccountTheme } = await (async () => {
-        const latestJarFilePath = fs
-            .readdirSync(buildContext.keycloakifyBuildDirPath)
-            .filter(fileBasename => fileBasename.endsWith(".jar"))
-            .map(fileBasename =>
-                pathJoin(buildContext.keycloakifyBuildDirPath, fileBasename)
-            )
-            .sort((a, b) => fs.statSync(b).mtimeMs - fs.statSync(a).mtimeMs)[0];
-
-        assert(latestJarFilePath !== undefined);
-
-        const metaInfKeycloakThemes = await readMetaInfKeycloakThemes_fromJar({
-            jarFilePath: latestJarFilePath
-        });
-
-        const mainThemeEntry = metaInfKeycloakThemes.themes.find(
-            ({ name }) => name === buildContext.themeNames[0]
-        );
-
-        assert(mainThemeEntry !== undefined);
-
-        const doesImplementAccountTheme = mainThemeEntry.types.includes("account");
-
-        return { doesImplementAccountTheme };
-    })();
-
     const { keycloakVersion, keycloakMajorNumber: keycloakMajorVersionNumber } =
-        await (async function getKeycloakMajor(): Promise<{
-            keycloakVersion: string;
-            keycloakMajorNumber: number;
-        }> {
+        await (async () => {
             if (cliCommandOptions.keycloakVersion !== undefined) {
                 return {
                     keycloakVersion: cliCommandOptions.keycloakVersion,
@@ -173,20 +115,14 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
             const keycloakMajorNumber = SemVer.parse(keycloakVersion).major;
 
-            if (doesImplementAccountTheme && keycloakMajorNumber === 22) {
-                console.log(
-                    [
-                        "Unfortunately, Keycloakify themes that implements an account theme do not work on Keycloak 22",
-                        "Please select any other Keycloak version"
-                    ].join(" ")
-                );
-                return getKeycloakMajor();
-            }
-
             return { keycloakVersion, keycloakMajorNumber };
         })();
 
     const keycloakVersionRange: KeycloakVersionRange = (() => {
+        const doesImplementAccountTheme = getImplementedThemeTypes({
+            projectDirPath: buildContext.projectDirPath
+        }).implementedThemeTypes.account;
+
         if (doesImplementAccountTheme) {
             const keycloakVersionRange = (() => {
                 if (keycloakMajorVersionNumber <= 21) {
@@ -233,6 +169,35 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
 
     const { jarFileBasename } = getJarFileBasename({ keycloakVersionRange });
 
+    {
+        const { isAppBuildSuccess } = await appBuild({
+            buildContext
+        });
+
+        if (!isAppBuildSuccess) {
+            console.log(
+                chalk.red(
+                    `App build failed, exiting. Try running 'npm run build-keycloak-theme' and see what's wrong.`
+                )
+            );
+            process.exit(1);
+        }
+
+        const { isKeycloakifyBuildSuccess } = await keycloakifyBuild({
+            onlyBuildJarFileBasename: jarFileBasename,
+            buildContext
+        });
+
+        if (!isKeycloakifyBuildSuccess) {
+            console.log(
+                chalk.red(
+                    `Keycloakify build failed, exiting. Try running 'npm run build-keycloak-theme' and see what's wrong.`
+                )
+            );
+            process.exit(1);
+        }
+    }
+
     console.log(`Using Keycloak ${chalk.bold(jarFileBasename)}`);
 
     const realmJsonFilePath = await (async () => {
@@ -421,7 +386,8 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
             ...(realmJsonFilePath === undefined ? [] : ["--import-realm"])
         ],
         {
-            cwd: buildContext.keycloakifyBuildDirPath
+            cwd: buildContext.keycloakifyBuildDirPath,
+            shell: true
         }
     ] as const;