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
Remove old asset user links when a new one is created on a console asset (#1400)
Wouter Born80774850df97
diff --git a/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.javaindex b131f7b59..7ba15c722 100644--- a/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/console/ConsoleResourceImpl.java@@ -42,7 +42,7 @@ import org.openremote.model.query.filter.StringPredicate;import org.openremote.model.security.Realm;import org.openremote.model.util.TextUtil;-import java.util.Collections;+import java.util.List;import java.util.Map;import java.util.Objects;import java.util.concurrent.ConcurrentHashMap;@@ -130,9 +130,14 @@ public class ConsoleResourceImpl extends ManagerWebResource implements ConsoleRe}consoleRegistration.setId(consoleAsset.getId());- // If authenticated link the console to this user+ // If authenticated link the console to this user onlyif (isAuthenticated()) {- assetStorageService.storeUserAssetLinks(Collections.singletonList(new UserAssetLink(getAuthenticatedRealmName(), getUserId(), consoleAsset.getId())));+ List<UserAssetLink> userAssetLinks = assetStorageService.findUserAssetLinks(getAuthenticatedRealmName(), null, consoleAsset.getId());+ List<UserAssetLink> otherUserAssetLinks = userAssetLinks.stream().filter(link -> !getUserId().equals(link.getId().getUserId())).toList();+ if (!otherUserAssetLinks.isEmpty()) {+ assetStorageService.deleteUserAssetLinks(otherUserAssetLinks);+ }+ assetStorageService.storeUserAssetLinks(List.of(new UserAssetLink(getAuthenticatedRealmName(), getUserId(), consoleAsset.getId())));}return consoleRegistration;