keycloakify 10.0.0-rc.44 → 10.0.0-rc.46

package/bin/526.index.js

@@ -22,31 +22,53 @@ function getJarFileBasename(params) {
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "As": () => (/* binding */ readMetaInfKeycloakThemes),
+/* harmony export */   "IS": () => (/* binding */ readMetaInfKeycloakThemes_fromJar),
 /* harmony export */   "JJ": () => (/* binding */ writeMetaInfKeycloakThemes),
+/* harmony export */   "Ju": () => (/* binding */ readMetaInfKeycloakThemes_fromResourcesDirPath),
 /* harmony export */   "KQ": () => (/* binding */ getMetaInfKeycloakThemesJsonFilePath)
 /* harmony export */ });
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(71017);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(57147);
 /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(88078);
+/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(tsafe_assert__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _tools_extractArchive__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29121);
+
+
 
 
 function getMetaInfKeycloakThemesJsonFilePath(params) {
-    const { keycloakifyBuildDirPath } = params;
-    return (0,path__WEBPACK_IMPORTED_MODULE_0__.join)(keycloakifyBuildDirPath === "." ? "" : keycloakifyBuildDirPath, "src", "main", "resources", "META-INF", "keycloak-themes.json");
+    const { resourcesDirPath } = params;
+    return (0,path__WEBPACK_IMPORTED_MODULE_0__.join)(resourcesDirPath === "." ? "" : resourcesDirPath, "META-INF", "keycloak-themes.json");
 }
