keycloakify 10.0.0-rc.142 → 10.0.0-rc.143

package/bin/526.index.js

@@ -790,6 +790,15 @@ async function command(params) {
     child.on("exit", process.exit);
     const srcDirPath = (0,external_path_.join)(buildContext.projectDirPath, "src");
     {
+        const kcHttpRelativePath = (() => {
+            const match = buildContext.startKeycloakOptions.dockerExtraArgs
+                .join(" ")
+                .match(/KC_HTTP_RELATIVE_PATH=([^ ]+)/);
+            if (match === null) {
+                return undefined;
+            }
+            return match[1];
+        })();
         const handler = async (data) => {
             if (!data.toString("utf8").includes("Listening on: http://0.0.0.0:8080")) {
                 return;
@@ -800,13 +809,22 @@ async function command(params) {
                 "",
                 `The ftl files from ${source_default().bold(`.${external_path_.sep}${(0,external_path_.relative)(process.cwd(), (0,external_path_.join)(buildContext.keycloakifyBuildDirPath, "theme"))}`)} are mounted in the Keycloak container.`,
                 "",
-                `Keycloak Admin console: ${source_default().cyan.bold(`http://localhost:${port}`)}`,
+                `Keycloak Admin console: ${source_default().cyan.bold(`http://localhost:${port}${kcHttpRelativePath !== null && kcHttpRelativePath !== void 0 ? kcHttpRelativePath : ""}`)}`,
                 `- user:     ${source_default().cyan.bold("admin")}`,
                 `- password: ${source_default().cyan.bold("admin")}`,
                 "",
                 "",
                 `${source_default().green("Your theme is accessible at:")}`,
-                `${source_default().green("➜")} ${source_default().cyan.bold(`https://my-theme.keycloakify.dev${port === DEFAULT_PORT ? "" : `?port=${port}`}`)}`,
+                `${source_default().green("➜")} ${source_default().cyan.bold((() => {
+                    const url = new URL("https://my-theme.keycloakify.dev");
+                    if (port !== DEFAULT_PORT) {
+                        url.searchParams.set("port", `${port}`);
+                    }
+                    if (kcHttpRelativePath !== undefined) {
+                        url.searchParams.set("kcHttpRelativePath", kcHttpRelativePath);
+                    }
+                    return url.href;
+                })())}`,
                 "",
                 "You can login with the following credentials:",
                 `- username: ${source_default().cyan.bold("testuser")}`,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "10.0.0-rc.142",
+    "version": "10.0.0-rc.143",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",

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

@@ -314,7 +314,8 @@ export async function generateResourcesForMainTheme(params: {
         }
 
         const { extractedDirPath } = await downloadAndExtractArchive({
-            urlOrPath: "https://repo1.maven.org/maven2/org/keycloak/keycloak-account-ui/25.0.1/keycloak-account-ui-25.0.1.jar",
+            urlOrPath:
+                "https://repo1.maven.org/maven2/org/keycloak/keycloak-account-ui/25.0.1/keycloak-account-ui-25.0.1.jar",
             cacheDirPath: buildContext.cacheDirPath,
             fetchOptions: buildContext.fetchOptions,
             uniqueIdOfOnArchiveFile: "bring_in_account_v3_i18n_messages",

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

@@ -431,6 +431,18 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
     const srcDirPath = pathJoin(buildContext.projectDirPath, "src");
 
     {
+        const kcHttpRelativePath = (() => {
+            const match = buildContext.startKeycloakOptions.dockerExtraArgs
+                .join(" ")
+                .match(/KC_HTTP_RELATIVE_PATH=([^ ]+)/);
+
+            if (match === null) {
+                return undefined;
+            }
+
+            return match[1];
+        })();
+
         const handler = async (data: Buffer) => {
             if (!data.toString("utf8").includes("Listening on: http://0.0.0.0:8080")) {
                 return;
@@ -448,7 +460,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                     )} are mounted in the Keycloak container.`,
                     "",
                     `Keycloak Admin console: ${chalk.cyan.bold(
-                        `http://localhost:${port}`
+                        `http://localhost:${port}${kcHttpRelativePath ?? ""}`
                     )}`,
                     `- user:     ${chalk.cyan.bold("admin")}`,
                     `- password: ${chalk.cyan.bold("admin")}`,
@@ -456,7 +468,21 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                     "",
                     `${chalk.green("Your theme is accessible at:")}`,
                     `${chalk.green("➜")} ${chalk.cyan.bold(
-                        `https://my-theme.keycloakify.dev${port === DEFAULT_PORT ? "" : `?port=${port}`}`
+                        (() => {
+                            const url = new URL("https://my-theme.keycloakify.dev");
+
+                            if (port !== DEFAULT_PORT) {
+                                url.searchParams.set("port", `${port}`);
+                            }
+                            if (kcHttpRelativePath !== undefined) {
+                                url.searchParams.set(
+                                    "kcHttpRelativePath",
+                                    kcHttpRelativePath
+                                );
+                            }
+
+                            return url.href;
+                        })()
                     )}`,
                     "",
                     "You can login with the following credentials:",

package/src/bin/tools/downloadAndExtractArchive.ts

@@ -21,7 +21,7 @@ export async function downloadAndExtractArchive(params: {
     }) => Promise<void>;
     cacheDirPath: string;
     fetchOptions: FetchOptions | undefined;
-}): Promise<{ extractedDirPath: string; archiveFilePath: string; }> {
+}): Promise<{ extractedDirPath: string; archiveFilePath: string }> {
     const {
         urlOrPath,
         uniqueIdOfOnArchiveFile,