keycloakify 10.0.0-rc.1 → 10.0.0-rc.12

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

@@ -2,19 +2,22 @@ import { assert, type Equals } from "tsafe/assert";
 import type { KeycloakAccountV1Version, KeycloakThemeAdditionalInfoExtensionVersion } from "./extensionVersions";
 import { join as pathJoin, dirname as pathDirname } from "path";
 import { transformCodebase } from "../../tools/transformCodebase";
-import type { BuildOptions } from "../buildOptions";
+import type { BuildOptions } from "../../shared/buildOptions";
 import * as fs from "fs/promises";
-import { accountV1ThemeName } from "../../constants";
+import { accountV1ThemeName } from "../../shared/constants";
 import { generatePom, BuildOptionsLike as BuildOptionsLike_generatePom } from "./generatePom";
-import { existsSync, readFileSync } from "fs";
+import { readFileSync } from "fs";
 import { isInside } from "../../tools/isInside";
 import child_process from "child_process";
+import { rmSync } from "../../tools/fs.rmSync";
+import { getMetaInfKeycloakThemesJsonPath } from "../../shared/metaInfKeycloakThemes";
 
 export type BuildOptionsLike = BuildOptionsLike_generatePom & {
     keycloakifyBuildDirPath: string;
     themeNames: string[];
     artifactId: string;
     themeVersion: string;
+    cacheDirPath: string;
 };
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
@@ -27,25 +30,18 @@ export async function buildJar(params: {
 }): Promise<void> {
     const { jarFileBasename, keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion, buildOptions } = params;
 
-    const keycloakifyBuildTmpDirPath = pathJoin(buildOptions.keycloakifyBuildDirPath, "..", jarFileBasename.replace(".jar", ""));
+    const keycloakifyBuildTmpDirPath = pathJoin(buildOptions.cacheDirPath, jarFileBasename.replace(".jar", ""));
 
-    if (existsSync(keycloakifyBuildTmpDirPath)) {
-        await fs.rm(keycloakifyBuildTmpDirPath, { "recursive": true });
-    }
-
-    await fs.mkdir(keycloakifyBuildTmpDirPath, { "recursive": true });
-    await fs.writeFile(pathJoin(keycloakifyBuildTmpDirPath, ".gitignore"), Buffer.from("*", "utf8"));
-
-    const srcMainResourcesRelativeDirPath = pathJoin("src", "main", "resources");
+    rmSync(keycloakifyBuildTmpDirPath, { "recursive": true, "force": true });
 
     {
-        const keycloakThemesJsonFilePath = pathJoin(srcMainResourcesRelativeDirPath, "META-INF", "keycloak-themes.json");
+        const keycloakThemesJsonFilePath = getMetaInfKeycloakThemesJsonPath({ "keycloakifyBuildDirPath": "" });
 
         const themePropertiesFilePathSet = new Set(
-            ...buildOptions.themeNames.map(themeName => pathJoin(srcMainResourcesRelativeDirPath, "theme", themeName, "account", "theme.properties"))
+            ...buildOptions.themeNames.map(themeName => pathJoin("src", "main", "resources", "theme", themeName, "account", "theme.properties"))
         );
 
-        const accountV1RelativeDirPath = pathJoin(srcMainResourcesRelativeDirPath, "theme", accountV1ThemeName);
+        const accountV1RelativeDirPath = pathJoin("src", "main", "resources", "theme", accountV1ThemeName);
 
         transformCodebase({
             "srcDirPath": buildOptions.keycloakifyBuildDirPath,
@@ -107,7 +103,7 @@ export async function buildJar(params: {
 
         (["register.ftl", "login-update-profile.ftl"] as const).forEach(pageId =>
             buildOptions.themeNames.map(themeName => {
-                const ftlFilePath = pathJoin(keycloakifyBuildTmpDirPath, srcMainResourcesRelativeDirPath, "theme", themeName, "login", pageId);
+                const ftlFilePath = pathJoin(keycloakifyBuildTmpDirPath, "src", "main", "resources", "theme", themeName, "login", pageId);
 
                 const ftlFileContent = readFileSync(ftlFilePath).toString("utf8");
 
@@ -170,5 +166,5 @@ export async function buildJar(params: {
         pathJoin(buildOptions.keycloakifyBuildDirPath, jarFileBasename)
     );
 
-    await fs.rm(keycloakifyBuildTmpDirPath, { "recursive": true });
+    rmSync(keycloakifyBuildTmpDirPath, { "recursive": true });
 }

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

@@ -3,7 +3,10 @@ import { exclude } from "tsafe/exclude";
 import { keycloakAccountV1Versions, keycloakThemeAdditionalInfoExtensionVersions } from "./extensionVersions";
 import { getKeycloakVersionRangeForJar } from "./getKeycloakVersionRangeForJar";
 import { buildJar, BuildOptionsLike as BuildOptionsLike_buildJar } from "./buildJar";
-import type { BuildOptions } from "../buildOptions";
+import type { BuildOptions } from "../../shared/buildOptions";
+import { getJarFileBasename } from "../../shared/getJarFileBasename";
+import { readMetaInfKeycloakThemes } from "../../shared/metaInfKeycloakThemes";
+import { accountV1ThemeName } from "../../shared/constants";
 
 export type BuildOptionsLike = BuildOptionsLike_buildJar & {
     keycloakifyBuildDirPath: string;
@@ -11,13 +14,12 @@ export type BuildOptionsLike = BuildOptionsLike_buildJar & {
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
 
-export async function buildJars(params: {
-    doesImplementAccountTheme: boolean;
-    buildOptions: BuildOptionsLike;
-}): Promise<{ lastJarFileBasename: string }> {
-    const { doesImplementAccountTheme, buildOptions } = params;
+export async function buildJars(params: { buildOptions: BuildOptionsLike }): Promise<void> {
+    const { buildOptions } = params;
 
-    let lastJarFileBasename: string | undefined = undefined;
+    const doesImplementAccountTheme = readMetaInfKeycloakThemes({
+        "keycloakifyBuildDirPath": buildOptions.keycloakifyBuildDirPath
+    }).themes.some(({ name }) => name === accountV1ThemeName);
 
     await Promise.all(
         keycloakAccountV1Versions
@@ -38,11 +40,12 @@ export async function buildJars(params: {
                     })
                     .filter(exclude(undefined))
                     .map(({ keycloakThemeAdditionalInfoExtensionVersion, keycloakVersionRange }) => {
-                        const jarFileBasename = `keycloak-theme-for-kc-${keycloakVersionRange}.jar`;
+                        const { jarFileBasename } = getJarFileBasename({ keycloakVersionRange });
 
-                        lastJarFileBasename = jarFileBasename;
-
-                        return { keycloakThemeAdditionalInfoExtensionVersion, jarFileBasename };
+                        return {
+                            keycloakThemeAdditionalInfoExtensionVersion,
+                            jarFileBasename
+                        };
                     })
                     .map(({ keycloakThemeAdditionalInfoExtensionVersion, jarFileBasename }) =>
                         buildJar({
@@ -55,8 +58,4 @@ export async function buildJars(params: {
             )
             .flat()
     );
-
-    assert(lastJarFileBasename !== undefined);
-
-    return { lastJarFileBasename };
 }

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

@@ -1,5 +1,5 @@
 import { assert } from "tsafe/assert";
-import type { BuildOptions } from "../buildOptions";
+import type { BuildOptions } from "../../shared/buildOptions";
 import type { KeycloakAccountV1Version, KeycloakThemeAdditionalInfoExtensionVersion } from "./extensionVersions";
 
 export type BuildOptionsLike = {

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

@@ -1,37 +1,64 @@
 import { assert, type Equals } from "tsafe/assert";
 import type { KeycloakAccountV1Version, KeycloakThemeAdditionalInfoExtensionVersion } from "./extensionVersions";
+import type { KeycloakVersionRange } from "../../shared/KeycloakVersionRange";
 
 export function getKeycloakVersionRangeForJar(params: {
     doesImplementAccountTheme: boolean;
     keycloakAccountV1Version: KeycloakAccountV1Version;
     keycloakThemeAdditionalInfoExtensionVersion: KeycloakThemeAdditionalInfoExtensionVersion;
-}): string | undefined {
+}): KeycloakVersionRange | undefined {
     const { keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion, doesImplementAccountTheme } = params;
 
-    switch (keycloakAccountV1Version) {
-        case null:
-            switch (keycloakThemeAdditionalInfoExtensionVersion) {
+    if (doesImplementAccountTheme) {
+        const keycloakVersionRange = (() => {
+            switch (keycloakAccountV1Version) {
                 case null:
-                    return doesImplementAccountTheme ? "21-and-below" : "21-and-below";
-                case "1.1.5":
-                    return doesImplementAccountTheme ? undefined : "22-and-above";
+                    switch (keycloakThemeAdditionalInfoExtensionVersion) {
+                        case null:
+                            return "21-and-below" as const;
+                        case "1.1.5":
+                            return undefined;
+                    }
+                    assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
+                case "0.3":
+                    switch (keycloakThemeAdditionalInfoExtensionVersion) {
+                        case null:
+                            return undefined;
+                        case "1.1.5":
+                            return "23" as const;
+                    }
+                    assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
+                case "0.4":
+                    switch (keycloakThemeAdditionalInfoExtensionVersion) {
+                        case null:
+                            return undefined;
+                        case "1.1.5":
+                            return "24-and-above" as const;
+                    }
+                    assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
             }
-            assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
-        case "0.3":
-            switch (keycloakThemeAdditionalInfoExtensionVersion) {
-                case null:
-                    return doesImplementAccountTheme ? undefined : undefined;
-                case "1.1.5":
-                    return doesImplementAccountTheme ? "23" : undefined;
+        })();
+
+        assert<Equals<typeof keycloakVersionRange, KeycloakVersionRange.WithAccountTheme | undefined>>();
+
+        return keycloakVersionRange;
+    } else {
+        const keycloakVersionRange = (() => {
+            if (keycloakAccountV1Version !== null) {
+                return undefined;
             }
-            assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
-        case "0.4":
+
             switch (keycloakThemeAdditionalInfoExtensionVersion) {
                 case null:
-                    return doesImplementAccountTheme ? undefined : undefined;
+                    return "21-and-below";
                 case "1.1.5":
-                    return doesImplementAccountTheme ? "24-and-above" : undefined;
+                    return "22-and-above";
             }
             assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
+        })();
+
+        assert<Equals<typeof keycloakVersionRange, KeycloakVersionRange.WithoutAccountTheme | undefined>>();
+
+        return keycloakVersionRange;
     }
 }