From 163b060dc56df7b3e3ca7a3a9ea35a8fc61974e9 Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Sun, 15 Dec 2024 18:15:36 +0100 Subject: [PATCH] Additional teaks --- src/bin/shared/constants.ts | 2 +- src/bin/start-keycloak/realmConfig/prepareRealmConfig.ts | 9 +++++---- src/bin/start-keycloak/start-keycloak.ts | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bin/shared/constants.ts b/src/bin/shared/constants.ts index 9aaaae0e..b31b434e 100644 --- a/src/bin/shared/constants.ts +++ b/src/bin/shared/constants.ts @@ -82,7 +82,7 @@ export const KEYCLOAK_THEME = "keycloak-theme"; export const KEYCLOAKIFY_SPA_DEV_SERVER_PORT = "KEYCLOAKIFY_SPA_DEV_SERVER_PORT"; -export const KEYCLOAKIFY_LOGGING_VERSION = "1.0.1"; +export const KEYCLOAKIFY_LOGGING_VERSION = "1.0.3"; export const KEYCLOAKIFY_LOGIN_JAR_BASENAME = `keycloakify-logging-${KEYCLOAKIFY_LOGGING_VERSION}.jar`; diff --git a/src/bin/start-keycloak/realmConfig/prepareRealmConfig.ts b/src/bin/start-keycloak/realmConfig/prepareRealmConfig.ts index 46cbf531..e97bf3ca 100644 --- a/src/bin/start-keycloak/realmConfig/prepareRealmConfig.ts +++ b/src/bin/start-keycloak/realmConfig/prepareRealmConfig.ts @@ -69,10 +69,11 @@ function enableCustomThemes(params: { const { parsedRealmJson, themeName, implementedThemeTypes } = params; for (const themeType of objectKeys(implementedThemeTypes)) { - parsedRealmJson[`${themeType}Theme` as const] = implementedThemeTypes[themeType] - .isImplemented - ? themeName - : ""; + if (!implementedThemeTypes[themeType].isImplemented) { + continue; + } + + parsedRealmJson[`${themeType}Theme` as const] = themeName; } } diff --git a/src/bin/start-keycloak/start-keycloak.ts b/src/bin/start-keycloak/start-keycloak.ts index 64739285..5794e74f 100644 --- a/src/bin/start-keycloak/start-keycloak.ts +++ b/src/bin/start-keycloak/start-keycloak.ts @@ -380,7 +380,7 @@ export async function command(params: { const dockerRunArgs: string[] = [ `-p${SPACE_PLACEHOLDER}${port}:8080`, `--name${SPACE_PLACEHOLDER}${CONTAINER_NAME}`, - ...(keycloakMajorVersionNumber >= 25 + ...(keycloakMajorVersionNumber >= 26 ? [ `-e${SPACE_PLACEHOLDER}KC_BOOTSTRAP_ADMIN_USERNAME=admin`, `-e${SPACE_PLACEHOLDER}KC_BOOTSTRAP_ADMIN_PASSWORD=admin`