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
Bug fix for realm ID being used instead of realm name
Rich Turner574e82622915
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.javaindex e8da3d2ae..dd620cdc8 100644--- a/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/agent/AgentResourceImpl.java@@ -77,7 +77,7 @@ public class AgentResourceImpl extends ManagerWebResource implements AgentResournew TenantFilter<AgentStatusEvent>() {@Overridepublic boolean apply(AgentStatusEvent event) {- return event.getRealm().equals(getAuthenticatedTenant().getId());+ return event.getRealm().equals(getAuthenticatedTenant().getRealm());}})) {diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex 314e7b9c6..f526b221b 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -160,7 +160,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour// Restricted users or regular users in a different realm can not create linksif (isRestrictedUser()- || !getAuthenticatedTenant().getId().equals(realm))+ || !getAuthenticatedTenant().getRealm().equals(realm))throw new WebApplicationException(FORBIDDEN);assetStorageService.storeUserAsset(userAsset);@@ -178,7 +178,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour// Restricted users or regular users in a different realm can not delete linksif (isRestrictedUser()- || !getAuthenticatedTenant().getId().equals(realm))+ || !getAuthenticatedTenant().getRealm().equals(realm))throw new WebApplicationException(FORBIDDEN);assetStorageService.deleteUserAsset(realm, userId, assetId);@@ -439,7 +439,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour// If there was no realm provided (create was called by regular user in manager UI), use the auth realmif (asset.getRealm() == null || asset.getRealm().length() == 0) {- asset.setRealm(getAuthenticatedTenant().getId());+ asset.setRealm(getAuthenticatedTenant().getRealm());}if (!isTenantActiveAndAccessible(asset)) {