Skip to content

armgit / core

Public Imported from GitHub
0

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

Various user asset link related updates and UI fixes (Fixes #529, Fixes #530, Fixes #531)

Rich Turnera3088a6f407b
diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
index b3c2a29c9..b38073145 100644
--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
@@ -34,7 +34,7 @@ import org.openremote.model.EntityClassProvider;
import org.openremote.model.apps.ConsoleAppConfig;
import org.openremote.model.asset.Asset;
import org.openremote.model.asset.AssetDescriptor;
-import org.openremote.model.asset.UserAsset;
+import org.openremote.model.asset.UserAssetLink;
import org.openremote.model.datapoint.AssetDatapoint;
import org.openremote.model.gateway.GatewayConnection;
import org.openremote.model.notification.SentNotification;
@@ -46,6 +46,7 @@ import org.openremote.model.rules.GlobalRuleset;
import org.openremote.model.rules.TenantRuleset;
import org.openremote.model.security.Tenant;
import org.openremote.model.security.User;
+import org.openremote.model.security.UserAttribute;
import org.openremote.model.syslog.SyslogEvent;
import org.openremote.model.util.ValueUtil;
@@ -275,12 +276,13 @@ public class PersistenceService implements ContainerService {
// Register standard entity classes and also any Entity ClassProviders
List<String> entityClasses = new ArrayList<>(50);
entityClasses.add(Asset.class.getName());
- entityClasses.add(UserAsset.class.getName());
+ entityClasses.add(UserAssetLink.class.getName());
entityClasses.add(AssetDatapoint.class.getName());
entityClasses.add(SentNotification.class.getName());
entityClasses.add(AssetPredictedDatapoint.class.getName());
entityClasses.add(Tenant.class.getName());
entityClasses.add(User.class.getName());
+ entityClasses.add(UserAttribute.class.getName());
entityClasses.add(GlobalRuleset.class.getName());
entityClasses.add(AssetRuleset.class.getName());
entityClasses.add(TenantRuleset.class.getName());
diff --git a/container/src/main/java/org/openremote/container/persistence/package-info.java b/container/src/main/java/org/openremote/container/persistence/package-info.java
index c08db21e4..216430354 100644
--- a/container/src/main/java/org/openremote/container/persistence/package-info.java
+++ b/container/src/main/java/org/openremote/container/persistence/package-info.java
@@ -6,6 +6,10 @@
@TypeDef(
name = Constants.PERSISTENCE_STRING_ARRAY_TYPE,
typeClass = StringArrayType.class
+ ),
+ @TypeDef(
+ name = EpochMillisInstantType.TYPE_NAME,
+ typeClass = EpochMillisInstantType.class
)
})
@@ -16,3 +20,4 @@ import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
import org.openremote.model.Constants;
+import org.openremote.model.persistence.EpochMillisInstantType;
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
index 07d6e6af6..21ba8f1b8 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java
@@ -27,7 +27,7 @@ import org.openremote.manager.web.ManagerWebResource;
import org.openremote.model.Constants;
import org.openremote.model.asset.Asset;
import org.openremote.model.asset.AssetResource;
-import org.openremote.model.asset.UserAsset;
+import org.openremote.model.asset.UserAssetLink;
import org.openremote.model.attribute.*;
import org.openremote.model.http.RequestParams;
import org.openremote.model.query.AssetQuery;
@@ -37,12 +37,15 @@ import org.openremote.model.util.ValueUtil;
import javax.persistence.OptimisticLockException;
import javax.validation.ConstraintViolationException;
+import javax.ws.rs.BadRequestException;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.util.*;
+import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.stream.IntStream;
import static javax.ws.rs.core.Response.Status.*;
import static org.openremote.model.attribute.AttributeEvent.Source.CLIENT;
@@ -99,21 +102,20 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
}
@Override
- public UserAsset[] getUserAssetLinks(RequestParams requestParams, String realm, String userId, String assetId) {
+ public UserAssetLink[] getUserAssetLinks(RequestParams requestParams, String realm, String userId, String assetId) {
try {
+ realm = TextUtil.isNullOrEmpty(realm) ? getAuthenticatedRealm() : realm;
+
if (realm == null)
throw new WebApplicationException(BAD_REQUEST);
- if (!identityService.getIdentityProvider().tenantExists(realm))
- throw new WebApplicationException(NOT_FOUND);
-
if (!(isSuperUser() || getAuthenticatedRealm().equals(realm)))
throw new WebApplicationException(FORBIDDEN);
if (userId != null && !identityService.getIdentityProvider().isUserInTenant(userId, realm))
throw new WebApplicationException(BAD_REQUEST);
- UserAsset[] result = assetStorageService.findUserAssets(realm, userId, assetId).toArray(new UserAsset[0]);
+ UserAssetLink[] result = assetStorageService.findUserAssetLinks(realm, userId, assetId).toArray(new UserAssetLink[0]);
// Compress response (the request attribute enables the interceptor)
request.setAttribute(HttpHeaders.CONTENT_ENCODING, "gzip");
@@ -127,48 +129,105 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResour
@Override
- public void createUserAsset(RequestParams requestParams, UserAsset userAsset) {
- String realm = userAsset.getId().getRealm();
- String userId = userAsset.getId().getUserId();
- String assetId = userAsset.getId().getAssetId();
+ public void createUserAssetLinks(RequestParams requestParams, List<UserAssetLink> userAssetLinks) {
- if (!identityService.getIdentityProvider().isUserInTenant(userId, realm))
- throw new WebApplicationException(BAD_REQUEST);
+ // Restricted users cannot create or delete links
+ if (isRestrictedUser()) {
+ throw new WebApplicationException(FORBIDDEN);
+ }
+
+ // Check all links are for the same user and realm
+ String realm = userAssetLinks.get(0).getId().getRealm();
+ String userId = userAssetLinks.get(0).getId().getUserId();
+ String[] assetIds = new String[userAssetLinks.size()];
+
+ IntStream.range(0, userAssetLinks.size()).forEach(i -> {
+ UserAssetLink userAssetLink = userAssetLinks.get(i);
+ assetIds[i] = userAssetLink.getId().getAssetId();
+
+ if (!userAssetLink.getId().getRealm().equals(realm) || !userAssetLink.getId().getUserId().equals(userId)) {
+ throw new BadRequestException("All user asset links must be for the same user");
+ }
+ });
+
+ if (!isSuperUser() && !realm.equals(getAuthenticatedRealm())) {
+ throw new WebApplicationException(FORBIDDEN);
+ }
+
+ if (!identityService.getIdentityProvider().isUserInTenant(userId, realm)) {
+ throw new WebApplicationException(FORBIDDEN);
+ }
+
+ List<Asset<?>> assets = assetStorageService.findAll(
+ new AssetQuery()
+ .select(new AssetQuery.Select().excludeParentInfo(true).excludePath(true).excludeAttributes(true))
+ .tenant(new TenantPredicate(realm))
+ .ids(assetIds)
+ );
+
+ if (assets.size() != userAssetLinks.size()) {
+ throw new BadRequestException("One or more asset IDs are invalid");
+ }
- Asset<?> asset;
- if ((asset = assetStorageService.find(assetId)) == null || !asset.getRealm().equals(realm)) {
+ try {
+ assetStorageService.storeUserAssetLinks(userAssetLinks);
+ } catch (Exception e) {
throw new WebApplicationException(BAD_REQUEST);
}
+ }
+
+ @Override
+ public void deleteUserAssetLink(RequestParams requestParams, String realm, String userId, String assetId) {
+ deleteUserAssetLinks(requestParams, Collections.singletonList(new UserAssetLink(realm, userId, assetId)));
+ }
+
+ @Override
+ public void deleteAllUserAssetLinks(RequestParams requestParams, String realm, String userId) {
+ // Restricted users cannot create or delete links
+ if (isRestrictedUser()) {
+ throw new WebApplicationException(FORBIDDEN);
+ }
- if (isSuperUser()) {
- assetStorageService.storeUserAsset(userAsset);
- return;
+ // Regular users in a different realm can not delete links
+ if (!isSuperUser() && !getAuthenticatedTenant().getRealm().equals(realm)) {
+ throw new WebApplicationException(FORBIDDEN);
}
- // Restricted users or regular users in a different realm can not create links
- if (isRestrictedUser()
- || !getAuthenticatedTenant().getRealm().equals(realm))
+ // User must be in the same realm as the requested realm
+ if (!identityService.getIdentityProvider().isUserInTenant(userId, realm)) {
throw new WebApplicationException(FORBIDDEN);
+ }
- assetStorageService.storeUserAsset(userAsset);
+ assetStorageService.deleteUserAssetsByUserId(userId);
}
@Override
- public void deleteUserAsset(RequestParams requestParams, String realm, String userId, String assetId) {
- if (!identityService.getIdentityProvider().isUserInTenant(userId, realm))
- throw new WebApplicationException(BAD_REQUEST);
+ public void deleteUserAssetLinks(RequestParams requestParams, List<UserAssetLink> userAssetLinks) {
+ // Restricted users cannot create or delete links
+ if (isRestrictedUser()) {
+ throw new WebApplicationException(FORBIDDEN);
+ }
- if (isSuperUser()) {
- assetStorageService.deleteUserAsset(realm, userId, assetId);
- return;
+ // Check all links are for the same user and realm
+ String realm = userAssetLinks.get(0).getId().getRealm();
+ String userId = userAssetLinks.get(0).getId().getUserId();
+
+ if (userAssetLinks.stream().anyMatch(userAssetLink -> !userAssetLink.getId().getRealm().equals(realm) || !userAssetLink.getId().getUserId().equals(userId))) {
+ throw new BadRequestException("All user asset links must be for the same user");
}
- // Restricted users or regular users in a different realm can not delete links
- if (isRestrictedUser()
- || !getAuthenticatedTenant().getRealm().equals(realm))
+ // Regular users in a different realm can not delete links
+ if (!isSuperUser() && !getAuthenticatedTenant().getRealm().equals(realm)) {
throw new WebApplicationException(FORBIDDEN);
+ }
- assetStorageService.deleteUserAsset(realm, userId, assetId);
+ // If delete count doesn't equal link count an exception will be thrown
+ try {
+ assetStorageService.deleteUserAssetLinks(userAssetLinks);
+ } catch (Exception e) {
+ LOG.log(Level.INFO, "Failed to delete user asset links", e);
+ throw new BadRequestException();
+ }
}
@Override
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 96e9946df..1b24d0eeb 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -60,12 +60,12 @@ import org.postgresql.util.PGobject;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
+import javax.persistence.Query;
import javax.persistence.TypedQuery;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import java.lang.reflect.Field;
import java.sql.*;
-import java.util.Date;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiConsumer;
@@ -75,6 +75,7 @@ import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import java.util.stream.Stream;
import static java.util.stream.Collectors.groupingBy;
@@ -178,9 +179,9 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
boolean skipAssetIdCheck = false;
if (isRestrictedUser && (filter.getAssetIds() == null || filter.getAssetIds().length == 0)) {
filter.setAssetIds(
- assetStorageService.findUserAssets(auth.getAuthenticatedRealm(), auth.getUserId(), null)
+ assetStorageService.findUserAssetLinks(auth.getAuthenticatedRealm(), auth.getUserId(), null)
.stream()
- .map(userAsset -> userAsset.getId().getAssetId())
+ .map(userAssetLink -> userAssetLink.getId().getAssetId())
.toArray(String[]::new)
);
skipAssetIdCheck = true;
@@ -766,7 +767,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
}
if (user != null) {
- storeUserAsset(em, new UserAsset(user.getRealm(), user.getId(), updatedAsset.getId()));
+ storeUserAssetLinks(em, Collections.singletonList(new UserAssetLink(user.getRealm(), user.getId(), updatedAsset.getId())));
}
return updatedAsset;
@@ -887,8 +888,8 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
return persistenceService.doReturningTransaction(entityManager -> {
try {
String queryStr = TextUtil.isNullOrEmpty(userId) ?
- "select count(ua) from UserAsset ua where ua.id.assetId = :assetId" :
- "select count(ua) from UserAsset ua where ua.id.userId = :userId and ua.id.assetId = :assetId";
+ "select count(ual) from UserAssetLink ual where ual.id.assetId = :assetId" :
+ "select count(ual) from UserAssetLink ual where ual.id.userId = :userId and ual.id.assetId = :assetId";
TypedQuery<Long> query = entityManager.createQuery(
queryStr,
@@ -912,7 +913,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
return persistenceService.doReturningTransaction(entityManager -> {
try {
return entityManager.createQuery(
- "select count(ua) from UserAsset ua where ua.id.userId in :userIds and ua.id.assetId = :assetId",
+ "select count(ual) from UserAssetLink ual where ual.id.userId in :userIds and ual.id.assetId = :assetId",
Long.class)
.setParameter("userIds", userIds)
.setParameter("assetId", assetId)
@@ -930,7 +931,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
return persistenceService.doReturningTransaction(entityManager -> {
try {
return entityManager.createQuery(
- "select count(ua) from UserAsset ua where ua.id.userId = :userId and ua.id.assetId in :assetIds",
+ "select count(ual) from UserAssetLink ual where ual.id.userId = :userId and ual.id.assetId in :assetIds",
Long.class)
.setParameter("userId", userId)
.setParameter("assetIds", assetIds)
@@ -990,11 +991,11 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
}));
}
- public List<UserAsset> findUserAssets(String realm, String userId, String assetId) {
+ public List<UserAssetLink> findUserAssetLinks(String realm, String userId, String assetId) {
return persistenceService.doReturningTransaction(entityManager -> {
StringBuilder sb = new StringBuilder();
Map<String, Object> parameters = new HashMap<>(3);
- sb.append("select ua from UserAsset ua where 1=1");
+ sb.append("select ua from UserAssetLink ua where 1=1");
if (!isNullOrEmpty(realm)) {
sb.append(" and ua.id.realm = :realm");
@@ -1011,7 +1012,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
sb.append(" order by ua.createdOn desc");
- TypedQuery<UserAsset> query = entityManager.createQuery(sb.toString(), UserAsset.class);
+ TypedQuery<UserAssetLink> query = entityManager.createQuery(sb.toString(), UserAssetLink.class);
parameters.forEach(query::setParameter);
return query.getResultList();
});
@@ -1020,28 +1021,108 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
/* ####################################################################################### */
/**
- * This used to automatically make the user restricted as well but this has been disabled as it no longer fitted
- * with use cases.
+ * Delete specific {@link UserAssetLink}s.
*/
- public void storeUserAsset(UserAsset userAsset) {
- persistenceService.doTransaction(entityManager -> storeUserAsset(entityManager, userAsset));
+ public void deleteUserAssetLinks(List<UserAssetLink> userAssetLinks) {
+ persistenceService.doTransaction(entityManager -> {
+ StringBuilder sb = new StringBuilder("DELETE FROM user_asset_link WHERE (1=0");
+
+ IntStream.range(0, userAssetLinks.size()).forEach(i -> sb.append(" OR (asset_id=?")
+ .append(3*i)
+ .append(" AND user_id=?")
+ .append((3*i)+1)
+ .append(" AND realm=?")
+ .append((3*i)+2)
+ .append(")"));
+ sb.append(")");
+
+ Query query = entityManager.createNativeQuery(sb.toString());
+
+ IntStream.range(0, userAssetLinks.size()).forEach(i -> {
+ UserAssetLink userAssetLink = userAssetLinks.get(i);
+ query.setParameter((3*i), userAssetLink.getId().getAssetId());
+ query.setParameter((3*i)+1, userAssetLink.getId().getUserId());
+ query.setParameter((3*i)+2, userAssetLink.getId().getRealm());
+ });
+
+ int deleteCount = query.executeUpdate();
+
+ if (deleteCount != userAssetLinks.size()) {
+ throw new IllegalArgumentException("Cannot delete one or more requested user asset link as they don't exist");
+ }
+ });
+ }
+
+ /**
+ * Delete all {@link UserAssetLink}s for the specified realm (must be called before the realm is removed)
+ */
+ public void deleteUserAssetsByRealm(String realm) {
+ persistenceService.doTransaction(entityManager -> {
+ Query query = entityManager.createQuery("DELETE FROM UserAssetLink ual WHERE ual.id.realm = ?0");
+ query.setParameter(0, realm);
+ int deleteCount = query.executeUpdate();
+ LOG.fine("Deleted all user asset links for realm: realm=" + realm + ", count=" + deleteCount);
+ });
+ }
+
+ /**
+ * Delete all {@link UserAssetLink}s for the specified {@link User} (must be called before the user is removed)
+ */
+ public void deleteUserAssetsByUserId(String userId) {
+ persistenceService.doTransaction(entityManager -> {
+ Query query = entityManager.createQuery("DELETE FROM UserAssetLink ual WHERE ual.id.userId = ?0");
+ query.setParameter(0, userId);
+ int deleteCount = query.executeUpdate();
+ LOG.fine("Deleted all user asset links for user: user ID=" + userId + ", count=" + deleteCount);
+ });
}
/**
- * This used to automatically unrestrict a user if no assets are linked to the them anymore but this has been
- * disabled as it no longer fitted with use cases.
+ * Delete all {@link UserAssetLink}s for the specified {@link Asset} (must be called before the asset is removed)
*/
- public void deleteUserAsset(String realm, String userId, String assetId) {
+ public void deleteUserAssetsByAssetId(String assetId) {
persistenceService.doTransaction(entityManager -> {
- UserAsset userAsset = entityManager.find(UserAsset.class, new UserAsset.Id(realm, userId, assetId));
- if (userAsset != null)
- entityManager.remove(userAsset);
+ Query query = entityManager.createQuery("DELETE FROM UserAssetLink ual WHERE ual.id.assetId = ?0");
+ query.setParameter(0, assetId);
+ int deleteCount = query.executeUpdate();
+ LOG.fine("Deleted all user asset links for asset: asset ID=" + assetId + ", count=" + deleteCount);
});
}
- protected void storeUserAsset(EntityManager entityManager, UserAsset userAsset) {
- userAsset.setCreatedOn(new Date(timerService.getCurrentTimeMillis()));
- entityManager.merge(userAsset);
+ /**
+ * Create specified {@link UserAssetLink}s.
+ */
+ public void storeUserAssetLinks(List<UserAssetLink> userAssetLinks) {
+
+ if (userAssetLinks.isEmpty()) {
+ return;
+ }
+
+ persistenceService.doTransaction(em -> storeUserAssetLinks(em, userAssetLinks));
+ }
+ protected void storeUserAssetLinks(EntityManager em, List<UserAssetLink> userAssets) {
+
+ em.unwrap(Session.class).doWork(connection -> {
+
+ LOG.finest("Storing user assets: count=" + userAssets.size());
+ PreparedStatement st;
+
+ try {
+ st = connection.prepareStatement("INSERT INTO USER_ASSET_LINK (asset_id, realm, user_id, created_on) VALUES (?, ?, ?, ?) ON CONFLICT (asset_id, realm, user_id) DO NOTHING");
+ for (UserAssetLink userAssetLink : userAssets) {
+ st.setString(1, userAssetLink.getId().getAssetId());
+ st.setString(2, userAssetLink.getId().getRealm());
+ st.setObject(3, userAssetLink.getId().getUserId());
+ st.setTimestamp(4, new Timestamp(timerService.getCurrentTimeMillis()));
+ st.addBatch();
+ }
+ st.executeBatch();
+ } catch (Exception e) {
+ String msg = "Failed to create user assets: count=" + userAssets.size();
+ LOG.log(Level.WARNING, msg, e);
+ throw new IllegalStateException(msg, e);
+ }
+ });
}
protected Asset<?> find(EntityManager em, String assetId, boolean loadComplete, Access access) {
@@ -1395,7 +1476,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
}
if ((!recursive || level == 3) && query.userIds != null && query.userIds.length > 0) {
- sb.append("right join USER_ASSET UA on A.ID = UA.ASSET_ID ");
+ sb.append("right join USER_ASSET_LINK UA on A.ID = UA.ASSET_ID ");
}
return sb.toString();
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.java
index ab6fca06f..3cab8efcb 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
@@ -26,7 +26,7 @@ import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.web.ManagerWebResource;
import org.openremote.model.asset.Asset;
import org.openremote.model.asset.AssetEvent;
-import org.openremote.model.asset.UserAsset;
+import org.openremote.model.asset.UserAssetLink;
import org.openremote.model.asset.impl.ConsoleAsset;
import org.openremote.model.asset.impl.GroupAsset;
import org.openremote.model.attribute.MetaItem;
@@ -43,6 +43,7 @@ import org.openremote.model.security.Tenant;
import org.openremote.model.util.TextUtil;
import javax.ws.rs.BadRequestException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -108,7 +109,7 @@ public class ConsoleResourceImpl extends ManagerWebResource implements ConsoleRe
// If authenticated link the console to this user
if (isAuthenticated()) {
- assetStorageService.storeUserAsset(new UserAsset(getAuthenticatedRealm(), getUserId(), consoleAsset.getId()));
+ assetStorageService.storeUserAssetLinks(Collections.singletonList(new UserAssetLink(getAuthenticatedRealm(), getUserId(), consoleAsset.getId())));
}
return consoleRegistration;
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java
index 640fd4ba9..cc9fa6d27 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java
@@ -256,7 +256,7 @@ public class DefaultMQTTHandler extends MQTTHandler {
// Asset<?> asset;
// if(identityProvider.isRestrictedUser(authContext.getUserId())) {
-// Optional<UserAsset> userAsset = assetStorageService.findUserAssets(connection.realm, authContext.getUserId(), assetId).stream().findFirst();
+// Optional<UserAssetLink> userAsset = assetStorageService.findUserAssets(connection.realm, authContext.getUserId(), assetId).stream().findFirst();
// asset = userAsset.map(value -> assetStorageService.find(value.getId().getAssetId())).orElse(null);
// } else {
// asset = assetStorageService.find(assetId, false);
diff --git a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
index f9dbeec9b..a79902771 100644
--- a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
+++ b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
@@ -43,7 +43,6 @@ import org.simplejavamail.mailer.config.TransportStrategy;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -154,10 +153,10 @@ public class EmailNotificationHandler implements NotificationHandler {
User[] users = targetType == Notification.TargetType.TENANT
? managerIdentityService
.getIdentityProvider()
- .getUsers(new UserQuery().tenant(new TenantPredicate(targetId)))
+ .queryUsers(new UserQuery().tenant(new TenantPredicate(targetId)))
: managerIdentityService
.getIdentityProvider()
- .getUsers(Collections.singletonList(targetId));
+ .queryUsers(new UserQuery().ids(targetId));
if (users.length == 0) {
if (targetType == Notification.TargetType.USER) {
diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
index 376932365..6f7b03918 100644
--- a/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationService.java
@@ -38,6 +38,7 @@ import org.openremote.model.notification.Notification;
import org.openremote.model.notification.NotificationSendResult;
import org.openremote.model.notification.RepeatFrequency;
import org.openremote.model.notification.SentNotification;
+import org.openremote.model.query.UserQuery;
import org.openremote.model.util.TextUtil;
import org.openremote.model.util.TimeUtil;
@@ -512,7 +513,7 @@ public class NotificationService extends RouteBuilder implements ContainerServic
boolean realmMatch = false;
if (target.getType() == Notification.TargetType.USER) {
- realmMatch = Arrays.stream(identityService.getIdentityProvider().getUsers(Collections.singletonList(target.getId())))
+ realmMatch = Arrays.stream(identityService.getIdentityProvider().queryUsers(new UserQuery().ids(target.getId())))
.allMatch(user -> realm.equals(user.getRealm()));
} else {
// Can only send to the same realm as the requestor realm
diff --git a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
index cc6bc66f9..bdb21e35e 100644
--- a/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
+++ b/manager/src/main/java/org/openremote/manager/notification/PushNotificationHandler.java
@@ -213,9 +213,9 @@ public class PushNotificationHandler extends RouteBuilder implements Notificatio
case USER:
// Get all console assets linked to the specified user
- String[] ids = assetStorageService.findUserAssets(null, targetId, null)
+ String[] ids = assetStorageService.findUserAssetLinks(null, targetId, null)
.stream()
- .map(userAsset -> userAsset.getId().getAssetId()).toArray(String[]::new);
+ .map(userAssetLink -> userAssetLink.getId().getAssetId()).toArray(String[]::new);
if (ids.length > 0) {
diff --git a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
index 60e74c7fe..500ce9d40 100644
--- a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
+++ b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
@@ -38,7 +38,7 @@ import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
import org.openremote.model.Container;
import org.openremote.model.asset.Asset;
-import org.openremote.model.asset.UserAsset;
+import org.openremote.model.asset.UserAssetLink;
import org.openremote.model.provisioning.*;
import org.openremote.model.security.ClientRole;
import org.openremote.model.security.User;
@@ -457,7 +457,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {
assetStorageService.merge(asset);
if (provisioningConfig.isRestrictedUser()) {
- assetStorageService.storeUserAsset(new UserAsset(realm, serviceUser.getId(), assetId));
+ assetStorageService.storeUserAssetLinks(Collections.singletonList(new UserAssetLink(realm, serviceUser.getId(), assetId)));
}
return asset;
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
index dfb8174b9..4c8e0a319 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
@@ -26,7 +26,7 @@ import org.openremote.manager.web.ManagerWebResource;
import org.openremote.model.Constants;
import org.openremote.model.asset.Asset;
import org.openremote.model.query.AssetQuery;
-import org.openremote.model.asset.UserAsset;
+import org.openremote.model.asset.UserAssetLink;
import org.openremote.model.http.RequestParams;
import org.openremote.model.query.RulesetQuery;
import org.openremote.model.rules.*;
@@ -417,7 +417,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
if (!asset.isAccessPublicRead()) {
// If asset is linked to users then only those users can get the geofences for it
- List<UserAsset> userAssetLinks = assetStorageService.findUserAssets(asset.getRealm(), null, assetId);
+ List<UserAssetLink> userAssetLinks = assetStorageService.findUserAssetLinks(asset.getRealm(), null, assetId);
if (!userAssetLinks.isEmpty()) {
if (!isAuthenticated() || userAssetLinks.stream().noneMatch(userAssetLink -> userAssetLink.getId().getUserId().equals(getUserId()))) {
diff --git a/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java b/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java
index c224c78d4..85e226990 100644
--- a/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java
+++ b/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java
@@ -33,7 +33,6 @@ import org.openremote.model.security.User;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
@@ -86,7 +85,10 @@ public class UsersFacade<T extends Ruleset> extends Users {
}
}
- return Arrays.stream(identityService.getIdentityProvider().getUsers(userQuery))
+ // Prevent system users being retrieved
+ userQuery.select(new UserQuery.Select().excludeSystemUsers(true));
+
+ return Arrays.stream(identityService.getIdentityProvider().queryUsers(userQuery))
.map(User::getId);
}
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 9d5da9644..9518e84e1 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
@@ -83,22 +83,7 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
}
@Override
- public User[] getUsers(String realm) {
- return getUsers(new UserQuery().tenant(new TenantPredicate(realm)));
- }
-
- @Override
- public User[] getServiceUsers(String realm) {
- return new User[0];
- }
-
- @Override
- public User[] getUsers(List<String> userIds) {
- return getUsers(new UserQuery().ids(userIds.toArray(new String[0])));
- }
-
- @Override
- public User[] getUsers(UserQuery userQuery) {
+ public User[] queryUsers(UserQuery userQuery) {
return ManagerIdentityProvider.getUsersFromDb(persistenceService, userQuery);
}
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 afc0cd583..bea9beedd 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
@@ -45,13 +45,7 @@ import static org.openremote.model.Constants.MASTER_REALM;
*/
public interface ManagerIdentityProvider extends IdentityProvider {
- User[] getUsers(String realm);
-
- User[] getServiceUsers(String realm);
-
- User[] getUsers(List<String> userIds);
-
- User[] getUsers(UserQuery userQuery);
+ User[] queryUsers(UserQuery userQuery);
User getUser(String realm, String userId);
@@ -116,17 +110,18 @@ public interface ManagerIdentityProvider extends IdentityProvider {
* BELOW ARE STATIC HELPER METHODS
*/
- static User[] getUsersFromDb(PersistenceService persistenceService, UserQuery userQuery) {
+ static User[] getUsersFromDb(PersistenceService persistenceService, UserQuery query) {
StringBuilder sb = new StringBuilder();
List<Object> parameters = new ArrayList<>();
+ final UserQuery userQuery = query != null ? query : new UserQuery();
// BUILD SELECT
- sb.append("SELECT DISTINCT(u)");
+ sb.append("SELECT u");
// BUILD FROM
sb.append(" FROM User u");
if (userQuery.assetPredicate != null || userQuery.pathPredicate != null) {
- sb.append(" join UserAsset ua on ua.id.userId = u.id");
+ sb.append(" join UserAssetLink ua on ua.id.userId = u.id");
}
// BUILD WHERE
@@ -163,24 +158,78 @@ public interface ManagerIdentityProvider extends IdentityProvider {
}
isFirst = false;
final int pos = parameters.size() + 1;
- sb.append(pred.caseSensitive ? "u.username " : "upper(u.username)");
+ sb.append("upper(u.username)"); // No case support for username
sb.append(buildMatchFilter(pred, pos));
parameters.add(pred.prepareValue());
}
sb.append(")");
}
+ if (userQuery.select != null && userQuery.select.excludeRegularUsers) {
+ sb.append(" and u.secret IS NOT NULL");
+ } else if (userQuery.select != null && userQuery.select.excludeServiceUsers) {
+ sb.append(" and u.secret IS NULL");
+ }
- // BUILD LIMIT
- if (userQuery.limit > 0) {
- sb.append(" LIMIT ").append(userQuery.limit);
+ // BUILD ORDER BY
+ if (userQuery.orderBy != null) {
+ if (userQuery.orderBy.property != null) {
+ sb.append(" ORDER BY");
+ switch(userQuery.orderBy.property) {
+ case CREATED_ON:
+ sb.append(" u.createdOn");
+ break;
+ case FIRST_NAME:
+ sb.append(" u.firstName");
+ break;
+ case LAST_NAME:
+ sb.append(" u.lastName");
+ break;
+ case USERNAME:
+ // Remove service user prefix
+ sb.append(" replace(u.username, '").append(User.SERVICE_ACCOUNT_PREFIX).append("', '')");
+ break;
+ case EMAIL:
+ sb.append(" u.email");
+ break;
+ default:
+ throw new UnsupportedOperationException("Unsupported order by value: " + userQuery.orderBy.property);
+ }
+ if (userQuery.orderBy.descending) {
+ sb.append(" DESC");
+ }
+ }
}
- return persistenceService.doReturningTransaction(entityManager -> {
- TypedQuery<User> query = entityManager.createQuery(sb.toString(), User.class);
- IntStream.range(0, parameters.size()).forEach(i -> query.setParameter(i + 1, parameters.get(i)));
- List<User> users = query.getResultList();
- return users.toArray(new User[users.size()]);
+ List<User> users = persistenceService.doReturningTransaction(entityManager -> {
+ TypedQuery<User> sqlQuery = entityManager.createQuery(sb.toString(), User.class);
+ IntStream.range(0, parameters.size()).forEach(i -> sqlQuery.setParameter(i + 1, parameters.get(i)));
+
+ if (userQuery.limit != null && userQuery.limit > 0) {
+ sqlQuery.setMaxResults(userQuery.limit);
+ }
+
+ if (userQuery.offset != null && userQuery.offset > 0) {
+ sqlQuery.setFirstResult(query.offset);
+ }
+
+ return sqlQuery.getResultList();
});
+
+ if (userQuery.select != null && (userQuery.select.basic || userQuery.select.excludeSystemUsers)) {
+ // TODO: Move this within the query
+ return users.stream().filter(user -> {
+ boolean keep = !userQuery.select.excludeSystemUsers || !user.isSystemAccount();
+ if (keep && userQuery.select.basic) {
+ // Clear out data and leave only basic info
+ user.setAttributes(null);
+ user.setEmail(null);
+ user.setRealmId(null);
+ user.setSecret(null);
+ }
+ return keep;
+ }).toArray(User[]::new);
+ }
+ return users.toArray(new User[0]);
}
static User getUserByUsernameFromDb(PersistenceService persistenceService, String realm, String username) {
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 7307e00b6..5e2288b30 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -41,7 +41,6 @@ import org.openremote.model.event.shared.TenantFilter;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.UserQuery;
import org.openremote.model.query.filter.StringPredicate;
-import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.security.*;
import org.openremote.model.util.TextUtil;
import org.openremote.model.util.ValueUtil;
@@ -130,52 +129,6 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
redirectUrls.add(realmManagerCallbackUrl);
}
- @Override
- public User[] getUsers(String realm) {
- User[] users = getUsers(new UserQuery().tenant(new TenantPredicate(realm)));
-
- return getRealms(realmsResource -> {
- // Need to load secrets from client resource
- return Arrays.stream(users).filter(user -> {
- RealmResource realmResource = realmsResource.realm(realm);
-
- // Filter out users with service account attribute
- UserRepresentation userRepresentation = realmResource.users().get(user.getId()).toRepresentation();
- if (userRepresentation.getAttributes() != null && userRepresentation.getAttributes().containsKey(User.SYSTEM_ACCOUNT_ATTRIBUTE)) {
- return false;
- }
-
- return true;
- }).toArray(User[]::new);
- });
- }
-
- @Override
- public User[] getServiceUsers(String realm) {
- User[] users = ManagerIdentityProvider.getUsersFromDb(persistenceService, new UserQuery().usernames(new StringPredicate(AssetQuery.Match.BEGIN, User.SERVICE_ACCOUNT_PREFIX)).tenant(new TenantPredicate(realm)));
-
- return getRealms(realmsResource -> Arrays.stream(users).filter(user -> {
- RealmResource realmResource = realmsResource.realm(realm);
-
- // Filter out users with system account attribute
- UserRepresentation userRepresentation = realmResource.users().get(user.getId()).toRepresentation();
- if (userRepresentation.getAttributes() != null && userRepresentation.getAttributes().containsKey(User.SYSTEM_ACCOUNT_ATTRIBUTE)) {
- return false;
- }
-
- withClientResource(realm, user.getUsername(), realmsResource, (clientRep, clientResource) ->
- user.setSecret(getClientSecret(clientResource)),
- null);
-
- return true;
- }).toArray(User[]::new));
- }
-
- protected String getClientSecret(ClientResource clientResource) {
- CredentialRepresentation credentialRepresentation = clientResource.getSecret();
- return credentialRepresentation != null ? credentialRepresentation.getValue() : null;
- }
-
protected <T> T withClientResource(String realm, String client, RealmsResource realmsResource, BiFunction<ClientRepresentation, ClientResource, T> clientResourceConsumer, Supplier<T> notFoundProvider) {
ClientRepresentation clientRepresentation = null;
ClientResource clientResource = null;
@@ -189,9 +142,6 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
}
clientRepresentation = clientRepresentations.get(0);
clientResource = clientsResource.get(clientRepresentation.getId());
- if (clientRepresentation.isServiceAccountsEnabled()) {
- clientRepresentation.setSecret(getClientSecret(clientResource));
- }
}
} catch (Exception e) {
LOG.log(Level.INFO, "withClientResource failed", e);
@@ -205,12 +155,11 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
}
@Override
- public User[] getUsers(List<String> userIds) {
- return getUsers(new UserQuery().ids(userIds.toArray(new String[0])));
- }
+ public User[] queryUsers(UserQuery userQuery) {
+ if (userQuery == null) {
+ userQuery = new UserQuery();
+ }
- @Override
- public User[] getUsers(UserQuery userQuery) {
if (userQuery.usernames == null) {
userQuery.usernames = new StringPredicate[1];
userQuery.usernames(new StringPredicate(AssetQuery.Match.BEGIN, User.SERVICE_ACCOUNT_PREFIX).negate(true));
@@ -224,30 +173,12 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
@Override
public User getUser(String realm, String userId) {
- User user = ManagerIdentityProvider.getUserByIdFromDb(persistenceService, realm, userId);
- if (user != null && user.isServiceAccount()) {
- getRealms(realmsResource -> {
- withClientResource(realm, user.getUsername(), realmsResource, (clientRep, clientResource) ->
- user.setSecret(getClientSecret(clientResource)), null);
- return null;
- });
- }
-
- return user;
+ return ManagerIdentityProvider.getUserByIdFromDb(persistenceService, realm, userId);
}
@Override
public User getUserByUsername(String realm, String username) {
- User user = ManagerIdentityProvider.getUserByUsernameFromDb(persistenceService, realm, username);
- if (user != null && user.isServiceAccount()) {
- getRealms(realmsResource -> {
- withClientResource(realm, user.getUsername(), realmsResource, (clientRep, clientResource) ->
- user.setSecret(getClientSecret(clientResource)), null);
- return null;
- });
- }
-
- return user;
+ return ManagerIdentityProvider.getUserByUsernameFromDb(persistenceService, realm, username);
}
@Override
@@ -258,6 +189,9 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
throw new BadRequestException("Attempt to create/update user but no username provided: User=" + user);
}
+ // Force lowercase username
+ user.setUsername(user.getUsername().toLowerCase(Locale.ROOT));
+
boolean isUpdate = false;
User existingUser = user.getId() != null ? getUser(realm, user.getId()) : getUserByUsername(realm, user.getUsername());
ClientRepresentation clientRepresentation;
@@ -815,7 +749,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
public Tenant getTenant(String realm) {
try {
RealmRepresentation realmRepresentation = getRealms(realmsResource ->
- realmsResource.realm(realm).toRepresentation());
+ realmsResource.realm(realm.toLowerCase(Locale.ROOT)).toRepresentation());
return convert(realmRepresentation, Tenant.class);
} catch (Exception ex) {
LOG.log(Level.INFO, "Failed to get tenant for realm: " + realm, ex);
@@ -827,6 +761,14 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
public void updateTenant(Tenant tenant) {
LOG.fine("Update tenant: " + tenant);
getRealms(realmsResource -> {
+
+ if (TextUtil.isNullOrEmpty(tenant.getId())) {
+ throw new IllegalStateException("Tenant must already exist, ID does not match an existing tenant");
+ }
+
+ // Force realm to lowercase
+ tenant.setRealm(tenant.getRealm().toLowerCase(Locale.ROOT));
+
// Find existing realm by ID as realm name could have been changed
RealmRepresentation existing = realmsResource.findAll().stream().filter(r -> r.getId().equals(tenant.getId())).findFirst().orElse(null);
if (existing == null) {
@@ -862,6 +804,10 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
public Tenant createTenant(Tenant tenant) {
LOG.fine("Create tenant: " + tenant);
return getRealms(realmsResource -> {
+
+ // Force realm to lowercase
+ tenant.setRealm(tenant.getRealm().toLowerCase(Locale.ROOT));
+
RealmRepresentation realmRepresentation = convert(tenant, RealmRepresentation.class);
try {
diff --git a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
index 8e4ae0e35..bcd26179f 100644
--- a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
@@ -23,6 +23,8 @@ import org.openremote.container.security.AuthContext;
import org.openremote.container.timer.TimerService;
import org.openremote.manager.web.ManagerWebResource;
import org.openremote.model.http.RequestParams;
+import org.openremote.model.query.UserQuery;
+import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.security.*;
import javax.ws.rs.*;
@@ -39,32 +41,39 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
}
@Override
- public User[] getAll(RequestParams requestParams, String realm) {
+ public User[] query(RequestParams requestParams, UserQuery query) {
AuthContext authContext = getAuthContext();
boolean isAdmin = authContext.hasResourceRole(ClientRole.READ_ADMIN.getValue(), authContext.getClientId());
- boolean isBasicRead = authContext.hasResourceRole(ClientRole.READ_USERS.getValue(), authContext.getClientId());
+ boolean isRestricted = !isAdmin && authContext.hasResourceRole(ClientRole.READ_USERS.getValue(), authContext.getClientId());
- if (!isAdmin && !isBasicRead) {
+ if (!isAdmin && !isRestricted) {
throw new ForbiddenException("Insufficient permissions to read users");
}
- try {
- User[] users = identityService.getIdentityProvider().getUsers(
- realm
- );
+ if (query == null) {
+ query = new UserQuery();
+ }
+
+ if (isRestricted) {
+ if (query.select == null) {
+ query.select = new UserQuery.Select();
+ }
+ query.select.basic(true);
+ }
+
+ if (!authContext.isSuperUser()) {
+ // Force realm to match users
+ query.tenant(new TenantPredicate(authContext.getAuthenticatedRealm()));
- if (isAdmin) {
- return users;
- } else {
- return Arrays.stream(users)
- .map(user ->
- new User()
- .setUsername(user.getUsername())
- .setId(user.getId())
- .setFirstName(user.getFirstName())
- .setLastName(user.getLastName()))
- .toArray(User[]::new);
+ // Hide system service accounts from non super users
+ if (query.select == null) {
+ query.select = new UserQuery.Select();
}
+ query.select.excludeSystemUsers = true;
+ }
+
+ try {
+ return identityService.getIdentityProvider().queryUsers(query);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
} catch (Exception ex) {
@@ -72,11 +81,6 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
}
}
- @Override
- public User[] getAllService(RequestParams requestParams, String realm) {
- return identityService.getIdentityProvider().getServiceUsers(realm);
- }
-
@Override
public User get(RequestParams requestParams, String realm, String userId) {
if (!isSuperUser() && !Objects.equals(getUserId(), userId)) {
diff --git a/manager/src/main/java/org/openremote/manager/setup/KeycloakCleanSetup.java b/manager/src/main/java/org/openremote/manager/setup/KeycloakCleanSetup.java
index b5ae88327..bdc4797e1 100644
--- a/manager/src/main/java/org/openremote/manager/setup/KeycloakCleanSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/KeycloakCleanSetup.java
@@ -20,6 +20,8 @@
package org.openremote.manager.setup;
import org.openremote.model.Container;
+import org.openremote.model.query.UserQuery;
+import org.openremote.model.query.filter.TenantPredicate;
import java.util.Arrays;
import java.util.logging.Logger;
@@ -56,7 +58,7 @@ public class KeycloakCleanSetup extends AbstractKeycloakSetup {
});
LOG.info("Deleting all non-master admin users");
- Arrays.stream(keycloakProvider.getUsers(MASTER_REALM)).forEach(user -> {
+ Arrays.stream(keycloakProvider.queryUsers(new UserQuery().tenant(new TenantPredicate(MASTER_REALM)))).forEach(user -> {
if (!user.getUsername().equals(MASTER_REALM_ADMIN_USER)) {
LOG.info("Deleting user: " + user);
keycloakProvider.deleteUser(MASTER_REALM, user.getId());
diff --git a/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql b/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql
index 873eb769f..d668cc703 100644
--- a/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql
+++ b/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql
@@ -80,7 +80,7 @@ create table TENANT_RULESET (
primary key (ID)
);
-create table USER_ASSET (
+create table USER_ASSET_LINK (
ASSET_ID char(22) not null,
REALM varchar(255) not null,
USER_ID varchar(36) not null,
@@ -211,13 +211,13 @@ alter table TENANT_RULESET
alter table ASSET_RULESET
add foreign key (ASSET_ID) references ASSET (ID) on delete cascade;
-alter table USER_ASSET
+alter table USER_ASSET_LINK
add foreign key (USER_ID) references PUBLIC.USER_ENTITY (ID) on delete cascade;
-alter table USER_ASSET
+alter table USER_ASSET_LINK
add foreign key (ASSET_ID) references ASSET (ID) on delete cascade;
-alter table USER_ASSET
+alter table USER_ASSET_LINK
add foreign key (REALM) references PUBLIC.REALM (NAME) on delete cascade;
alter table PROVISIONING_CONFIG
diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.json
index 997886752..c965c6a6f 100644
--- a/manager/src/web/shared/locales/en/or.json
+++ b/manager/src/web/shared/locales/en/or.json
@@ -418,7 +418,7 @@
"agentTypeMismatch": "Agent type mismatch",
"loadFailedRoles": "Failed to load roles",
"loadFailedUsers": "Failed to load users",
- "loadFailedServiceUsers": "Failed to load service users",
+ "loadFailedUserInfo": "Failed to load user info",
"validation": {
"noSchemaMatchFound": "No schema match found",
"invalidAsset": "Asset is not valid",
diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.java
index 3f5a30706..4583fd5d9 100644
--- a/model/src/main/java/org/openremote/model/asset/Asset.java
+++ b/model/src/main/java/org/openremote/model/asset/Asset.java
@@ -79,7 +79,7 @@ import static org.openremote.model.Constants.PERSISTENCE_UNIQUE_ID_GENERATOR;
* obviously no validation can be performed on such dynamic {@link Attribute}s. Use the {@link Attribute} etc. class to
* work with this API. This property can be empty when certain optimized loading operations are used.
* <p>
- * For more details on restricted access of user-assigned assets, see {@link UserAsset}.
+ * For more details on restricted access of user-assigned assets, see {@link UserAssetLink}.
* </p>
* <p>
* Example JSON representation of an asset tree:
diff --git a/model/src/main/java/org/openremote/model/asset/AssetResource.java b/model/src/main/java/org/openremote/model/asset/AssetResource.java
index b94014427..d99d30fc0 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetResource.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetResource.java
@@ -24,7 +24,6 @@ import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.tags.Tags;
import org.openremote.model.Constants;
import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.attribute.AttributeState;
@@ -55,7 +54,7 @@ import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
* <li>
* A <em>restricted</em> user is linked to a subset of assets within its authenticated realm and
* may have roles that allow read and/or write access to some asset details (see
- * {@link org.openremote.model.asset.UserAsset}).
+ * {@link UserAssetLink}).
* </li> </ul>
* <p>
* The only operations, always limited to linked assets, a restricted user is able to perform are:
@@ -113,13 +112,13 @@ public interface AssetResource {
@Path("user/link")
@Produces(APPLICATION_JSON)
@RolesAllowed({Constants.READ_ASSETS_ROLE})
- UserAsset[] getUserAssetLinks(@BeanParam RequestParams requestParams,
- @QueryParam("realm") String realm,
- @QueryParam("userId") String userId,
- @QueryParam("assetId") String assetId);
+ UserAssetLink[] getUserAssetLinks(@BeanParam RequestParams requestParams,
+ @QueryParam("realm") String realm,
+ @QueryParam("userId") String userId,
+ @QueryParam("assetId") String assetId);
/**
- * Create a link between asset and user.
+ * Create all of the specified links; they must all be for the same realm and user.
* <p>
* If the authenticated user is the superuser, asset/user links in any realm can be created. Otherwise assets
* must be in the same realm as the authenticated user. A 403 status is returned if a regular user tries to create
@@ -130,7 +129,7 @@ public interface AssetResource {
@Path("user/link")
@Consumes(APPLICATION_JSON)
@RolesAllowed({Constants.WRITE_ASSETS_ROLE})
- void createUserAsset(@BeanParam RequestParams requestParams, UserAsset userAsset);
+ void createUserAssetLinks(@BeanParam RequestParams requestParams, List<UserAssetLink> userAssets);
/**
* Delete a link between asset and user.
@@ -143,12 +142,34 @@ public interface AssetResource {
* 400 status is returned if the user or asset or realm doesn't exist.
*/
@DELETE
- @Path("link/{realm}/{userId}/{assetId}")
+ @Path("user/link/{realm}/{userId}/{assetId}")
@RolesAllowed({Constants.WRITE_ASSETS_ROLE})
- void deleteUserAsset(@BeanParam RequestParams requestParams,
- @PathParam("realm") String realm,
- @PathParam("userId") String userId,
- @PathParam("assetId") String assetId);
+ void deleteUserAssetLink(@BeanParam RequestParams requestParams,
+ @PathParam("realm") String realm,
+ @PathParam("userId") String userId,
+ @PathParam("assetId") String assetId);
+
+ /**
+ * Delete all of the specified links; they must all be for the same realm and user.
+ * <p>
+ * If the authenticated user is the superuser, asset/user links from any realm can be deleted. Otherwise assets
+ * must be in the same realm as the authenticated user. A 403 status is returned if a regular user tries to delete
+ * an asset/user link in a realm different than its authenticated realm, or if the user is restricted. A
+ * 400 status is returned if the user or asset or realm doesn't exist.
+ */
+ @POST
+ @Path("user/link/delete")
+ @Consumes(APPLICATION_JSON)
+ @RolesAllowed({Constants.WRITE_ASSETS_ROLE})
+ void deleteUserAssetLinks(@BeanParam RequestParams requestParams, List<UserAssetLink> userAssets);
+
+ @DELETE
+ @Path("user/link/{realm}/{userId}")
+ @Consumes(APPLICATION_JSON)
+ @RolesAllowed({Constants.WRITE_ASSETS_ROLE})
+ void deleteAllUserAssetLinks(@BeanParam RequestParams requestParams,
+ @PathParam("realm") String realm,
+ @PathParam("userId") String userId);
/**
* Retrieve the asset. Regular users can only access assets in their authenticated realm, the superuser can access
@@ -179,7 +200,7 @@ public interface AssetResource {
* asset's parent doesn't exist. A 400 status is returned if a restricted user attempts to write private meta items
* of any attributes. If a restricted user tries to write asset properties or dynamic attributes or
* meta items of dynamic attributes which are not writable by a restricted user, such data is ignored. For more
- * details on limitations of restricted users, see {@link UserAsset}.
+ * details on limitations of restricted users, see {@link UserAssetLink}.
*/
@PUT
@Path("{assetId}")
diff --git a/model/src/main/java/org/openremote/model/asset/UserAsset.java b/model/src/main/java/org/openremote/model/asset/UserAssetLink.java
similarity index 95%
rename from model/src/main/java/org/openremote/model/asset/UserAsset.java
rename to model/src/main/java/org/openremote/model/asset/UserAssetLink.java
index 9cb4df512..32b5aed8a 100644
--- a/model/src/main/java/org/openremote/model/asset/UserAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/UserAssetLink.java
@@ -20,7 +20,6 @@
package org.openremote.model.asset;
import org.hibernate.annotations.Formula;
-import org.openremote.model.AssetModelProvider;
import org.openremote.model.value.MetaItemType;
import javax.persistence.*;
@@ -53,8 +52,8 @@ import java.util.Date;
* </ul>.
*/
@Entity
-@Table(name = "USER_ASSET")
-public class UserAsset {
+@Table(name = "USER_ASSET_LINK")
+public class UserAssetLink {
public static class Id implements Serializable {
@Column(name = "REALM", length = 36)
@@ -133,15 +132,15 @@ public class UserAsset {
@Formula("(select u.USERNAME || ' (' || u.FIRST_NAME || ' ' || u.LAST_NAME || ')' from PUBLIC.USER_ENTITY u where u.ID = USER_ID)")
protected String userFullName;
- protected UserAsset() {
+ protected UserAssetLink() {
}
- public UserAsset(Id id) {
+ public UserAssetLink(Id id) {
this.id = id;
}
- public UserAsset(String realm, String userId, String assetId) {
- this(new UserAsset.Id(realm, userId, assetId));
+ public UserAssetLink(String realm, String userId, String assetId) {
+ this(new UserAssetLink.Id(realm, userId, assetId));
}
public Id getId() {
diff --git a/model/src/main/java/org/openremote/model/persistence/EpochMillisInstantType.java b/model/src/main/java/org/openremote/model/persistence/EpochMillisInstantType.java
new file mode 100644
index 000000000..9b017304d
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/persistence/EpochMillisInstantType.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.persistence;
+
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.internal.util.compare.ComparableComparator;
+import org.hibernate.type.AbstractSingleColumnStandardBasicType;
+import org.hibernate.type.LiteralType;
+import org.hibernate.type.VersionType;
+import org.hibernate.type.descriptor.java.InstantJavaDescriptor;
+import org.hibernate.type.descriptor.sql.BigIntTypeDescriptor;
+
+import java.time.Instant;
+import java.util.Comparator;
+
+public class EpochMillisInstantType extends AbstractSingleColumnStandardBasicType<Instant>
+ implements VersionType<Instant>, LiteralType<Instant> {
+
+ public static final String TYPE_NAME = "epoch-millis-instant";
+
+ public EpochMillisInstantType() {
+ super( BigIntTypeDescriptor.INSTANCE, InstantJavaDescriptor.INSTANCE );
+ }
+
+ @Override
+ public String objectToSQLString(Instant value, Dialect dialect) throws Exception {
+ return Long.toString(value.toEpochMilli());
+ }
+
+ @Override
+ public Instant seed(SharedSessionContractImplementor session) {
+ return Instant.now();
+ }
+
+ @Override
+ public Instant next(Instant current, SharedSessionContractImplementor session) {
+ return Instant.now();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Comparator<Instant> getComparator() {
+ return ComparableComparator.INSTANCE;
+ }
+
+ @Override
+ public String getName() {
+ return TYPE_NAME;
+ }
+}
diff --git a/model/src/main/java/org/openremote/model/query/UserQuery.java b/model/src/main/java/org/openremote/model/query/UserQuery.java
index 576057d03..b215c94c0 100644
--- a/model/src/main/java/org/openremote/model/query/UserQuery.java
+++ b/model/src/main/java/org/openremote/model/query/UserQuery.java
@@ -1,6 +1,5 @@
package org.openremote.model.query;
-
import org.openremote.model.query.filter.PathPredicate;
import org.openremote.model.query.filter.StringPredicate;
import org.openremote.model.query.filter.TenantPredicate;
@@ -10,13 +9,97 @@ import java.util.Arrays;
public class UserQuery {
+ public static class Select {
+ public boolean basic;
+ public boolean excludeServiceUsers;
+ public boolean excludeRegularUsers;
+ public boolean excludeSystemUsers;
+
+ public Select excludeServiceUsers(boolean excludeServiceUsers) {
+ this.excludeServiceUsers = excludeServiceUsers;
+ return this;
+ }
+
+ public Select excludeRegularUsers(boolean excludeRegularUsers) {
+ this.excludeRegularUsers = excludeRegularUsers;
+ return this;
+ }
+
+ public Select excludeSystemUsers(boolean excludeSystemUsers) {
+ this.excludeSystemUsers = excludeSystemUsers;
+ return this;
+ }
+
+ public Select basic(boolean basic) {
+ this.basic = basic;
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + "{" +
+ "excludeServiceUsers=" + excludeServiceUsers +
+ ", excludeRegularUsers=" + excludeRegularUsers +
+ ", excludeSystemUsers=" + excludeSystemUsers +
+ ", basic=" + basic +
+ '}';
+ }
+ }
+
+ public static class OrderBy {
+
+ public enum Property {
+ CREATED_ON,
+ FIRST_NAME,
+ LAST_NAME,
+ USERNAME,
+ EMAIL
+ }
+
+ public Property property;
+ public boolean descending;
+
+ public OrderBy() {
+ }
+
+ public OrderBy(Property property) {
+ this.property = property;
+ }
+
+ public OrderBy(Property property, boolean descending) {
+ this.property = property;
+ this.descending = descending;
+ }
+
+ public OrderBy property(Property property) {
+ this.property = property;
+ return this;
+ }
+
+ public OrderBy descending(boolean descending) {
+ this.descending = descending;
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + "{" +
+ "property=" + property +
+ ", descending=" + descending +
+ '}';
+ }
+ }
+
// Restriction predicates
public TenantPredicate tenantPredicate;
public UserAssetPredicate assetPredicate;
public PathPredicate pathPredicate;
public String[] ids;
+ public Select select;
public StringPredicate[] usernames;
- public int limit;
+ public Integer limit;
+ public Integer offset;
+ public OrderBy orderBy;
public UserQuery() {
}
@@ -51,6 +134,21 @@ public class UserQuery {
return this;
}
+ public UserQuery offset(int offset) {
+ this.offset = offset;
+ return this;
+ }
+
+ public UserQuery orderBy(OrderBy orderBy) {
+ this.orderBy = orderBy;
+ return this;
+ }
+
+ public UserQuery select(Select select) {
+ this.select = select;
+ return this;
+ }
+
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
@@ -60,6 +158,9 @@ public class UserQuery {
", ids=" + (ids != null ? Arrays.toString(ids) : "null") +
", usernames=" + (usernames != null ? Arrays.toString(usernames) : "null") +
", limit=" + limit +
+ ", offset=" + offset +
+ ", orderBy=" + orderBy +
+ ", select=" + select +
'}';
}
}
diff --git a/model/src/main/java/org/openremote/model/security/User.java b/model/src/main/java/org/openremote/model/security/User.java
index 396ffc078..0621cc65c 100644
--- a/model/src/main/java/org/openremote/model/security/User.java
+++ b/model/src/main/java/org/openremote/model/security/User.java
@@ -24,18 +24,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonSetter;
import org.hibernate.annotations.Formula;
import org.hibernate.annotations.Subselect;
+import org.openremote.model.persistence.EpochMillisInstantType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Transient;
+import javax.persistence.*;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
import java.lang.reflect.Field;
+import java.time.Instant;
import java.util.*;
+import static org.openremote.model.Constants.PERSISTENCE_JSON_VALUE_TYPE;
+
/**
* This can be used (among other things) to query the USER_ENTITY table in JPA queries.
*/
@@ -72,12 +75,24 @@ public class User {
@Column(name = "ENABLED")
protected Boolean enabled;
- @Transient
+ @Column(name = "CREATED_TIMESTAMP")
+ @org.hibernate.annotations.Type(type = EpochMillisInstantType.TYPE_NAME)
+ protected Instant createdOn;
+
+ @Formula("(SELECT C.SECRET FROM PUBLIC.CLIENT C WHERE C.ID = SERVICE_ACCOUNT_CLIENT_LINK)")
protected String secret; // For service users
- @Transient
+ @OneToMany(fetch = FetchType.EAGER)
+ @JoinColumn(name = "USER_ID")
@JsonIgnore
- protected Map<String, List<String>> attributes;
+ protected List<UserAttribute> attributes;
+
+ public User(String id, String username, String firstName, String lastName) {
+ this.id = id;
+ this.username = username;
+ this.firstName = firstName;
+ this.lastName = lastName;
+ }
public User() {
}
@@ -137,13 +152,38 @@ public class User {
return username != null && username.startsWith(SERVICE_ACCOUNT_PREFIX);
}
+ @JsonProperty
+ public Map<String, List<String>> getAttributes() {
+ if (this.attributes == null) {
+ return null;
+ }
+ MultivaluedMap<String, String> attrs = new MultivaluedHashMap<>();
+ this.attributes.forEach(attribute -> attrs.add(attribute.getName(), attribute.getValue()));
+ return attrs;
+ }
+
public User setAttributes(Map<String, List<String>> attributes) {
- this.attributes = attributes;
+ if (attributes == null) {
+ this.attributes = null;
+ return this;
+ }
+ List<UserAttribute> attrs = new ArrayList<>();
+ attributes.forEach((k, v) -> v.forEach(val -> attrs.add(new UserAttribute(k, val))));
+ this.attributes = attrs;
return this;
}
- public Map<String, List<String>> getAttributes() {
- return attributes;
+ public User setAttribute(String key, String...values) {
+ if (attributes == null) {
+ attributes = new ArrayList<>();
+ } else {
+ attributes.removeIf(attr -> attr.getName().equals(key));
+ }
+
+ if (values != null && values.length > 0) {
+ Arrays.stream(values).forEach((value) -> attributes.add(new UserAttribute(key, value)));
+ }
+ return this;
}
public User setServiceAccount(boolean serviceAccount) {
@@ -155,22 +195,20 @@ public class User {
return this;
}
+ public boolean isSystemAccount() {
+ Map<String, List<String>> attributes = getAttributes();
+ return attributes != null && attributes.containsKey(SYSTEM_ACCOUNT_ATTRIBUTE);
+ }
+
/**
* Will hide this user from HTTP API
*/
public User setSystemAccount(boolean systemAccount) {
- if (attributes == null) {
- attributes = new HashMap<>();
- }
-
if (systemAccount) {
- attributes.put(User.SYSTEM_ACCOUNT_ATTRIBUTE, Collections.singletonList("true"));
+ setAttribute(SYSTEM_ACCOUNT_ATTRIBUTE, "true");
} else {
- attributes.remove(User.SYSTEM_ACCOUNT_ATTRIBUTE);
- if (attributes.isEmpty()) {
- attributes = null;
- }
+ setAttribute(SYSTEM_ACCOUNT_ATTRIBUTE);
}
return this;
}
diff --git a/model/src/main/java/org/openremote/model/security/UserAttribute.java b/model/src/main/java/org/openremote/model/security/UserAttribute.java
new file mode 100644
index 000000000..cff51c1ea
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/security/UserAttribute.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.security;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.hibernate.annotations.Subselect;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+@Subselect("select * from PUBLIC.USER_ATTRIBUTE") // Map this immutable to an SQL view, don't use/create table
+public class UserAttribute {
+
+ @Id
+ protected String id;
+
+ @Column(name = "name")
+ protected String name;
+
+ @Column(name = "value")
+ protected String value;
+
+ protected UserAttribute() {}
+
+ @JsonCreator
+ public UserAttribute(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+}
diff --git a/model/src/main/java/org/openremote/model/security/UserResource.java b/model/src/main/java/org/openremote/model/security/UserResource.java
index 34d47996c..2f741bd15 100644
--- a/model/src/main/java/org/openremote/model/security/UserResource.java
+++ b/model/src/main/java/org/openremote/model/security/UserResource.java
@@ -22,6 +22,8 @@ package org.openremote.model.security;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.openremote.model.Constants;
import org.openremote.model.http.RequestParams;
+import org.openremote.model.query.UserQuery;
+
import javax.annotation.security.RolesAllowed;
import javax.validation.Valid;
import javax.ws.rs.*;
@@ -71,16 +73,11 @@ public interface UserResource {
@RolesAllowed(Constants.WRITE_ADMIN_ROLE)
void updateClientRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, Role[] roles, @PathParam("clientId") String clientId);
- @GET
- @Produces(APPLICATION_JSON)
- @Path("{realm}/users")
- User[] getAll(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);
-
- @GET
+ @POST
+ @Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
- @Path("{realm}/service-users")
- @RolesAllowed({READ_USERS_ROLE, READ_ADMIN_ROLE})
- User[] getAllService(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);
+ @Path("query")
+ User[] query(@BeanParam RequestParams requestParams, UserQuery query);
@GET
@Path("{realm}/{userId}")
diff --git a/model/src/main/java/org/openremote/model/value/MetaItemType.java b/model/src/main/java/org/openremote/model/value/MetaItemType.java
index d3e65b9e1..7bcaf200e 100644
--- a/model/src/main/java/org/openremote/model/value/MetaItemType.java
+++ b/model/src/main/java/org/openremote/model/value/MetaItemType.java
@@ -20,7 +20,7 @@
package org.openremote.model.value;
import org.openremote.model.Constants;
-import org.openremote.model.asset.UserAsset;
+import org.openremote.model.asset.UserAssetLink;
import org.openremote.model.asset.agent.AgentLink;
import org.openremote.model.attribute.Attribute;
import org.openremote.model.attribute.AttributeEvent;
@@ -65,13 +65,13 @@ public final class MetaItemType {
/**
* Marks the attribute as readable by restricted clients and therefore users who are linked to the asset, see {@link
- * UserAsset}.
+ * UserAssetLink}.
*/
public static final MetaItemDescriptor<Boolean> ACCESS_RESTRICTED_READ = new MetaItemDescriptor<>("accessRestrictedRead", ValueType.BOOLEAN);
/**
* Marks the attribute as writable by restricted clients and therefore users who are linked to the asset, see {@link
- * UserAsset}.
+ * UserAssetLink}.
*/
public static final MetaItemDescriptor<Boolean> ACCESS_RESTRICTED_WRITE = new MetaItemDescriptor<>("accessRestrictedWrite", ValueType.BOOLEAN);
diff --git a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
index 1f0e3a081..7978b3c3b 100644
--- a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
+++ b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy
@@ -41,11 +41,12 @@ import org.openremote.manager.asset.AssetStorageService
import org.openremote.manager.gateway.GatewayClientService
import org.openremote.manager.rules.RulesService
import org.openremote.manager.rules.RulesetStorageService
+import org.openremote.manager.security.ManagerIdentityService
import org.openremote.manager.web.ManagerWebService
import org.openremote.model.Constants
import org.openremote.model.ContainerService
import org.openremote.model.asset.Asset
-import org.openremote.model.asset.UserAsset
+import org.openremote.model.asset.UserAssetLink
import org.openremote.model.asset.agent.Agent
import org.openremote.model.gateway.GatewayConnection
import org.openremote.model.query.AssetQuery
@@ -54,7 +55,9 @@ import org.openremote.model.rules.AssetRuleset
import org.openremote.model.rules.GlobalRuleset
import org.openremote.model.rules.Ruleset
import org.openremote.model.rules.TenantRuleset
-import spock.util.concurrent.PollingConditions
+import org.openremote.model.security.Role
+import org.openremote.model.security.User
+import org.openremote.model.util.Pair
import javax.websocket.ClientEndpointConfig
import javax.websocket.Endpoint
@@ -111,6 +114,19 @@ trait ContainerTrait {
println("Services and config matches already running container so checking state")
def counter = 0
+ // Reset users - just delete ones that weren't there before (if tests change user roles etc. then the test should force stop the container in cleanup)
+ if (container.hasService(ManagerIdentityService.class)) {
+ def identityProvider = container.getService(ManagerIdentityService.class).getIdentityProvider()
+ def users = identityProvider.queryUsers()
+ def newUsers = users.findAll {user -> !TestFixture.users.any {previousUser -> previousUser.id == user.id}}
+ if (!TestFixture.users.every {previousUser -> users.any {user -> user.id == previousUser.id}}) {
+ throw new IllegalStateException("Users have been modified so cannot do simple purge")
+ }
+
+ println("Purging ${newUsers.size()} new user(s)")
+ newUsers.forEach {user -> identityProvider.deleteUser(user.realm, user.id)}
+ }
+
// Reset gateway connections
if (container.hasService(GatewayClientService.class)) {
def gatewayClientService = container.getService(GatewayClientService.class)
@@ -214,8 +230,8 @@ trait ContainerTrait {
}
if (!TestFixture.userAssets.isEmpty()) {
println("Re-linking ${TestFixture.userAssets.size()} user asset(s)")
- TestFixture.userAssets.forEach { ua ->
- assetStorageService.storeUserAsset(ua)
+ TestFixture.userAssets.groupBy {it.id.userId}.values().forEach { ua ->
+ assetStorageService.storeUserAssetLinks(ua)
}
}
}
@@ -269,6 +285,9 @@ trait ContainerTrait {
// Track gateway connections
TestFixture.gatewayConnections = getGatewayConnections()
+
+ // Track users and their roles
+ TestFixture.users = getUsers()
}
// Wait for agents and rulesets to be deployed - Just a very basic way of waiting for the system to be 'initialised'
@@ -365,20 +384,36 @@ trait ContainerTrait {
container.getService(AssetStorageService.class).findAll(new AssetQuery())
}
- List<UserAsset> getUserAssets() {
+ List<UserAssetLink> getUserAssets() {
if (!container.hasService(AssetStorageService.class)) {
return Collections.emptyList()
}
- container.getService(AssetStorageService.class).findUserAssets(null, null, null)
+ container.getService(AssetStorageService.class).findUserAssetLinks(null, null, null)
}
List<GatewayConnection> getGatewayConnections() {
if (!container.hasService(GatewayClientService.class)) {
- return Collections.emptyList();
+ return Collections.emptyList()
}
container.getService(GatewayClientService.class).getConnections()
}
+ List<User> getUsers() {
+ if (!container.hasService(ManagerIdentityService)) {
+ return Collections.emptyList()
+ }
+ def identityProvider = container.getService(ManagerIdentityService.class).getIdentityProvider()
+ List<User> users = identityProvider.queryUsers()
+ return users
+// List<Pair<User, Pair<Role[], Role[]>>> results = []
+// users.forEach {user ->
+// def roles = identityProvider.getUserRoles(user.realm, user.id, Constants.KEYCLOAK_CLIENT_ID)
+// def realmRoles = identityProvider.getUserRealmRoles(user.realm, user.id)
+// results.add(new Pair<User, Pair<Role[],Role[]>>(user, new Pair<>(roles, realmRoles)))
+// }
+// return results
+ }
+
Container getContainer() {
return TestFixture.container
}
diff --git a/test/src/main/java/org/openremote/test/TestFixture.java b/test/src/main/java/org/openremote/test/TestFixture.java
index 25e97160b..28ad7ff54 100644
--- a/test/src/main/java/org/openremote/test/TestFixture.java
+++ b/test/src/main/java/org/openremote/test/TestFixture.java
@@ -21,15 +21,18 @@ package org.openremote.test;
import org.openremote.container.Container;
import org.openremote.model.asset.Asset;
-import org.openremote.model.asset.UserAsset;
+import org.openremote.model.asset.UserAssetLink;
import org.openremote.model.gateway.GatewayConnection;
import org.openremote.model.rules.AssetRuleset;
import org.openremote.model.rules.GlobalRuleset;
-import org.openremote.model.rules.Ruleset;
import org.openremote.model.rules.TenantRuleset;
+import org.openremote.model.security.Role;
+import org.openremote.model.security.User;
+import org.openremote.model.util.Pair;
import org.spockframework.runtime.extension.AbstractGlobalExtension;
import java.util.List;
+import java.util.Map;
/**
* Used to store state for tests to help improve test performance
@@ -43,7 +46,8 @@ public class TestFixture extends AbstractGlobalExtension {
public static List<AssetRuleset> assetRulesets;
public static List<GatewayConnection> gatewayConnections;
public static List<Asset<?>> assets;
- public static List<UserAsset> userAssets;
+ public static List<UserAssetLink> userAssets;
+ public static List<User> users;
@Override
public void stop() {
diff --git a/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java b/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java
index 99e0ce083..0e738d5c6 100644
--- a/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java
+++ b/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java
@@ -59,8 +59,6 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {
public Tenant energyTenant;
public Tenant tenantCity;
public User serviceUser;
- public static final String serviceUserId = "test";
- public static final String serviceUserSecret = UniqueIdentifierGenerator.generateId("test");
public KeycloakTestSetup(Container container) {
super(container);
@@ -109,12 +107,12 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {
serviceUser = new User()
.setServiceAccount(true)
.setEnabled(true)
- .setUsername(serviceUserId);
- serviceUser = keycloakProvider.createUpdateUser(tenantBuilding.getRealm(), serviceUser, serviceUserSecret);
+ .setUsername("test");
+ serviceUser = keycloakProvider.createUpdateUser(tenantBuilding.getRealm(), serviceUser, UniqueIdentifierGenerator.generateId("serviceusertest"));
keycloakProvider.updateUserRoles(
tenantBuilding.getRealm(),
serviceUser.getId(),
- serviceUserId,
+ serviceUser.getUsername(),
Stream.of(ClientRole.READ_ASSETS, ClientRole.WRITE_ASSETS, ClientRole.WRITE_ATTRIBUTES).map(ClientRole::getValue).toArray(String[]::new)
);
}
diff --git a/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java b/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java
index 22afaf003..7d5bd0e83 100644
--- a/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java
+++ b/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java
@@ -27,7 +27,7 @@ import org.openremote.manager.setup.ManagerSetup;
import org.openremote.model.Constants;
import org.openremote.model.Container;
import org.openremote.model.asset.Asset;
-import org.openremote.model.asset.UserAsset;
+import org.openremote.model.asset.UserAssetLink;
import org.openremote.model.asset.impl.*;
import org.openremote.model.attribute.Attribute;
import org.openremote.model.attribute.MetaItem;
@@ -38,6 +38,8 @@ import org.openremote.model.value.ValueType;
import org.openremote.model.util.ValueUtil;
import org.openremote.model.value.impl.ColourRGB;
+import java.util.Arrays;
+
import static org.openremote.manager.datapoint.AssetDatapointService.DATA_POINTS_MAX_AGE_DAYS_DEFAULT;
import static org.openremote.model.Constants.*;
import static org.openremote.model.value.MetaItemType.*;
@@ -532,43 +534,45 @@ public class ManagerTestSetup extends ManagerSetup {
// ################################ Link users and assets ###################################
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ assetStorageService.storeUserAssetLinks(Arrays.asList(
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.testuser3Id,
- apartment1Id));
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ apartment1Id),
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.testuser3Id,
- apartment1LivingroomId));
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ apartment1LivingroomId),
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.testuser3Id,
- apartment1KitchenId));
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ apartment1KitchenId),
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.testuser3Id,
- apartment1Bedroom1Id));
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ apartment1Bedroom1Id),
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.testuser3Id,
- apartment1BathroomId));
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ apartment1BathroomId),
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.testuser3Id,
- apartment1HallwayId));
+ apartment1HallwayId)));
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ assetStorageService.storeUserAssetLinks(Arrays.asList(
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.buildingUserId,
- apartment1Id));
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ apartment1Id),
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.buildingUserId,
- apartment1LivingroomId));
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ apartment1LivingroomId),
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.buildingUserId,
- apartment1KitchenId));
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ apartment1KitchenId),
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.buildingUserId,
- apartment1Bedroom1Id));
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ apartment1Bedroom1Id),
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.buildingUserId,
- apartment1BathroomId));
- assetStorageService.storeUserAsset(new UserAsset(keycloakTestSetup.tenantBuilding.getRealm(),
+ apartment1BathroomId),
+ new UserAssetLink(keycloakTestSetup.tenantBuilding.getRealm(),
keycloakTestSetup.buildingUserId,
- apartment1HallwayId));
+ apartment1HallwayId)));
// ################################ Make users restricted ###################################
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
index 372ad15ec..b0f8072b0 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
@@ -8,7 +8,7 @@ import org.openremote.manager.setup.SetupService
import org.openremote.test.setup.KeycloakTestSetup
import org.openremote.test.setup.ManagerTestSetup
import org.openremote.model.asset.AssetResource
-import org.openremote.model.asset.UserAsset
+import org.openremote.model.asset.UserAssetLink
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
@@ -132,7 +132,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
then: "an error response should be returned"
ex = thrown()
- ex.response.status == 404
+ ex.response.status == 400
when: "all user assets are retrieved of a realm and user"
userAssets = assetResource.getUserAssetLinks(null, keycloakTestSetup.tenantBuilding.realm, null, managerTestSetup.apartment1Id)
@@ -171,8 +171,8 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
/* ############################################## WRITE ####################################### */
when: "an asset is linked to a user"
- UserAsset userAsset = new UserAsset(keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser2Id, managerTestSetup.apartment2Id)
- assetResource.createUserAsset(null, userAsset)
+ UserAssetLink userAssetLink = new UserAssetLink(keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser2Id, managerTestSetup.apartment2Id)
+ assetResource.createUserAssetLinks(null, [userAssetLink])
userAssets = assetResource.getUserAssetLinks(null, keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser2Id, null)
then: "result should match"
@@ -188,7 +188,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
}
when: "an asset link is deleted"
- assetResource.deleteUserAsset(null, keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser2Id, managerTestSetup.apartment2Id)
+ assetResource.deleteUserAssetLink(null, keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser2Id, managerTestSetup.apartment2Id)
userAssets = assetResource.getUserAssetLinks(null, keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser2Id, null)
then: "result should match"
diff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
index af1dc2459..45614457a 100644
--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
@@ -183,7 +183,7 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {
assert consolePushProvider.data.get("token").asText() == "23123213ad2313b0897efd"
and: "the console should have been linked to the authenticated user"
- def userAssets = assetStorageService.findUserAssets(keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser3Id, consoleId)
+ def userAssets = assetStorageService.findUserAssetLinks(keycloakTestSetup.tenantBuilding.realm, keycloakTestSetup.testuser3Id, consoleId)
assert userAssets.size() == 1
assert userAssets.get(0).assetName == "Test Console"
@@ -306,7 +306,7 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {
anonymousConsole1 = console
consoleGeofenceProvider = console.getConsoleProviders().map{it.get("geofence")}.orElse(null)
consolePushProvider = console.getConsoleProviders().map{it.get("push")}.orElse(null)
- userAssets = assetStorageService.findUserAssets(null, null, consoleId)
+ userAssets = assetStorageService.findUserAssetLinks(null, null, consoleId)
then: "the console asset should have been created and be correctly configured"
assert !isNullOrEmpty(consoleId)
diff --git a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy
index b91fe8378..05ee0032b 100644
--- a/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/mqtt/MqttBrokerTest.groovy
@@ -51,14 +51,14 @@ class MqttBrokerTest extends Specification implements ManagerContainerTrait {
def clientEventService = container.getService(ClientEventService.class)
def agentService = container.getService(AgentService.class)
def mqttClientId = UniqueIdentifierGenerator.generateId()
- def username = keycloakTestSetup.tenantBuilding.realm + ":" + KeycloakTestSetup.serviceUserId // realm and OAuth client id
- def password = KeycloakTestSetup.serviceUserSecret
+ def username = keycloakTestSetup.tenantBuilding.realm + ":" + keycloakTestSetup.serviceUser.username // realm and OAuth client id
+ def password = keycloakTestSetup.serviceUser.secret
def mqttHost = getString(container.getConfig(), MQTT_SERVER_LISTEN_HOST, BrokerConstants.HOST)
def mqttPort = getInteger(container.getConfig(), MQTT_SERVER_LISTEN_PORT, BrokerConstants.PORT)
when: "a mqtt client connects with invalid credentials"
- def wrongUsername = "master:" + KeycloakTestSetup.serviceUserId
+ def wrongUsername = "master:" + keycloakTestSetup.serviceUser.username
MQTT_IOClient client = new MQTT_IOClient(mqttClientId, mqttHost, mqttPort, false, true, new UsernamePassword(wrongUsername, password), null)
client.connect()
diff --git a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
index 4874ab1bd..f0eea0b43 100644
--- a/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
@@ -13,6 +13,8 @@ import org.openremote.manager.notification.PushNotificationHandler
import org.openremote.manager.rules.geofence.ORConsoleGeofenceAssetAdapter
import org.openremote.manager.security.ManagerIdentityService
import org.openremote.manager.setup.SetupService
+import org.openremote.model.query.UserQuery
+import org.openremote.model.query.filter.TenantPredicate
import org.openremote.model.util.TextUtil
import org.openremote.test.setup.KeycloakTestSetup
import org.openremote.test.setup.ManagerTestSetup
@@ -557,7 +559,7 @@ class NotificationTest extends Specification implements ManagerContainerTrait {
expect: "the demo users to be created"
conditions.eventually {
- def users = identityService.getIdentityProvider().getUsers(keycloakTestSetup.tenantBuilding.realm)
+ def users = identityService.getIdentityProvider().queryUsers(new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm)).select(new UserQuery.Select().excludeServiceUsers(true)))
assert users.size() == 3
assert users.count { !TextUtil.isNullOrEmpty(it.email)} == 3
}
diff --git a/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy
index 90d3711f7..bd35a2cf2 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/mqtt/MQTTClientProtocolTest.groovy
@@ -93,7 +93,7 @@ class MQTTClientProtocolTest extends Specification implements ManagerContainerTr
.setClientId(clientId)
.setHost(mqttHost)
.setPort(mqttPort)
- .setUsernamePassword(new UsernamePassword(keycloakTestSetup.tenantBuilding.realm + ":" + KeycloakTestSetup.serviceUserId, KeycloakTestSetup.serviceUserSecret))
+ .setUsernamePassword(new UsernamePassword(keycloakTestSetup.tenantBuilding.realm + ":" + keycloakTestSetup.serviceUser.username, keycloakTestSetup.serviceUser.secret))
and: "the agent is added to the asset service"
agent = assetStorageService.merge(agent)
diff --git a/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy b/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy
index ae59fe56a..76a15fd90 100644
--- a/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy
@@ -19,7 +19,10 @@
*/
package org.openremote.test.users
+import org.openremote.container.security.keycloak.KeycloakIdentityProvider
import org.openremote.manager.setup.SetupService
+import org.openremote.model.query.UserQuery
+import org.openremote.model.query.filter.TenantPredicate
import org.openremote.test.setup.KeycloakTestSetup
import org.openremote.model.security.ClientRole
import org.openremote.model.security.Role
@@ -32,7 +35,6 @@ import javax.ws.rs.ForbiddenException
import static org.openremote.container.security.IdentityProvider.SETUP_ADMIN_PASSWORD
import static org.openremote.container.security.IdentityProvider.SETUP_ADMIN_PASSWORD_DEFAULT
-import static org.openremote.manager.security.ManagerKeycloakIdentityProvider.KEYCLOAK_DEFAULT_ROLES_PREFIX
import static org.openremote.container.util.MapAccess.getString
import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID
import static org.openremote.model.Constants.MASTER_REALM
@@ -73,6 +75,62 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
regularUserResource = getClientApiTarget(serverUri(serverPort), keycloakTestSetup.tenantBuilding.realm, regularAccessToken).proxy(UserResource.class)
}
+ def "User queries"() {
+
+ when: "a request is made for all users by a super user"
+ def users = adminUserResource.query(null, new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)))
+
+ then: "all users should be returned including system users"
+ users.size() == 3
+ users.count {it.isSystemAccount() && it.username == KeycloakIdentityProvider.MANAGER_CLIENT_ID} == 1
+ users.count {!it.isServiceAccount()} == 3
+
+ when: "a request is made for all users by a regular user"
+ users = regularUserResource.query(null, new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)))
+
+ then: "only non system users of the users realm should be returned"
+ users.size() == 4
+ users.count {it.isSystemAccount() && it.username == KeycloakIdentityProvider.MANAGER_CLIENT_ID} == 0
+ users.find {it.id == keycloakTestSetup.testuser2Id} != null
+ users.find {it.id == keycloakTestSetup.testuser3Id} != null
+ users.find {it.id == keycloakTestSetup.buildingUserId} != null
+ users.find {it.isServiceAccount() && it.id == keycloakTestSetup.serviceUser.id} != null
+
+ when: "a request is made for all users ordered by username"
+ users = regularUserResource.query(null, new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).orderBy(new UserQuery.OrderBy(UserQuery.OrderBy.Property.USERNAME, false)))
+
+ then: "only non system users of the users realm should be returned in username order"
+ users.size() == 4
+ users[0].username == "building"
+ users[1].username == keycloakTestSetup.serviceUser.username
+ users[2].username == "testuser2"
+ users[3].username == "testuser3"
+
+ when: "a request is made for subset of users ordered by username descending"
+ users = regularUserResource.query(null, new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).orderBy(new UserQuery.OrderBy(UserQuery.OrderBy.Property.USERNAME, true)).limit(2))
+
+ then: "the correct users should be returned"
+ users.size() == 2
+ users[0].username == "testuser3"
+ users[1].username == "testuser2"
+
+ when: "a request is made for another subset of users ordered by username descending"
+ users = regularUserResource.query(null, new UserQuery().tenant(new TenantPredicate(keycloakTestSetup.masterTenant.realm)).orderBy(new UserQuery.OrderBy(UserQuery.OrderBy.Property.USERNAME, true)).limit(2).offset(2))
+
+ then: "the correct users should be returned"
+ users.size() == 2
+ users[0].username == keycloakTestSetup.serviceUser.username
+ users[1].username == "building"
+
+ when: "a request is made for only service users"
+ users = adminUserResource.query(null, new UserQuery().select(new UserQuery.Select().excludeRegularUsers(true)).tenant(new TenantPredicate(keycloakTestSetup.tenantBuilding.realm)))
+
+ then: "only service users of the requested realm should be returned"
+ users.size() == 1
+ users.find {it.isServiceAccount() && it.id == keycloakTestSetup.serviceUser.id} != null
+ users.find {it.isServiceAccount() && it.id == keycloakTestSetup.serviceUser.id}.secret != null
+ }
+
def "Get and update roles"() {
when: "a request is made for the roles in the building realm by the admin user"
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index f7824e6ba..c788e1932 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -5,13 +5,14 @@ import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
import {EnhancedStore} from "@reduxjs/toolkit";
import {AppStateKeyed, Page, PageProvider} from "@openremote/or-app";
-import {ClientRole, Role, User, UserAsset} from "@openremote/model";
+import {ClientRole, Role, User, UserAssetLink, UserQuery} from "@openremote/model";
import {i18next} from "@openremote/or-translate";
import {OrIcon} from "@openremote/or-icon";
import {InputType, OrInputChangedEvent, OrMwcInput} from "@openremote/or-mwc-components/or-mwc-input";
-import {OrMwcDialog, showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
+import {showDialog, showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
import {showSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";
import {GenericAxiosResponse} from "@openremote/rest";
+import {OrAssetTreeSelectionEvent} from "@openremote/or-asset-tree";
const tableStyle = require("@material/data-table/dist/mdc.data-table.css");
@@ -27,11 +28,18 @@ export function pageUsersProvider<S extends AppStateKeyed>(store: EnhancedStore<
interface UserModel extends User {
password?: string;
+ loaded?: boolean;
+ loading?: boolean;
+ previousRoles?: Role[];
roles?: Role[];
+ previousRealmRoles?: Role[];
realmRoles?: Role[];
- userAssetLinks?: UserAsset[];
+ previousAssetLinks?: UserAssetLink[];
+ userAssetLinks?: UserAssetLink[];
}
+const RESTRICTED_USER_REALM_ROLE = "restricted_user";
+
@customElement("page-users")
class PageUsers<S extends AppStateKeyed> extends Page<S> {
static get styles() {
@@ -96,6 +104,11 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
border-top-color: #D3D3D3;
}
+ .mdc-data-table__row.disabled {
+ cursor: progress;
+ opacity: 0.4;
+ }
+
td, th {
width: 25%
}
@@ -201,19 +214,16 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
@property()
public realm?: string;
-
@state()
protected _users: UserModel[] = [];
@state()
protected _serviceUsers: UserModel[] = [];
@state()
- protected _activeUser: UserModel;
- @state()
protected _roles: Role[] = [];
@state()
- protected _compositeRoles: Role[] = [];
+ protected _realmRoles: Role[] = [];
@state()
- protected _userAssetLinks: UserAsset[] = [];
+ protected _compositeRoles: Role[] = [];
get name(): string {
return "user_plural";
@@ -237,13 +247,28 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
super.disconnectedCallback();
}
+ protected responseAndStateOK(stateChecker: () => boolean, response: GenericAxiosResponse<any>, errorMsg: string): boolean {
+
+ if (!stateChecker()) {
+ return false;
+ }
+
+ if (!response.data) {
+ showSnackbar(undefined, errorMsg, i18next.t("dismiss"));
+ console.error(errorMsg + ": response = " + response.statusText);
+ return false;
+ }
+
+ return true;
+ }
+
protected async loadUsers() {
this._compositeRoles = [];
this._roles = [];
+ this._realmRoles = [];
this._users = [];
this._serviceUsers = [];
- this._userAssetLinks = [];
if (!manager.authenticated || !manager.hasRole(ClientRole.READ_USERS)) {
console.warn("Not authenticated or insufficient access");
@@ -251,63 +276,35 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
}
const realm = this.getState().app.realm;
- const responseAndStateOK: <T extends GenericAxiosResponse<any[]>>(response: T, errorMsg: string) => boolean = (response, errorMsg) => {
-
- // After async op check that the response still matches current state and that the component is still loaded in the UI
- if (this.getState().app.realm !== realm || !this.isConnected) {
- // Realm change or component disconnected - don't continue
- return false;
- }
-
- if (!response.data) {
- showSnackbar(undefined, errorMsg, i18next.t("dismiss"));
- console.error(errorMsg + ": response = " + response.statusText);
- return false;
- }
- return true;
- };
+ // After async op check that the response still matches current state and that the component is still loaded in the UI
+ const stateChecker = () => {
+ return this.getState().app.realm === realm && this.isConnected;
+ }
const roleResponse = await manager.rest.api.UserResource.getRoles(manager.displayRealm);
- if (!responseAndStateOK(roleResponse, i18next.t("loadFailedRoles"))) {
+ if (!this.responseAndStateOK(stateChecker, roleResponse, i18next.t("loadFailedRoles"))) {
return;
}
- const compositeRoles = roleResponse.data.filter(role => role.composite);
- const roles = roleResponse.data.filter(role => !role.composite);
- const usersResponse = await manager.rest.api.UserResource.getAll(manager.displayRealm);
+ const realmRoleResponse = await manager.rest.api.UserResource.getRealmRoles(manager.displayRealm);
- if (!responseAndStateOK(usersResponse, i18next.t("loadFailedUsers"))) {
+ if (!this.responseAndStateOK(stateChecker, roleResponse, i18next.t("loadFailedRoles"))) {
return;
}
- const serviceUsersResponse = await manager.rest.api.UserResource.getAllService(manager.displayRealm);
+ const usersResponse = await manager.rest.api.UserResource.query({tenantPredicate: {realm: manager.displayRealm}} as UserQuery);
- if (!responseAndStateOK(serviceUsersResponse, i18next.t("loadFailedServiceUsers"))) {
+ if (!this.responseAndStateOK(stateChecker, usersResponse, i18next.t("loadFailedUsers"))) {
return;
}
- const users: UserModel[] = usersResponse.data;
- const serviceUsers: UserModel[] = serviceUsersResponse.data;
-
- // Load each users assigned roles
- const roleLoaders = [...users, ...serviceUsers].map(async user => {
- const userRolesResponse = await (user.serviceAccount ? manager.rest.api.UserResource.getUserClientRoles(manager.displayRealm, user.id, user.username) : manager.rest.api.UserResource.getUserRoles(manager.displayRealm, user.id));
- user.roles = userRolesResponse.data.filter(r => r.assigned);
- const userAssetLinksResponse = await manager.rest.api.AssetResource.getUserAssetLinks({realm: manager.displayRealm, userId: user.id});
- this._userAssetLinks = this._userAssetLinks.concat(userAssetLinksResponse.data);
- const userRealmRoles = await manager.rest.api.UserResource.getUserRealmRoles(manager.displayRealm, user.id);
- user.realmRoles = userRealmRoles.data.filter(r => r.assigned);
- });
-
- await Promise.all(roleLoaders);
-
- // Only update state once all promises are fulfilled
- this._compositeRoles = compositeRoles.sort(Util.sortByString(role => role.name));
- this._roles = roles.sort(Util.sortByString(role => role.name));
- this._users = users.sort(Util.sortByString(u => u.username));
- this._serviceUsers = serviceUsers.sort(Util.sortByString(u => u.username));
+ this._compositeRoles = roleResponse.data.filter(role => role.composite).sort(Util.sortByString(role => role.name));
+ this._roles = roleResponse.data.filter(role => !role.composite).sort(Util.sortByString(role => role.name));
+ this._realmRoles = realmRoleResponse.data.sort(Util.sortByString(role => role.name));
+ this._users = usersResponse.data.filter(user => !user.serviceAccount).sort(Util.sortByString(u => u.username));
+ this._serviceUsers = usersResponse.data.filter(user => user.serviceAccount).sort(Util.sortByString(u => u.username));
}
private async _createUpdateUser(user: UserModel) {
@@ -319,17 +316,17 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
try {
const response = await manager.rest.api.UserResource.createUpdate(manager.displayRealm, user);
+ // Ensure user ID is set
+ user.id = response.data.id;
if (user.password) {
- const id = response.data.id;
const credentials = {value: user.password}
- manager.rest.api.UserResource.resetPassword(manager.displayRealm, id, credentials);
+ manager.rest.api.UserResource.resetPassword(manager.displayRealm, user.id, credentials);
}
- (response.data as UserModel).roles = user.roles;
- await this._updateRoles(response.data);
- await this.handleRestrictedUserBoolean(user);
- await this.handleRestrictedAccessSelection(user);
- this._activeUser = null;
+
+ await this._updateRoles(user, false);
+ await this._updateRoles(user, true);
+ await this._updateUserAssetLinks(user);
} finally {
this.loadUsers();
}
@@ -339,17 +336,44 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
* Backend only uses name of role not the ID so although service client roles are not the same as composite roles
* the names will match so that's ok
*/
- private async _updateRoles(user: UserModel) {
- if (this._compositeRoles.length === 0 || !user.roles) {
+ private async _updateRoles(user: UserModel, realmRoles: boolean) {
+ const roles = realmRoles ? user.realmRoles.filter(role => role.assigned) : user.roles.filter(role => role.assigned);
+ const previousRoles = realmRoles ? user.previousRealmRoles : user.previousRoles;
+ const removedRoles = previousRoles.filter(previousRole => !roles.some(role => role.name === previousRole.name));
+ const addedRoles = roles.filter(role => !previousRoles.some(previousRole => previousRole.name === role.name));
+
+ if (removedRoles.length === 0 && addedRoles.length === 0) {
return;
}
- const roles = user.roles.filter(role => role.assigned);
-
- if (!user.serviceAccount) {
- await manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, roles);
+ if (realmRoles) {
+ await manager.rest.api.UserResource.updateUserRealmRoles(manager.displayRealm, user.id, roles);
} else {
- await manager.rest.api.UserResource.updateUserClientRoles(manager.displayRealm, user.id, user.username, roles);
+ if (!user.serviceAccount) {
+ await manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, roles);
+ } else {
+ await manager.rest.api.UserResource.updateUserClientRoles(manager.displayRealm, user.id, user.username, roles);
+ }
+ }
+ }
+
+ private async _updateUserAssetLinks(user: UserModel) {
+ if (!user.previousAssetLinks) {
+ return;
+ }
+
+ const removedLinks = user.previousAssetLinks.filter(assetLink => !user.userAssetLinks.some(newLink => assetLink.id.assetId === newLink.id.assetId));
+ const addedLinks = user.userAssetLinks.filter(assetLink => !user.previousAssetLinks.some(oldLink => assetLink.id.assetId === oldLink.id.assetId)).map(link => {
+ // Ensure user ID is added as new users wouldn't have had an ID at the time the links were created in the UI
+ link.id.userId = user.id;
+ return link;
+ });
+
+ if (removedLinks.length > 0) {
+ await manager.rest.api.AssetResource.deleteUserAssetLinks(removedLinks);
+ }
+ if (addedLinks.length > 0) {
+ await manager.rest.api.AssetResource.createUserAssetLinks(addedLinks);
}
}
@@ -419,7 +443,7 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
}, user, readonly, compositeRoleOptions, "user"+index))}
${(this._users.length === 0 || (this._users.length > 0 && !!this._users[this._users.length - 1].id)) && !readonly ? html`
<tr class="mdc-data-table__row" @click="${() => {
- this._users = [...this._users, {enabled: true}];
+ this._users = [...this._users, {realm: manager.displayRealm, userAssetLinks: [], roles:[], previousRoles: [], realmRoles: [], previousRealmRoles: [], enabled: true, loaded: true}];
}}">
<td colspan="100%">
<a class="button"><or-icon icon="plus"></or-icon>${i18next.t("add")} ${i18next.t("user")}</a>
@@ -458,6 +482,12 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
${(this._serviceUsers.length === 0 || (this._serviceUsers.length > 0 && !!this._serviceUsers[this._serviceUsers.length - 1].id)) && !readonly ? html`
<tr class="mdc-data-table__row" @click="${() => {
this._serviceUsers = [...this._serviceUsers, {
+ userAssetLinks: [],
+ roles: [],
+ previousRoles: [],
+ realmRoles: [],
+ previousRealmRoles: [],
+ loaded: true,
enabled: true,
serviceAccount: true}]
}}">
@@ -478,11 +508,57 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
this.realm = state.app.realm;
}
- protected _toggleUserExpand(ev: MouseEvent) {
+ protected async _toggleUserExpand(ev: MouseEvent, user: UserModel) {
const trElem = ev.currentTarget as HTMLTableRowElement;
const expanderIcon = trElem.getElementsByTagName("or-icon")[0] as OrIcon;
const userRow = (trElem.parentElement! as HTMLTableElement).rows[trElem.rowIndex];
+ if (user.loading) {
+ return;
+ }
+
+ if (!user.loaded) {
+ trElem.classList.add("disabled");
+ user.loading = true;
+
+ // Load users assigned roles
+ const userRolesResponse = await (user.serviceAccount ? manager.rest.api.UserResource.getUserClientRoles(manager.displayRealm, user.id, user.username) : manager.rest.api.UserResource.getUserRoles(manager.displayRealm, user.id));
+
+ if (!this.responseAndStateOK(() => true, userRolesResponse, i18next.t("loadFailedUserInfo"))) {
+ user.loading = false;
+ trElem.classList.remove("disabled");
+ return;
+ }
+
+ const userRealmRolesResponse = await manager.rest.api.UserResource.getUserRealmRoles(manager.displayRealm, user.id);
+
+ if (!this.responseAndStateOK(() => true, userRolesResponse, i18next.t("loadFailedUserInfo"))) {
+ user.loading = false;
+ trElem.classList.remove("disabled");
+ return;
+ }
+
+
+ const userAssetLinksResponse = await manager.rest.api.AssetResource.getUserAssetLinks({realm: manager.displayRealm, userId: user.id});
+
+ if (!this.responseAndStateOK(() => true, userAssetLinksResponse, i18next.t("loadFailedUserInfo"))) {
+ user.loading = false;
+ trElem.classList.remove("disabled");
+ return;
+ }
+
+ user.roles = userRolesResponse.data.filter(r => r.assigned);
+ user.realmRoles = userRealmRolesResponse.data.filter(r => r.assigned);
+ user.previousRealmRoles = [...user.realmRoles];
+ user.previousRoles = [...user.roles];
+ user.userAssetLinks = userAssetLinksResponse.data;
+ user.loaded = true;
+ user.loading = false;
+ trElem.classList.remove("disabled");
+ // Update the dom
+ this.requestUpdate();
+ }
+
if (expanderIcon.icon === "chevron-right") {
expanderIcon.icon = "chevron-down";
userRow.classList.add("expanded");
@@ -492,43 +568,56 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
}
}
- protected _openAssetSelector(user: UserModel) {
- this._activeUser = user;
- const userAssetLinks = this.getUserAssetLinksByUser(user.id);
- this._activeUser.userAssetLinks = userAssetLinks;
- const hostElement = document.body;
-
- const dialog = new OrMwcDialog();
- dialog.isOpen = true;
- dialog.dialogTitle = i18next.t("restrictAccess");
- dialog.dialogContent = html`
- <or-asset-tree
- id="chart-asset-tree" readonly .selectedIds="${this._activeUser.userAssetLinks.map(ual => ual.id.assetId)}"
- .showSortBtn="${false}" .expandNodes="${true}" .checkboxes="${true}"
- @or-asset-tree-selection="${e => this.handleAssetIdSelection(e, this._activeUser)}"></or-asset-tree>
- `;
- dialog.dialogActions = [
- {
- default: true,
- actionName: "cancel",
- content: i18next.t("cancel"),
- action: () => {
- this._activeUser.userAssetLinks = userAssetLinks;
- this.updateAssetLinksForUser(userAssetLinks, user.id);
- }
- },
- {
- actionName: "ok",
- content: i18next.t("ok"),
- action: () => {
- this.updateAssetLinksForUser(this._activeUser.userAssetLinks, user.id);
- this._activeUser = null;
+ protected _openAssetSelector(ev: MouseEvent, user: UserModel) {
+ const openBtn = ev.target as OrMwcInput;
+ openBtn.disabled = true;
+ user.previousAssetLinks = [...user.userAssetLinks];
+
+ const onAssetSelectionChanged = (e: OrAssetTreeSelectionEvent) => {
+ user.userAssetLinks = e.detail.newNodes.map(node => {
+ const userAssetLink: UserAssetLink = {
+ id: {
+ userId: user.id,
+ realm: user.realm,
+ assetId: node.asset.id
+ }
+ };
+ return userAssetLink;
+ })
+ };
+
+ const dialog = showDialog({
+ title: i18next.t("restrictAccess"),
+ content: html`
+ <or-asset-tree
+ id="chart-asset-tree" readonly .selectedIds="${user.userAssetLinks.map(ual => ual.id.assetId)}"
+ .showSortBtn="${false}" expandNodes checkboxes
+ @or-asset-tree-selection="${(e: OrAssetTreeSelectionEvent) => onAssetSelectionChanged(e)}"></or-asset-tree>
+ `,
+ actions: [
+ {
+ default: true,
+ actionName: "cancel",
+ content: i18next.t("cancel"),
+ action: () => {
+ user.userAssetLinks = user.previousAssetLinks;
+ user.previousAssetLinks = undefined;
+ openBtn.disabled = false;
+ }
+ },
+ {
+ actionName: "ok",
+ content: i18next.t("ok"),
+ action: () => {
+ openBtn.disabled = false;
+ this.requestUpdate();
+ }
}
+ ],
+ dismissAction: {
+ actionName: "cancel"
}
- ];
-
- hostElement.append(dialog);
- return dialog;
+ });
}
protected _onPasswordChanged(user: UserModel, suffix: string) {
@@ -583,11 +672,10 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
protected _getUserTemplate(addCancel: () => void, user: UserModel, readonly: boolean, compositeRoleOptions: string[], suffix: string): TemplateResult {
const isServiceUser = user.serviceAccount;
const isSameUser = user.username === manager.username;
- user.roles = user.roles || [];
- const implicitRoleNames = this.getImplicitUserRoles(user);
+ const implicitRoleNames = user.loaded ? this.getImplicitUserRoles(user) : [];
return html`
- <tr class="mdc-data-table__row" @click="${(ev) => this._toggleUserExpand(ev)}">
+ <tr class="mdc-data-table__row" @click="${(ev) => this._toggleUserExpand(ev, user)}">
<td class="padded-cell mdc-data-table__cell">
<or-icon icon="chevron-right"></or-icon>
<span>${user.username}</span>
@@ -604,195 +692,174 @@ class PageUsers<S extends AppStateKeyed> extends Page<S> {
</tr>
<tr class="item-row${!user.id ? " expanded" : ""}">
<td colspan="4">
- <div class="item-row-content">
- <div class="row">
- <div class="column">
- <h5>${i18next.t("details")}</h5>
- <!-- user details -->
- <or-mwc-input ?readonly="${!!user.id || readonly}"
- .label="${i18next.t("username")}"
- .type="${InputType.TEXT}" min="1" required
- .value="${user.username}"
- @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.username = e.detail.value}"></or-mwc-input>
- <or-mwc-input ?readonly="${readonly}"
- class="${isServiceUser ? "hidden" : ""}"
- .label="${i18next.t("email")}"
- .type="${InputType.EMAIL}" min="1"
- .value="${user.email}"
- @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.email = e.detail.value}"></or-mwc-input>
- <or-mwc-input ?readonly="${readonly}"
- class="${isServiceUser ? "hidden" : ""}"
- .label="${i18next.t("firstName")}"
- .type="${InputType.TEXT}" min="1"
- .value="${user.firstName}"
- @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.firstName = e.detail.value}"></or-mwc-input>
- <or-mwc-input ?readonly="${readonly}"
- class="${isServiceUser ? "hidden" : ""}"
- .label="${i18next.t("surname")}"
- .type="${InputType.TEXT}" min="1"
- .value="${user.lastName}"
- @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.lastName = e.detail.value}"></or-mwc-input>
-
- <!-- password -->
- <h5>${i18next.t("password")}</h5>
- ${user.serviceAccount ? html`
- <or-mwc-input id="password-${suffix}" readonly
- .label="${i18next.t("secret")}"
- .value="${user.secret}"
- .type="${InputType.TEXT}"></or-mwc-input>
- <or-mwc-input ?readonly="${!user.id || readonly}"
- .label="${i18next.t("regenerateSecret")}"
- .type="${InputType.BUTTON}"
- @or-mwc-input-changed="${(ev) => this._regenerateSecret(ev, user, "password-"+suffix)}"></or-mwc-input>`
- : html`
- <or-mwc-input id="password-${suffix}"
- ?readonly="${readonly}"
- .label="${i18next.t("password")}"
- .type="${InputType.PASSWORD}" min="1"
- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {this._onPasswordChanged(user, suffix)}}"></or-mwc-input>
- <or-mwc-input id="repeatPassword-${suffix}"
- helperPersistent ?readonly="${readonly}"
- .label="${i18next.t("repeatPassword")}"
- .type="${InputType.PASSWORD}" min="1"
- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {this._onPasswordChanged(user, suffix)}}"></or-mwc-input>
- `}
- </div>
-
- <div class="column">
- <h5>${i18next.t("settings")}</h5>
- <!-- enabled -->
- <or-mwc-input ?readonly="${readonly}"
- .label="${i18next.t("active")}"
- .type="${InputType.CHECKBOX}"
- .value="${user.enabled}"
- @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}"
- style="height: 56px;"></or-mwc-input>
-
- <!-- is admin -->
- <or-mwc-input ?readonly="${true}"
- .label="${i18next.t("fullAccessLabel")}"
- .type="${InputType.CHECKBOX}"
- .value="${user.enabled}"
- style="height: 56px;"></or-mwc-input>
-
- <!-- composite roles -->
- <or-mwc-input
- ?readonly="${readonly}"
- class="${isServiceUser ? "hidden" : ""}"
- ?disabled="${isSameUser}"
- .value="${user.roles && user.roles.length > 0 ? user.roles.filter(r => r.composite).map(r => r.name) : undefined}"
- .type="${InputType.SELECT}" multiple
- .options="${compositeRoleOptions}"
- .label="${i18next.t("role_plural")}"
- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {
- const roleNames = e.detail.value as string[];
- user.roles = this._compositeRoles.filter(cr => roleNames.some(name => cr.name === name)).map(r => {return {...r, assigned: true};});
- this._updateUserSelectedRoles(user, suffix);
- }}"></or-mwc-input>
-
- <!-- roles -->
- <div style="display:flex;flex-wrap:wrap;margin-bottom: 20px;" id="role-list-${suffix}">
- ${this._roles.map(r => {
- return html`
- <or-mwc-input
- ?readonly="${readonly}"
- ?disabled="${implicitRoleNames.find(name => r.name === name)}"
- .value="${!!user.roles.find(userRole => userRole.name === r.name) || implicitRoleNames.some(implicitRoleName => implicitRoleName === r.name)}"
- .type="${InputType.CHECKBOX}"
- .label="${r.name}"
- style="width:25%;margin:0"
- @or-mwc-input-changed="${(e: OrInputChangedEvent) => {
- if (!!e.detail.value) {
- user.roles.push({...r, assigned: true});
- } else {
- user.roles = user.roles.filter(e => e.name !== r.name);
- }
- }}"></or-mwc-input>
- `
- })}
+ ${!user.loaded ? `` : html`
+ <div class="item-row-content">
+ <div class="row">
+ <div class="column">
+ <h5>${i18next.t("details")}</h5>
+ <!-- user details -->
+ <or-mwc-input ?readonly="${!!user.id || readonly}"
+ .label="${i18next.t("username")}"
+ .type="${InputType.TEXT}" min="1" required
+ .value="${user.username}"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.username = e.detail.value}"></or-mwc-input>
+ <or-mwc-input ?readonly="${readonly}"
+ class="${isServiceUser ? "hidden" : ""}"
+ .label="${i18next.t("email")}"
+ .type="${InputType.EMAIL}" min="1"
+ .value="${user.email}"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.email = e.detail.value}"></or-mwc-input>
+ <or-mwc-input ?readonly="${readonly}"
+ class="${isServiceUser ? "hidden" : ""}"
+ .label="${i18next.t("firstName")}"
+ .type="${InputType.TEXT}" min="1"
+ .value="${user.firstName}"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.firstName = e.detail.value}"></or-mwc-input>
+ <or-mwc-input ?readonly="${readonly}"
+ class="${isServiceUser ? "hidden" : ""}"
+ .label="${i18next.t("surname")}"
+ .type="${InputType.TEXT}" min="1"
+ .value="${user.lastName}"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.lastName = e.detail.value}"></or-mwc-input>
+
+ <!-- password -->
+ <h5>${i18next.t("password")}</h5>
+ ${user.serviceAccount ? html`
+ <or-mwc-input id="password-${suffix}" readonly
+ .label="${i18next.t("secret")}"
+ .value="${user.secret}"
+ .type="${InputType.TEXT}"></or-mwc-input>
+ <or-mwc-input ?readonly="${!user.id || readonly}"
+ .label="${i18next.t("regenerateSecret")}"
+ .type="${InputType.BUTTON}"
+ @or-mwc-input-changed="${(ev) => this._regenerateSecret(ev, user, "password-" + suffix)}"></or-mwc-input>`
+ : html`
+ <or-mwc-input id="password-${suffix}"
+ ?readonly="${readonly}"
+ .label="${i18next.t("password")}"
+ .type="${InputType.PASSWORD}" min="1"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {
+ this._onPasswordChanged(user, suffix)
+ }}"></or-mwc-input>
+ <or-mwc-input id="repeatPassword-${suffix}"
+ helperPersistent ?readonly="${readonly}"
+ .label="${i18next.t("repeatPassword")}"
+ .type="${InputType.PASSWORD}" min="1"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {
+ this._onPasswordChanged(user, suffix)
+ }}"></or-mwc-input>
+ `}
</div>
- <!-- restricted access -->
- <div>
+ <div class="column">
+ <h5>${i18next.t("settings")}</h5>
+ <!-- enabled -->
+ <or-mwc-input ?readonly="${readonly}"
+ .label="${i18next.t("active")}"
+ .type="${InputType.CHECKBOX}"
+ .value="${user.enabled}"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}"
+ style="height: 56px;"></or-mwc-input>
+
+ <!-- is admin -->
+ <or-mwc-input ?readonly="${true}"
+ .label="${i18next.t("fullAccessLabel")}"
+ .type="${InputType.CHECKBOX}"
+ .value="${user.enabled}"
+ style="height: 56px;"></or-mwc-input>
+
+ <!-- composite roles -->
<or-mwc-input
- id="${user.id}-restricted"
- .type="${InputType.CHECKBOX}"
- .label="${i18next.t("restrictedAccessToAssets") + ':'}"
- .value="${!!user.realmRoles.find(r => r.name === 'restricted_user')}"></or-mwc-input>
-
- <or-mwc-input outlined
- .type="${InputType.BUTTON}"
- .label="${i18next.t("selectRestrictedAssets", {number: this._userAssetLinks.filter(ual => ual.id.userId === user.id).length})}"
- @click="${() => this._openAssetSelector(user)}"></or-mwc-input>
+ ?readonly="${readonly}"
+ class="${isServiceUser ? "hidden" : ""}"
+ ?disabled="${isSameUser}"
+ .value="${user.roles && user.roles.length > 0 ? user.roles.filter(r => r.composite).map(r => r.name) : undefined}"
+ .type="${InputType.SELECT}" multiple
+ .options="${compositeRoleOptions}"
+ .label="${i18next.t("role_plural")}"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {
+ const roleNames = e.detail.value as string[];
+ user.roles = this._compositeRoles.filter(cr => roleNames.some(name => cr.name === name)).map(r => {
+ return {...r, assigned: true};
+ });
+ this._updateUserSelectedRoles(user, suffix);
+ }}"></or-mwc-input>
+
+ <!-- roles -->
+ <div style="display:flex;flex-wrap:wrap;margin-bottom: 20px;"
+ id="role-list-${suffix}">
+ ${this._roles.map(r => {
+ return html`
+ <or-mwc-input
+ ?readonly="${readonly}"
+ ?disabled="${implicitRoleNames.find(name => r.name === name)}"
+ .value="${!!user.roles.find(userRole => userRole.name === r.name) || implicitRoleNames.some(implicitRoleName => implicitRoleName === r.name)}"
+ .type="${InputType.CHECKBOX}"
+ .label="${r.name}"
+ style="width:25%;margin:0"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {
+ if (!!e.detail.value) {
+ user.roles.push({...r, assigned: true});
+ } else {
+ user.roles = user.roles.filter(e => e.name !== r.name);
+ }
+ }}"></or-mwc-input>
+ `
+ })}
+ </div>
+
+ <!-- restricted access -->
+ <div>
+ <or-mwc-input
+ id="${user.id}-restricted"
+ .type="${InputType.CHECKBOX}"
+ .label="${i18next.t("restrictedAccessToAssets") + ':'}"
+ @or-mwc-input-changed="${(ev: OrInputChangedEvent) => this._addRemoveRealmRole(user, RESTRICTED_USER_REALM_ROLE, ev.detail.value as boolean)}"
+ .value="${user.realmRoles ? !!user.realmRoles.find(r => r.name === RESTRICTED_USER_REALM_ROLE) : undefined}"></or-mwc-input>
+
+ <or-mwc-input outlined
+ .type="${InputType.BUTTON}"
+ .label="${i18next.t("selectRestrictedAssets", {number: user.userAssetLinks.length})}"
+ @click="${(ev: MouseEvent) => this._openAssetSelector(ev, user)}"></or-mwc-input>
+ </div>
</div>
</div>
- </div>
-
- ${readonly ? `` : html`
- <div class="row" style="margin-bottom: 0;">
- ${!isSameUser && user.id ? html`
- <or-mwc-input .label="${i18next.t("delete")}"
+ ${readonly ? `` : html`
+ <div class="row" style="margin-bottom: 0;">
+
+ ${!isSameUser && user.id ? html`
+ <or-mwc-input .label="${i18next.t("delete")}"
+ .type="${InputType.BUTTON}"
+ @click="${() => this._deleteUser(user)}"></or-mwc-input>
+ ` : ``}
+ ${!user.id ? html`
+ <or-mwc-input .label="${i18next.t("cancel")}"
+ .type="${InputType.BUTTON}"
+ @click="${() => addCancel()}"></or-mwc-input>
+ ` : ``}
+ <or-mwc-input id="savebtn-${suffix}" style="margin-left: auto;"
+ .label="${i18next.t(user.id ? "save" : "create")}"
.type="${InputType.BUTTON}"
- @click="${() => this._deleteUser(user)}"></or-mwc-input>
- ` : ``}
- ${!user.id ? html`<or-mwc-input .label="${i18next.t("cancel")}"
- .type="${InputType.BUTTON}"
- @click="${() => addCancel()}"></or-mwc-input>
- ` : ``}
- <or-mwc-input id="savebtn-${suffix}" style="margin-left: auto;"
- .label="${i18next.t(user.id ? "save" : "create")}"
- .type="${InputType.BUTTON}"
- @click="${() => this._createUpdateUser(user)}"></or-mwc-input>
- </div>
- `}
- </div>
+ @click="${() => this._createUpdateUser(user)}"></or-mwc-input>
+ </div>
+ `}
+ </div>
+ `}
</td>
</tr>
- `
- }
-
- private async handleRestrictedAccessSelection(user: UserModel) {
- // delete all userassetlinks for user
- const delPromises = this.getUserAssetLinksByUser(user.id).map((ual: UserAsset) => {
- return manager.rest.api.AssetResource.deleteUserAsset(ual.id.realm, user.id, ual.id.assetId);
- });
- await Promise.all(delPromises);
-
- // post all new userassetlinks
- const addPromises = this._userAssetLinks.filter(ual => ual.id.userId === user.id).map((ual: UserAsset) => {
- const payload: UserAsset = {
- id: { realm: manager.displayRealm, userId: user.id, assetId: ual.id.assetId },
- };
- return manager.rest.api.AssetResource.createUserAsset(payload);
- });
- await Promise.all(addPromises)
-
- }
-
- private async handleRestrictedUserBoolean(user: UserModel) {
- const checkboxElem = this.shadowRoot.getElementById(user.id + "-restricted") as OrMwcInput;
- const role = user.realmRoles.find(r => r.name === 'restricted_user');
- role.assigned = checkboxElem.value;
- await manager.rest.api.UserResource.updateUserRealmRoles(manager.displayRealm, user.id, [role]);
- }
-
- private getUserAssetLinksByUser(userId): UserAsset[] {
- return this._userAssetLinks.filter(ual => ual.id.userId === userId) || [];
- }
-
- private updateAssetLinksForUser(userAssetLinks: UserAsset[], userId: string) {
- const linksWithoutCurrentUser = this._userAssetLinks.filter(ual => ual.id.userId !== userId);
- this._userAssetLinks = linksWithoutCurrentUser.concat(userAssetLinks);
+ `;
}
- private handleAssetIdSelection(e, user?: UserModel) {
- this._activeUser.userAssetLinks = e.detail.newNodes.map(e => ({
- id: {
- realm: manager.displayRealm,
- userId: user.id,
- assetId: e.asset.id
+ protected _addRemoveRealmRole(user: UserModel, roleName: string, add: boolean) {
+ if (!add) {
+ user.realmRoles = user.realmRoles.filter(role => role.name !== roleName);
+ } else {
+ const role = this._realmRoles.find(role => role.name === roleName);
+ if (role) {
+ user.realmRoles.push({...role, assigned: true});
}
- }));
+ }
+ this.requestUpdate();
}
}
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts
index 271ffeb06..aa4c26a0e 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-notification.ts
@@ -119,7 +119,7 @@ export class OrRuleActionNotification extends LitElement {
let value: string | undefined;
if (targetType === ActionTargetType.USER) {
- targetValuesGenerator = manager.rest.api.UserResource.getAll(manager.displayRealm).then(
+ targetValuesGenerator = manager.rest.api.UserResource.query({tenant: manager.displayRealm} as UserQuery).then(
(usersResponse) => usersResponse.data.map((user) => [user.id!, user.username!])
);
label = i18next.t("user_plural");