Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Keycloak update to use standard keycloak image v7.0.0

Rich Turner13dd81b2be90
diff --git a/container/build.gradle b/container/build.gradle
index ca177c7b7..89fa5b64e 100644
--- a/container/build.gradle
+++ b/container/build.gradle
@@ -42,6 +42,8 @@ dependencies {
compile "org.hibernate:hibernate-core:$hibernateVersion"
compile "org.hibernate:hibernate-validator:$hibernateValidatorVersion"
+ compile "javax.el:javax.el-api:3.0.0"
+
compile "org.apache.camel:camel-core:$camelVersion"
compile "org.apache.camel:camel-jackson:$camelVersion"
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.java
index 271475a42..7a83c2d39 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
@@ -338,7 +338,7 @@ public abstract class KeycloakIdentityProvider implements IdentityProvider {
public void configureRealm(RealmRepresentation realmRepresentation, int accessTokenLifespanSeconds) {
realmRepresentation.setDisplayNameHtml(
- "<span>" + (realmRepresentation.getDisplayName().replaceAll("[^A-Za-z0-9]", "")) + " </span>"
+ realmRepresentation.getDisplayName().replaceAll("[^A-Za-z0-9]", "")
);
realmRepresentation.setAccessTokenLifespan(accessTokenLifespanSeconds);
realmRepresentation.setLoginTheme("openremote");
diff --git a/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java b/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java
index e5283b82b..a6dfc28f9 100644
--- a/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java
+++ b/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java
@@ -21,27 +21,26 @@ package org.openremote.container.web;
import io.undertow.server.DefaultByteBufferPool;
import io.undertow.server.HttpHandler;
-import io.undertow.servlet.api.*;
-import io.undertow.servlet.util.ImmediateInstanceHandle;
+import io.undertow.servlet.api.DeploymentInfo;
+import io.undertow.servlet.api.SecurityConstraint;
+import io.undertow.servlet.api.SecurityInfo;
+import io.undertow.servlet.api.WebResourceCollection;
import io.undertow.websockets.jsr.DefaultContainerConfigurator;
import io.undertow.websockets.jsr.UndertowContainerProvider;
import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
import org.keycloak.KeycloakPrincipal;
import org.openremote.container.message.MessageBrokerSetupService;
import org.openremote.container.security.AuthContext;
+import org.openremote.container.security.IdentityService;
import org.openremote.container.security.basic.BasicAuthContext;
import org.openremote.container.security.keycloak.AccessTokenAuthContext;
-import org.openremote.container.security.IdentityService;
import org.openremote.container.web.socket.WebsocketAdapter;
-import org.openremote.container.web.socket.WebsocketCORSFilter;
import org.openremote.container.web.socket.WebsocketComponent;
import org.openremote.container.web.socket.WebsocketConstants;
import org.xnio.OptionMap;
import org.xnio.Options;
import org.xnio.Xnio;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
import javax.websocket.HandshakeResponse;
import javax.websocket.server.HandshakeRequest;
import javax.websocket.server.ServerEndpointConfig;
diff --git a/gradle.properties b/gradle.properties
index ca40f6ac1..bd63e1dee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ undertowVersion = 1.4.12.Final
resteasyVersion = 3.0.24.Final
resteasyVersionAsyncHttpServlet = 3.0.19.Final
jbossLoggingAnnotationsVersion = 2.0.2.Final
-keycloakVersion = 2.5.5.Final
+keycloakVersion = 6.0.1
gwtVersion = 2.8.2
ginVersion = 2.1.2
elementoCoreVersion = 0.7.0
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index 41a616179..d888bac24 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -82,8 +82,8 @@ ENV JBOSS_HOME /opt/jboss/keycloak
# Switch to jboss user
USER jboss
-ENV KEYCLOAK_VERSION 2.5.5.Final
-ENV POSTGRESQL_DRIVER_VERSION 42.1.4
+ENV KEYCLOAK_VERSION 6.0.1
+ENV POSTGRESQL_DRIVER_VERSION 42.2.6
# Enables signals getting passed from startup script to JVM
# ensuring clean shutdown when container is stopped.
@@ -108,10 +108,10 @@ RUN java -jar /usr/share/java/saxon.jar \
/opt/jboss/keycloak/standalone/configuration/standalone-ha.xml \
/opt/jboss/keycloak/changeDatabase.xsl && \
rm /opt/jboss/keycloak/changeDatabase.xsl
-RUN mkdir -p /opt/jboss/keycloak/modules/system/layers/base/org/postgresql/jdbc/main && \
- curl -o /opt/jboss/keycloak/modules/system/layers/base/org/postgresql/jdbc/main/postgresql-jdbc.jar \
+RUN mkdir -p /opt/jboss/keycloak/modules/system/layers/keycloak/org/postgresql/main && \
+ curl -o /opt/jboss/keycloak/modules/system/layers/keycloak/org/postgresql/main/postgresql-jdbc.jar \
http://repo1.maven.org/maven2/org/postgresql/postgresql/${POSTGRESQL_DRIVER_VERSION}/postgresql-${POSTGRESQL_DRIVER_VERSION}.jar 2>/dev/null
-ADD module.xml /opt/jboss/keycloak/modules/system/layers/base/org/postgresql/jdbc/main/
+ADD module.xml /opt/jboss/keycloak/modules/system/layers/keycloak/org/postgresql/main/
ADD setProxyForwarding.xsl /opt/jboss/keycloak/
RUN java -jar /usr/share/java/saxon.jar \
diff --git a/keycloak/changeDatabase.xsl b/keycloak/changeDatabase.xsl
index 23f7147cb..a60558059 100644
--- a/keycloak/changeDatabase.xsl
+++ b/keycloak/changeDatabase.xsl
@@ -2,7 +2,7 @@
<xsl:stylesheet version="2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:ds="urn:jboss:domain:datasources:4.0">
+ xmlns:ds="urn:jboss:domain:datasources:5.0">
<xsl:output method="xml" indent="yes"/>
@@ -30,7 +30,7 @@
<xsl:template match="//ds:subsystem/ds:datasources/ds:drivers">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
- <ds:driver name="postgresql" module="org.postgresql.jdbc">
+ <ds:driver name="postgresql" module="org.postgresql">
<ds:xa-datasource-class>org.postgresql.xa.PGXADataSource</ds:xa-datasource-class>
</ds:driver>
</xsl:copy>
diff --git a/keycloak/dev.Dockerfile b/keycloak/dev.Dockerfile
index e696b7d02..03336e935 100644
--- a/keycloak/dev.Dockerfile
+++ b/keycloak/dev.Dockerfile
@@ -82,8 +82,8 @@ ENV JBOSS_HOME /opt/jboss/keycloak
# Switch to jboss user
USER jboss
-ENV KEYCLOAK_VERSION 2.5.5.Final
-ENV POSTGRESQL_DRIVER_VERSION 42.1.4
+ENV KEYCLOAK_VERSION 6.0.1
+ENV POSTGRESQL_DRIVER_VERSION 42.2.4
# Enables signals getting passed from startup script to JVM
# ensuring clean shutdown when container is stopped.
@@ -108,10 +108,10 @@ RUN java -jar /usr/share/java/saxon.jar \
/opt/jboss/keycloak/standalone/configuration/standalone-ha.xml \
/opt/jboss/keycloak/changeDatabase.xsl && \
rm /opt/jboss/keycloak/changeDatabase.xsl
-RUN mkdir -p /opt/jboss/keycloak/modules/system/layers/base/org/postgresql/jdbc/main && \
- curl -o /opt/jboss/keycloak/modules/system/layers/base/org/postgresql/jdbc/main/postgresql-jdbc.jar \
+RUN mkdir -p /opt/jboss/keycloak/modules/system/layers/keycloak/org/postgresql/main && \
+ curl -o /opt/jboss/keycloak/modules/system/layers/keycloak/org/postgresql/main/postgresql-jdbc.jar \
http://repo1.maven.org/maven2/org/postgresql/postgresql/${POSTGRESQL_DRIVER_VERSION}/postgresql-${POSTGRESQL_DRIVER_VERSION}.jar 2>/dev/null
-ADD module.xml /opt/jboss/keycloak/modules/system/layers/base/org/postgresql/jdbc/main/
+ADD module.xml /opt/jboss/keycloak/modules/system/layers/keycloak/org/postgresql/main/
ADD setProxyForwarding.xsl /opt/jboss/keycloak/
RUN java -jar /usr/share/java/saxon.jar \
diff --git a/keycloak/module.xml b/keycloak/module.xml
index f61ff5166..b7ab16bd0 100644
--- a/keycloak/module.xml
+++ b/keycloak/module.xml
@@ -20,7 +20,7 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<module xmlns="urn:jboss:module:1.0" name="org.postgresql.jdbc">
+<module xmlns="urn:jboss:module:1.3" name="org.postgresql">
<resources>
<resource-root path="postgresql-jdbc.jar"/>
</resources>
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
index 71b15dcfc..b8987f922 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -891,7 +891,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
boolean includeRealmInfo = !query.select.excludeRealm;
if (level == 1) {
- sb.append(" from ASSET A ");
+ sb.append(" from Asset A ");
} else if (level == 2) {
sb.append(" from top_level_assets P ");
sb.append("join ASSET A on A.PARENT_ID = P.ID ");
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
index 38421c30a..96d7dd52d 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
@@ -128,23 +128,23 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
}
@Override
- public void updateTenant(ClientRequestInfo clientRequestInfo, String realm, Tenant tenant) {
+ public void updateTenant(String remoteAddress, String realm, Tenant tenant) {
throw new UnsupportedOperationException("This provider does not support multiple tenants");
}
@Override
- public void createTenant(ClientRequestInfo clientRequestInfo, Tenant tenant) {
+ public void createTenant(String remoteAddress, Tenant tenant) {
throw new UnsupportedOperationException("This provider does not support multiple tenants");
}
@Override
- public void createTenant(ClientRequestInfo clientRequestInfo, Tenant tenant, TenantEmailConfig emailConfig) {
+ public void createTenant(String remoteAddress, Tenant tenant, TenantEmailConfig emailConfig) {
throw new UnsupportedOperationException("This provider does not support multiple tenants");
}
@Override
- public void deleteTenant(ClientRequestInfo clientRequestInfo, String realm) {
+ public void deleteTenant(String remoteAddress, String realm) {
throw new UnsupportedOperationException("This provider does not support multiple tenants");
}
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
index f29373db2..b12804248 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
@@ -67,13 +67,13 @@ public interface ManagerIdentityProvider extends IdentityProvider {
Tenant getTenant(String realm);
- void updateTenant(ClientRequestInfo clientRequestInfo, String realm, Tenant tenant);
+ void updateTenant(String remoteAddress, String realm, Tenant tenant);
- void createTenant(ClientRequestInfo clientRequestInfo, Tenant tenant);
+ void createTenant(String remoteAddress, Tenant tenant);
- void createTenant(ClientRequestInfo clientRequestInfo, Tenant tenant, TenantEmailConfig emailConfig);
+ void createTenant(String remoteAddress, Tenant tenant, TenantEmailConfig emailConfig);
- void deleteTenant(ClientRequestInfo clientRequestInfo, String realm);
+ void deleteTenant(String remoteAddress, String realm);
boolean isTenantActiveAndAccessible(AuthContext authContext, Tenant tenant);
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index 964357caa..5b779d00e 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -27,6 +27,7 @@ import org.openremote.container.message.MessageBrokerService;
import org.openremote.container.persistence.PersistenceEvent;
import org.openremote.container.persistence.PersistenceService;
import org.openremote.container.security.AuthContext;
+import org.openremote.container.security.AuthForm;
import org.openremote.container.security.keycloak.KeycloakIdentityProvider;
import org.openremote.container.timer.TimerService;
import org.openremote.container.web.ClientRequestInfo;
@@ -65,6 +66,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
final protected MessageBrokerService messageBrokerService;
final protected ClientEventService clientEventService;
final protected ConsoleAppService consoleAppService;
+ final protected String accessToken;
public ManagerKeycloakIdentityProvider(UriBuilder externalServerUri, Container container) {
super(KEYCLOAK_CLIENT_ID, externalServerUri, container);
@@ -76,6 +78,10 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
this.clientEventService = container.getService(ClientEventService.class);
this.consoleAppService = container.getService(ConsoleAppService.class);
+ accessToken = getKeycloak().getAccessToken(
+ MASTER_REALM, new AuthForm("admin-cli", MASTER_REALM_ADMIN_USER, "secret")
+ ).getToken();
+
enableAuthProxy(container.getService(WebService.class));
}
@@ -349,38 +355,38 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
}
@Override
- public void updateTenant(ClientRequestInfo clientRequestInfo, String realm, Tenant tenant) {
+ public void updateTenant(String remoteAddress, String realm, Tenant tenant) {
LOG.fine("Update tenant: " + tenant);
- getRealms(clientRequestInfo).realm(realm).update(
+ getRealms(new ClientRequestInfo(remoteAddress, accessToken)).realm(realm).update(
convert(Container.JSON, RealmRepresentation.class, tenant)
);
publishModification(PersistenceEvent.Cause.UPDATE, tenant);
}
@Override
- public void createTenant(ClientRequestInfo clientRequestInfo, Tenant tenant) {
- createTenant(clientRequestInfo, tenant, null);
+ public void createTenant(String remoteAddress, Tenant tenant) {
+ createTenant(remoteAddress, tenant, null);
}
@Override
- public void createTenant(ClientRequestInfo clientRequestInfo, Tenant tenant, TenantEmailConfig emailConfig) {
+ public void createTenant(String remoteAddress, Tenant tenant, TenantEmailConfig emailConfig) {
LOG.fine("Create tenant: " + tenant);
RealmRepresentation realmRepresentation = convert(Container.JSON, RealmRepresentation.class, tenant);
configureRealm(realmRepresentation, emailConfig);
// TODO This is not atomic, write compensation actions
- getRealms(clientRequestInfo).create(realmRepresentation);
- createClientApplication(clientRequestInfo, realmRepresentation.getRealm());
+ getRealms(new ClientRequestInfo(remoteAddress, accessToken)).create(realmRepresentation);
+ createClientApplication(new ClientRequestInfo(null, accessToken), realmRepresentation.getRealm());
publishModification(PersistenceEvent.Cause.CREATE, tenant);
}
@Override
- public void deleteTenant(ClientRequestInfo clientRequestInfo, String realm) {
+ public void deleteTenant(String remoteAddress, String realm) {
Tenant tenant = getTenant(realm);
if (tenant != null) {
LOG.fine("Delete tenant: " + realm);
- getRealms(clientRequestInfo).realm(realm).remove();
+ getRealms(new ClientRequestInfo(remoteAddress, accessToken)).realm(realm).remove();
publishModification(PersistenceEvent.Cause.DELETE, tenant);
}
}
diff --git a/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java
index 626d7828c..6c2f31ce1 100644
--- a/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/security/TenantResourceImpl.java
@@ -92,7 +92,7 @@ public class TenantResourceImpl extends ManagerWebResource implements TenantReso
}
try {
identityService.getIdentityProvider().updateTenant(
- new ClientRequestInfo(getClientRemoteAddress(), requestParams.getBearerAuth()), realm, tenant
+ getClientRemoteAddress(), realm, tenant
);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
@@ -108,7 +108,7 @@ public class TenantResourceImpl extends ManagerWebResource implements TenantReso
}
try {
identityService.getIdentityProvider().createTenant(
- new ClientRequestInfo(getClientRemoteAddress(), requestParams.getBearerAuth()), tenant
+ getClientRemoteAddress(), tenant
);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
@@ -134,7 +134,7 @@ public class TenantResourceImpl extends ManagerWebResource implements TenantReso
}
try {
identityService.getIdentityProvider().deleteTenant(
- new ClientRequestInfo(getClientRemoteAddress(), requestParams.getBearerAuth()), realm
+ getClientRemoteAddress(), realm
);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
diff --git a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java
index d9fb14b9b..fdca1c8b6 100644
--- a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java
@@ -97,8 +97,8 @@ public abstract class AbstractKeycloakSetup implements Setup {
).getToken();
masterRealmResource = keycloakProvider.getRealms(accessToken).realm(MASTER_REALM);
- masterClientsResource = keycloakProvider.getRealms(accessToken).realm(MASTER_REALM).clients();
- masterUsersResource = keycloakProvider.getRealms(accessToken).realm(MASTER_REALM).users();
+ masterClientsResource = masterRealmResource.clients();
+ masterUsersResource = masterRealmResource.users();
}
protected String getClientObjectId(ClientsResource clientsResource) {
diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakDemoSetup.java
index 56d89d86d..629c9bb37 100644
--- a/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakDemoSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/KeycloakDemoSetup.java
@@ -74,14 +74,14 @@ public class KeycloakDemoSetup extends AbstractKeycloakSetup {
tenantA.setRealm("tenantA");
tenantA.setDisplayName("Tenant A");
tenantA.setEnabled(true);
- keycloakProvider.createTenant(new ClientRequestInfo(null, accessToken), tenantA, emailConfig);
+ keycloakProvider.createTenant(null, tenantA, emailConfig);
tenantA = keycloakProvider.getTenant(tenantA.getRealm());
tenantB = new Tenant();
tenantB.setRealm("tenantB");
tenantB.setDisplayName("Tenant B");
tenantB.setEnabled(true);
- keycloakProvider.createTenant(new ClientRequestInfo(null, accessToken), tenantB, emailConfig);
+ keycloakProvider.createTenant(null, tenantB, emailConfig);
tenantB = keycloakProvider.getTenant(tenantB.getRealm());
// Users
diff --git a/profile/deploy.yml b/profile/deploy.yml
index b7887f113..29645e327 100644
--- a/profile/deploy.yml
+++ b/profile/deploy.yml
@@ -248,11 +248,8 @@ services:
# Keycloak identity provider
keycloak:
- # Image will be built when not already in the cache or when `--build` option is supplied to `docker-compose up`
- build: '../keycloak'
-
# Image will be pulled when using the `docker-compose pull` command or `docker-compose up --no-build`
- image: openremote/keycloak:${DATE_TAG:-latest}
+ image: jboss/keycloak:7.0.0
environment:
@@ -270,13 +267,19 @@ services:
# SETUP_ADMIN_PASSWORD: # Allow override on CLI
# Configure how Keycloak connects to the database
- POSTGRES_DATABASE: openremote
- POSTGRES_USER: openremote
- POSTGRES_PASSWORD: CHANGE_ME_DB_USER_PASSWORD
+ DB_VENDOR: POSTGRES
+ DB_ADDR: postgresql
+ DB_PORT: 5432
+ DB_DATABASE: openremote
+ DB_USER: openremote
+ DB_SCHEMA: public
+ DB_PASSWORD: CHANGE_ME_DB_USER_PASSWORD
+ KEYCLOAK_USER: admin
+ KEYCLOAK_PASSWORD: secret
# Custom JVM options (increase heap size if required)
JAVA_OPTS: '-Xms300m -Xmx300m
- -XX:CompressedClassSpaceSize=25m -XX:MaxMetaspaceSize=150m
+ -XX:CompressedClassSpaceSize=25m -XX:MaxMetaspaceSize=200m
-XX:InitialCodeCacheSize=50m -XX:ReservedCodeCacheSize=50m
-XX:MaxDirectMemorySize=25m
-XX:NativeMemoryTracking=summary
diff --git a/profile/dev-testing.yml b/profile/dev-testing.yml
index e4840d8ae..d475c5fa0 100644
--- a/profile/dev-testing.yml
+++ b/profile/dev-testing.yml
@@ -14,15 +14,11 @@ services:
extends:
file: deploy.yml
service: keycloak
+ volumes:
+ - ${DEPLOYMENT_DIRECTORY:-../deployment}/keycloak/themes/openremote:/opt/jboss/keycloak/themes/openremote
# Access directly if needed on localhost
ports:
- "8081:8080"
- build:
- context: ../keycloak
- dockerfile: dev.Dockerfile
- image: openremote/keycloak_dev:${DATE_TAG:-latest}
- volumes:
- - ../ui/keycloak/themes/openremote:/opt/jboss/keycloak/themes/openremote
depends_on:
postgresql:
condition: service_healthy
diff --git a/test/src/main/groovy/org/openremote/test/TestAppSecurity.java b/test/src/main/groovy/org/openremote/test/TestAppSecurity.java
index 9fe85403c..93b906b64 100644
--- a/test/src/main/groovy/org/openremote/test/TestAppSecurity.java
+++ b/test/src/main/groovy/org/openremote/test/TestAppSecurity.java
@@ -21,7 +21,7 @@ package org.openremote.test;
import groovy.lang.Closure;
import org.keycloak.adapters.KeycloakDeployment;
-import org.keycloak.adapters.rotation.AdapterRSATokenVerifier;
+import org.keycloak.adapters.rotation.AdapterTokenVerifier;
import org.keycloak.representations.AccessToken;
import org.openremote.app.client.AppSecurity;
import org.openremote.model.Constants;
@@ -48,7 +48,7 @@ public class TestAppSecurity implements AppSecurity {
protected void updateAccessToken() {
token = accessTokenClosure.call();
try {
- accessToken = AdapterRSATokenVerifier.verifyToken(token, keycloakDeployment);
+ accessToken = AdapterTokenVerifier.verifyToken(token, keycloakDeployment);
} catch (Exception ex) {
throw new RuntimeException(ex);
}
diff --git a/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy b/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy
index 3efee5fb7..c471d5e8c 100644
--- a/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/admin/AdminTenantsActivityTest.groovy
@@ -274,10 +274,10 @@ class AdminTenantsActivityTest extends Specification implements ManagerContainer
"Test Name"
}
1 * adminTenantView.getTenantRealm() >> {
- return "testrealm"
+ "testrealm"
}
1 * adminTenantView.getTenantEnabled() >> {
- return true
+ true
}
and: "The success toast should be shown"
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
index 17c5fd078..c4502bc54 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
@@ -81,7 +81,7 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTr
def attributeTypeDescriptors = assetModelResource.getAttributeDescriptors(null)
then: "the default types should be present"
- attributeTypeDescriptors.size() == 11
+ attributeTypeDescriptors.size() == 12
attributeTypeDescriptors.any {it.attributeName == "consoleName"}
attributeTypeDescriptors.any {it.attributeName == "consoleVersion"}
attributeTypeDescriptors.any {it.attributeName == "consolePlatform"}
@@ -93,13 +93,14 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTr
attributeTypeDescriptors.any {it.attributeName == "street"}
attributeTypeDescriptors.any {it.attributeName == "location"}
attributeTypeDescriptors.any {it.attributeName == "surfaceArea"}
+ attributeTypeDescriptors.any {it.attributeName == "status"}
when: "a request for Attribute value types is made"
def attributeValueTypeDescriptors = assetModelResource.getAttributeValueDescriptors(null)
then: "the default value types should be present"
- attributeValueTypeDescriptors.size() == 54
+ attributeValueTypeDescriptors.size() == 55
when: "a request for Attribute value types is made"
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
index 6dd1d06ce..3a4085aec 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
@@ -190,7 +190,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
def apartment3Engine = rulesService.assetEngines.get(managerDemoSetup.apartment3Id)
def tenantATenant = keycloakDemoSetup.tenantA
tenantATenant.setEnabled(false)
- identityService.getIdentityProvider().updateTenant(new ClientRequestInfo(null, accessToken), tenantATenant.getRealm(), tenantATenant)
+ identityService.getIdentityProvider().updateTenant(null, tenantATenant.getRealm(), tenantATenant)
then: "the tenants rule engine should stop and all asset rule engines in this realm should also stop"
conditions.eventually {
@@ -216,7 +216,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
when: "the disabled tenant is re-enabled"
tenantATenant.setEnabled(true)
- identityService.getIdentityProvider().updateTenant(new ClientRequestInfo(null, accessToken), tenantATenant.getRealm(), tenantATenant)
+ identityService.getIdentityProvider().updateTenant(null, tenantATenant.getRealm(), tenantATenant)
then: "the tenants rule engine should start and all asset rule engines from this realm should also start"
conditions.eventually {
diff --git a/ui/keycloak/themes/openremote/login/login.ftl b/ui/keycloak/themes/openremote/login/login.ftl
index 0aa85564c..02f99410c 100644
--- a/ui/keycloak/themes/openremote/login/login.ftl
+++ b/ui/keycloak/themes/openremote/login/login.ftl
@@ -15,7 +15,7 @@
autofocus
autocomplete="off"
autocapitalize="off"
- name="username" value="${(login.username!'')?html}" type="text" disabled/>
+ name="username" value="${(login.username!'')}" type="text" disabled/>
<#else>
<input id="username"
autofocus
@@ -23,7 +23,7 @@
autocapitalize="off"
required
class="validate"
- name="username" value="${(login.username!'')?html}" type="text" autofocus/>
+ name="username" value="${(login.username!'')}" type="text" autofocus/>
</#if>
<label for="username"><#if !realm.registrationEmailAsUsername>${msg("usernameOrEmail")}<#else>${msg("email")}</#if></label>
</div>