-function readMetaInfKeycloakThemes(params) {
-    const { keycloakifyBuildDirPath } = params;
+function readMetaInfKeycloakThemes_fromResourcesDirPath(params) {
+    const { resourcesDirPath } = params;
     return JSON.parse(fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync(getMetaInfKeycloakThemesJsonFilePath({
-        keycloakifyBuildDirPath
+        resourcesDirPath
     }))
         .toString("utf8"));
 }
+async function readMetaInfKeycloakThemes_fromJar(params) {
+    const { jarFilePath } = params;
+    let metaInfKeycloakThemes = undefined;
+    await (0,_tools_extractArchive__WEBPACK_IMPORTED_MODULE_3__/* .extractArchive */ .N)({
+        archiveFilePath: jarFilePath,
+        onArchiveFile: async ({ relativeFilePathInArchive, readFile, earlyExit }) => {
+            if (relativeFilePathInArchive ===
+                getMetaInfKeycloakThemesJsonFilePath({ resourcesDirPath: "." })) {
+                metaInfKeycloakThemes = JSON.parse((await readFile()).toString("utf8"));
+                earlyExit();
+            }
+        }
+    });
+    (0,tsafe_assert__WEBPACK_IMPORTED_MODULE_2__.assert)(metaInfKeycloakThemes !== undefined);
+    return metaInfKeycloakThemes;
+}
 function writeMetaInfKeycloakThemes(params) {
-    const { keycloakifyBuildDirPath, metaInfKeycloakThemes } = params;
+    const { resourcesDirPath, metaInfKeycloakThemes } = params;
     const metaInfKeycloakThemesJsonPath = getMetaInfKeycloakThemesJsonFilePath({
-        keycloakifyBuildDirPath
+        resourcesDirPath
     });
     {
         const dirPath = (0,path__WEBPACK_IMPORTED_MODULE_0__.dirname)(metaInfKeycloakThemesJsonPath);
@@ -409,11 +431,11 @@ async function appBuild(params) {
 
 (0,assert.assert)();
 async function keycloakifyBuild(params) {
-    const { buildContext, doSkipBuildJars } = params;
+    const { buildContext, onlyBuildJarFileBasename } = params;
     const dResult = new Deferred.Deferred();
     const child = external_child_process_.spawn("npx", ["keycloakify", "build"], {
         cwd: buildContext.projectDirPath,
-        env: Object.assign(Object.assign({}, process.env), (doSkipBuildJars ? { [constants/* skipBuildJarsEnvName */.uo]: "true" } : {}))
+        env: Object.assign(Object.assign({}, process.env), { [constants/* onlyBuildJarFileBasenameEnvName */.Dv]: onlyBuildJarFileBasename })
     });
     child.stdout.on("data", data => process.stdout.write(data));
     child.stderr.on("data", data => process.stderr.write(data));
@@ -422,6 +444,12 @@ async function keycloakifyBuild(params) {
     return { isKeycloakifyBuildSuccess: isSuccess };
 }
 //# sourceMappingURL=keycloakifyBuild.js.map
+// EXTERNAL MODULE: ./dist/bin/tools/isInside.js
+var isInside = __webpack_require__(90665);
+// EXTERNAL MODULE: ./dist/bin/tools/fs.existsAsync.js
+var fs_existsAsync = __webpack_require__(43765);
+// EXTERNAL MODULE: ./dist/bin/tools/fs.rm.js
+var fs_rm = __webpack_require__(8699);
 ;// CONCATENATED MODULE: ./dist/bin/start-keycloak/start-keycloak.js
 
 
@@ -440,6 +468,9 @@ async function keycloakifyBuild(params) {
 
 
 
+
+
+
 
 
 
@@ -492,7 +523,7 @@ async function command(params) {
             process.exit(1);
         }
         const { isKeycloakifyBuildSuccess } = await keycloakifyBuild({
-            doSkipBuildJars: false,
+            onlyBuildJarFileBasename: undefined,
             buildContext
         });
         if (!isKeycloakifyBuildSuccess) {
@@ -500,10 +531,20 @@ async function command(params) {
             process.exit(1);
         }
     }
-    const metaInfKeycloakThemes = (0,shared_metaInfKeycloakThemes/* readMetaInfKeycloakThemes */.As)({
-        keycloakifyBuildDirPath: buildContext.keycloakifyBuildDirPath
-    });
-    const doesImplementAccountTheme = metaInfKeycloakThemes.themes.some(({ name }) => name === constants/* accountV1ThemeName */.y_);
+    const { doesImplementAccountTheme } = await (async () => {
+        const latestJarFilePath = external_fs_.readdirSync(buildContext.keycloakifyBuildDirPath)
+            .filter(fileBasename => fileBasename.endsWith(".jar"))
+            .map(fileBasename => (0,external_path_.join)(buildContext.keycloakifyBuildDirPath, fileBasename))
+            .sort((a, b) => external_fs_.statSync(b).mtimeMs - external_fs_.statSync(a).mtimeMs)[0];
+        (0,assert.assert)(latestJarFilePath !== undefined);
+        const metaInfKeycloakThemes = await (0,shared_metaInfKeycloakThemes/* readMetaInfKeycloakThemes_fromJar */.IS)({
+            jarFilePath: latestJarFilePath
+        });
+        const mainThemeEntry = metaInfKeycloakThemes.themes.find(({ name }) => name === buildContext.themeNames[0]);
+        (0,assert.assert)(mainThemeEntry !== undefined);
+        const doesImplementAccountTheme = mainThemeEntry.types.includes("account");
+        return { doesImplementAccountTheme };
+    })();
     const { keycloakVersion, keycloakMajorNumber: keycloakMajorVersionNumber } = await (async function getKeycloakMajor() {
         if (cliCommandOptions.keycloakVersion !== undefined) {
             return {
@@ -538,7 +579,10 @@ async function command(params) {
                 if (keycloakMajorVersionNumber === 23) {
                     return "23";
                 }
-                return "24-and-above";
+                if (keycloakMajorVersionNumber === 24) {
+                    return "24";
+                }
+                return "25-and-above";
             })();
             (0,assert.assert)();
             return keycloakVersionRange;
@@ -586,40 +630,25 @@ async function command(params) {
         return (0,external_path_.join)(dirPath, value);
     })();
     const jarFilePath = (0,external_path_.join)(buildContext.keycloakifyBuildDirPath, jarFileBasename);
-    const { doUseBuiltInAccountV1Theme } = await (async () => {
-        let doUseBuiltInAccountV1Theme = false;
+    async function extractThemeResourcesFromJar() {
         await (0,extractArchive/* extractArchive */.N)({
             archiveFilePath: jarFilePath,
-            onArchiveFile: async ({ relativeFilePathInArchive, readFile, earlyExit }) => {
-                for (const themeName of buildContext.themeNames) {
-                    if (relativeFilePathInArchive ===
-                        (0,external_path_.join)("theme", themeName, "account", "theme.properties")) {
-                        if ((await readFile())
-                            .toString("utf8")
-                            .includes("parent=keycloak")) {
-                            doUseBuiltInAccountV1Theme = true;
-                        }
-                        earlyExit();
-                    }
+            onArchiveFile: async ({ relativeFilePathInArchive, writeFile }) => {
+                if ((0,isInside/* isInside */.V)({ dirPath: "theme", filePath: relativeFilePathInArchive })) {
+                    await writeFile({
+                        filePath: (0,external_path_.join)(buildContext.keycloakifyBuildDirPath, relativeFilePathInArchive)
+                    });
                 }
             }
         });
-        return { doUseBuiltInAccountV1Theme };
-    })();
-    const accountThemePropertyPatch = !doUseBuiltInAccountV1Theme
-        ? undefined
-        : () => {
-            for (const themeName of buildContext.themeNames) {
-                const filePath = (0,external_path_.join)(buildContext.keycloakifyBuildDirPath, "src", "main", "resources", "theme", themeName, "account", "theme.properties");
-                const sourceCode = external_fs_.readFileSync(filePath);
-                const modifiedSourceCode = Buffer.from(sourceCode
-                    .toString("utf8")
-                    .replace(`parent=${constants/* accountV1ThemeName */.y_}`, "parent=keycloak"), "utf8");
-                (0,assert.assert)(Buffer.compare(modifiedSourceCode, sourceCode) !== 0);
-                external_fs_.writeFileSync(filePath, modifiedSourceCode);
-            }
-        };
-    accountThemePropertyPatch === null || accountThemePropertyPatch === void 0 ? void 0 : accountThemePropertyPatch();
+    }
+    {
+        const destDirPath = (0,external_path_.join)(buildContext.keycloakifyBuildDirPath, "theme");
+        if (await (0,fs_existsAsync/* existsAsync */.o)(destDirPath)) {
+            await (0,fs_rm.rm)(destDirPath, { recursive: true });
+        }
+    }
+    await extractThemeResourcesFromJar();
     try {
         external_child_process_.execSync(`docker rm --force ${constants/* containerName */.h6}`, {
             stdio: "ignore"
@@ -646,10 +675,12 @@ async function command(params) {
                 : []),
             ...[
                 ...buildContext.themeNames,
-                ...(doUseBuiltInAccountV1Theme ? [] : [constants/* accountV1ThemeName */.y_])
+                ...(external_fs_.existsSync((0,external_path_.join)(buildContext.keycloakifyBuildDirPath, "theme", constants/* accountV1ThemeName */.y_))
+                    ? [constants/* accountV1ThemeName */.y_]
+                    : [])
             ]
                 .map(themeName => ({
-                localDirPath: (0,external_path_.join)(buildContext.keycloakifyBuildDirPath, "src", "main", "resources", "theme", themeName),
+                localDirPath: (0,external_path_.join)(buildContext.keycloakifyBuildDirPath, "theme", themeName),
                 containerDirPath: `/opt/keycloak/themes/${themeName}`
             }))
                 .map(({ localDirPath, containerDirPath }) => [
@@ -718,13 +749,13 @@ async function command(params) {
                 return;
             }
             const { isKeycloakifyBuildSuccess } = await keycloakifyBuild({
-                doSkipBuildJars: true,
+                onlyBuildJarFileBasename: jarFileBasename,
                 buildContext
             });
             if (!isKeycloakifyBuildSuccess) {
                 return;
             }
-            accountThemePropertyPatch === null || accountThemePropertyPatch === void 0 ? void 0 : accountThemePropertyPatch();
+            await extractThemeResourcesFromJar();
             console.log(source_default().green("Theme rebuilt and updated in Keycloak."));
         });
         const { waitForDebounce } = (0,tools_waitForDebounce/* waitForDebounceFactory */.z)({ delay: 400 });

package/bin/538.index.js

@@ -156,7 +156,9 @@ function getBuildContext(params) {
         if (typeof buildOptions.themeName === "string") {
             return [buildOptions.themeName];
         }
-        return buildOptions.themeName;
+        const [mainThemeName, ...themeVariantNames] = buildOptions.themeName;
+        (0,tsafe.assert)(mainThemeName !== undefined);
+        return [mainThemeName, ...themeVariantNames];
     })();
     const projectBuildDirPath = (() => {
         var _a;
@@ -285,6 +287,7 @@ function getBuildContext(params) {
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "Dv": () => (/* binding */ onlyBuildJarFileBasenameEnvName),
 /* harmony export */   "M": () => (/* binding */ basenameOfTheKeycloakifyResourcesDir),
 /* harmony export */   "N$": () => (/* binding */ keycloak_resources),
 /* harmony export */   "UX": () => (/* binding */ accountThemePageIds),
@@ -294,7 +297,6 @@ function getBuildContext(params) {
 /* harmony export */   "lg": () => (/* binding */ nameOfTheLocalizationRealmOverridesUserProfileProperty),
 /* harmony export */   "rO": () => (/* binding */ themeTypes),
 /* harmony export */   "sj": () => (/* binding */ loginThemePageIds),
-/* harmony export */   "uo": () => (/* binding */ skipBuildJarsEnvName),
 /* harmony export */   "v$": () => (/* binding */ lastKeycloakVersionWithAccountV1),
 /* harmony export */   "y_": () => (/* binding */ accountV1ThemeName),
 /* harmony export */   "z0": () => (/* binding */ resources_common)
@@ -311,7 +313,7 @@ const vitePluginSubScriptEnvNames = {
     runPostBuildScript: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
     resolveViteConfig: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
 };
-const skipBuildJarsEnvName = "KEYCLOAKIFY_SKIP_BUILD_JAR";
+const onlyBuildJarFileBasenameEnvName = "KEYCLOAKIFY_ONLY_BUILD_JAR_FILE_BASENAME";
 const loginThemePageIds = [
     "login.ftl",
     "login-username.ftl",