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
Updated EMAIL defaults
Rich Turner45aed03bf6c7
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.javaindex f1d7a39f9..d9af42187 100644--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java@@ -665,7 +665,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider imemailConfig.put("password", container.getConfig().getOrDefault(SETUP_EMAIL_PASSWORD, null));emailConfig.put("auth", container.getConfig().containsKey(SETUP_EMAIL_USER) ? "true" : "false");emailConfig.put("tls", Boolean.toString(getBoolean(container.getConfig(), SETUP_EMAIL_TLS, SETUP_EMAIL_TLS_DEFAULT)));- emailConfig.put("from", getString(container.getConfig(), SETUP_EMAIL_FROM_KEYCLOAK, SETUP_EMAIL_FROM_KEYCLOAK_DEFAULT + getString(container.getConfig(), IDENTITY_NETWORK_HOST, IDENTITY_NETWORK_HOST_DEFAULT)));+ emailConfig.put("from", getString(container.getConfig(), SETUP_EMAIL_FROM_KEYCLOAK, SETUP_EMAIL_FROM_KEYCLOAK_DEFAULT));realmRepresentation.setSmtpServer(emailConfig);}diff --git a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.javaindex 3e2b43aad..29e3bf8df 100644--- a/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/AbstractKeycloakSetup.java@@ -33,7 +33,7 @@ import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID;public abstract class AbstractKeycloakSetup implements Setup {public static final String SETUP_EMAIL_FROM_KEYCLOAK = "SETUP_EMAIL_FROM_KEYCLOAK";- public static final String SETUP_EMAIL_FROM_KEYCLOAK_DEFAULT = "no-reply@";+ public static final String SETUP_EMAIL_FROM_KEYCLOAK_DEFAULT = "[email protected]";public static final ClientRole[] PUBLIC_USER_ROLES = new ClientRole[] {ClientRole.READ_ASSETS,ClientRole.READ_MAPdiff --git a/model/src/main/java/org/openremote/model/Constants.java b/model/src/main/java/org/openremote/model/Constants.javaindex 40e09db6d..55ebd6a94 100644--- a/model/src/main/java/org/openremote/model/Constants.java+++ b/model/src/main/java/org/openremote/model/Constants.java@@ -56,7 +56,7 @@ public interface Constants {String SETUP_EMAIL_TLS = "SETUP_EMAIL_TLS";boolean SETUP_EMAIL_TLS_DEFAULT = true;String SETUP_EMAIL_FROM = "SETUP_EMAIL_FROM";- String SETUP_EMAIL_FROM_DEFAULT = "[email protected]";+ String SETUP_EMAIL_FROM_DEFAULT = "[email protected]";String REQUEST_HEADER_REALM = "Auth-Realm";String ASSET_ID_REGEXP = "^[0-9A-Za-z]{22}$";String UUID_REGEXP = "[0-9a-fA-F]{8}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{12}";