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
Made it possible to enable registration for a realm
Michael Rademaker358b48a94237
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.javaindex 8b8d9aa53..7cc2e7159 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java@@ -735,6 +735,8 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider imexisting.setEmailTheme(tenant.getEmailTheme());existing.setLoginTheme(tenant.getLoginTheme());existing.setRememberMe(tenant.getRememberMe());+ existing.setRegistrationAllowed(tenant.getRegistrationAllowed());+ existing.setRegistrationEmailAsUsername(tenant.getRegistrationEmailAsUsername());existing.setEnabled(tenant.getEnabled());existing.setDuplicateEmailsAllowed(tenant.getDuplicateEmailsAllowed());existing.setResetPasswordAllowed(tenant.getResetPasswordAllowed());diff --git a/model/src/main/java/org/openremote/model/security/Tenant.java b/model/src/main/java/org/openremote/model/security/Tenant.javaindex 03665f69e..5c1c036ec 100644--- a/model/src/main/java/org/openremote/model/security/Tenant.java+++ b/model/src/main/java/org/openremote/model/security/Tenant.java@@ -29,6 +29,7 @@ import javax.persistence.Transient;import javax.validation.constraints.NotNull;import javax.validation.constraints.Pattern;import javax.validation.constraints.Size;+import java.util.List;/*** This can be used (among other things) to query the REALM table in JPA queries.@@ -62,6 +63,12 @@ public class Tenant {@Transientprotected Boolean rememberMe;+ @Transient+ protected Boolean registrationAllowed;++ @Transient+ protected Boolean registrationEmailAsUsername;+@Transientprotected String loginTheme;@@ -164,6 +171,24 @@ public class Tenant {return this;}+ public Boolean getRegistrationAllowed() {+ return registrationAllowed;+ }++ public Tenant setRegistrationAllowed(Boolean registrationAllowed) {+ this.registrationAllowed = registrationAllowed;+ return this;+ }++ public Boolean getRegistrationEmailAsUsername() {+ return registrationEmailAsUsername;+ }++ public Tenant setRegistrationEmailAsUsername(Boolean registrationEmailAsUsername) {+ this.registrationEmailAsUsername = registrationEmailAsUsername;+ return this;+ }+public boolean isActive(double currentTimeMillis) {return enabled != null && enabled&& (notBefore == null || notBefore == 0 || notBefore <= (currentTimeMillis/1000));