100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Added possibility to set custom theme for keycloak
Michael Rademakerac0dbbce3839
diff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.javaindex 7a83c2d39..5fa767585 100644--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java@@ -43,6 +43,7 @@ import org.openremote.container.web.ClientRequestInfo;import org.openremote.container.web.ProxyWebClientBuilder;import org.openremote.container.web.WebClient;import org.openremote.container.web.WebService;+import org.openremote.model.util.TextUtil;import javax.ws.rs.HttpMethod;import javax.ws.rs.NotFoundException;@@ -341,9 +342,16 @@ public abstract class KeycloakIdentityProvider implements IdentityProvider {realmRepresentation.getDisplayName().replaceAll("[^A-Za-z0-9]", ""));realmRepresentation.setAccessTokenLifespan(accessTokenLifespanSeconds);- realmRepresentation.setLoginTheme("openremote");- realmRepresentation.setAccountTheme("openremote");- realmRepresentation.setEmailTheme("openremote");++ if(TextUtil.isNullOrEmpty(realmRepresentation.getLoginTheme())) {+ realmRepresentation.setLoginTheme("openremote");+ }+ if(TextUtil.isNullOrEmpty(realmRepresentation.getAccountTheme())) {+ realmRepresentation.setAccountTheme("openremote");+ }+ if(TextUtil.isNullOrEmpty(realmRepresentation.getEmailTheme())) {+ realmRepresentation.setEmailTheme("openremote");+ }realmRepresentation.setSsoSessionIdleTimeout(sessionTimeoutSeconds);realmRepresentation.setSsoSessionMaxLifespan(sessionMaxSeconds);diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakInitSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakInitSetup.javaindex 8db8f506a..b9c7c712f 100644--- a/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakInitSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakInitSetup.java@@ -38,8 +38,15 @@ public class KeycloakInitSetup extends AbstractKeycloakSetup {private static final Logger LOG = Logger.getLogger(KeycloakInitSetup.class.getName());+ protected static final String MASTER_REALM_KEYCLOAK_THEME = "MASTER_REALM_KEYCLOAK_THEME";++ protected String masterRealmKeycloakTheme;++public KeycloakInitSetup(Container container) {super(container);++ masterRealmKeycloakTheme = container.getConfig().getOrDefault(MASTER_REALM_KEYCLOAK_THEME, "openremote");}@Override@@ -50,6 +57,9 @@ public class KeycloakInitSetup extends AbstractKeycloakSetup {RealmRepresentation masterRealm = masterRealmResource.toRepresentation();masterRealm.setDisplayName("Master");+ masterRealm.setAccountTheme(masterRealmKeycloakTheme);+ masterRealm.setEmailTheme(masterRealmKeycloakTheme);+ masterRealm.setLoginTheme(masterRealmKeycloakTheme);// Set SMTP server, theme, timeouts, etc.keycloakProvider.configureRealm(masterRealm, emailConfig);diff --git a/model/src/main/java/org/openremote/model/security/Tenant.java b/model/src/main/java/org/openremote/model/security/Tenant.javaindex 3c78fce23..9238b8dca 100644--- a/model/src/main/java/org/openremote/model/security/Tenant.java+++ b/model/src/main/java/org/openremote/model/security/Tenant.java@@ -66,6 +66,18 @@ public class Tenant {@Transientprotected Boolean rememberMe;+ @Transient+ protected String loginTheme;++ @Transient+ protected String accountTheme;++ @Transient+ protected String adminTheme;++ @Transient+ protected String emailTheme;+@JsIgnorepublic Tenant() {this(null, null, null, null);@@ -156,6 +168,38 @@ public class Tenant {&& (notBefore == null || notBefore == 0 || notBefore <= (currentTimeMillis/1000));}+ public String getLoginTheme() {+ return loginTheme;+ }++ public void setLoginTheme(String loginTheme) {+ this.loginTheme = loginTheme;+ }++ public String getAccountTheme() {+ return accountTheme;+ }++ public void setAccountTheme(String accountTheme) {+ this.accountTheme = accountTheme;+ }++ public String getAdminTheme() {+ return adminTheme;+ }++ public void setAdminTheme(String adminTheme) {+ this.adminTheme = adminTheme;+ }++ public String getEmailTheme() {+ return emailTheme;+ }++ public void setEmailTheme(String emailTheme) {+ this.emailTheme = emailTheme;+ }+@Overridepublic String toString() {return getClass().getSimpleName() + "{" +diff --git a/profile/deploy.yml b/profile/deploy.ymlindex 3e8dcb3e5..e7129e963 100644--- a/profile/deploy.yml+++ b/profile/deploy.yml@@ -154,6 +154,7 @@ services:# The service-internal host name and port of the identity provider.KEYCLOAK_HOST: keycloakKEYCLOAK_PORT: 8080+ MASTER_REALM_KEYCLOAK_THEME: ${MASTER_REALM_KEYCLOAK_THEME:-openremote}# The service-internal webservice interface binding, bind to all interfaces# when running in container. Default is 127.0.0.1.