Skip to content

armgit / core

Public Imported from GitHub
0

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

User related updates and service users added to manager UI user management page

Rich Turnerc425457bd051
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 5b0f2fc9a..a7cd7e0d5 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -111,7 +111,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
}
}
- protected interface ParameterBinder extends BiConsumer<EntityManager, org.hibernate.query.Query<Object[]>> {
+ public interface ParameterBinder extends BiConsumer<EntityManager, org.hibernate.query.Query<Object[]>> {
@Override
default void accept(EntityManager em, org.hibernate.query.Query<Object[]> st) {
@@ -1974,7 +1974,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
throw new IllegalArgumentException("Unsupported operator: " + operator);
}
- protected static String buildMatchFilter(StringPredicate predicate, int pos) {
+ public static String buildMatchFilter(StringPredicate predicate, int pos) {
switch (predicate.match) {
case BEGIN:
case END:
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 e2aa1cdf1..a733b2e5c 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
@@ -90,6 +90,11 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
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])));
@@ -159,6 +164,11 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
throw new UnsupportedOperationException("This provider does not support password reset");
}
+ @Override
+ public String resetSecret(String realm, String userId) {
+ throw new UnsupportedOperationException("This provider does not support secret reset");
+ }
+
@Override
public Role[] getRoles(String realm, String client) {
if (client != null && !MASTER_REALM.equals(client)) {
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 ef22a4803..dcafd8f38 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
@@ -22,8 +22,10 @@ package org.openremote.manager.security;
import org.openremote.container.persistence.PersistenceService;
import org.openremote.container.security.AuthContext;
import org.openremote.container.security.IdentityProvider;
+import org.openremote.manager.asset.AssetStorageService;
import org.openremote.model.event.shared.TenantFilter;
import org.openremote.model.query.UserQuery;
+import org.openremote.model.query.filter.StringPredicate;
import org.openremote.model.security.*;
import org.openremote.model.util.TextUtil;
@@ -32,6 +34,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.IntStream;
+import static org.openremote.manager.asset.AssetStorageService.buildMatchFilter;
import static org.openremote.model.Constants.MASTER_REALM;
// TODO: Normalise interface for Basic and Keycloak providers and add client CRUD
@@ -43,6 +46,8 @@ public interface ManagerIdentityProvider extends IdentityProvider {
User[] getUsers(String realm);
+ User[] getServiceUsers(String realm);
+
User[] getUsers(List<String> userIds);
User[] getUsers(UserQuery userQuery);
@@ -57,6 +62,8 @@ public interface ManagerIdentityProvider extends IdentityProvider {
void resetPassword(String realm, String userId, Credential credential);
+ String resetSecret(String realm, String userId);
+
Role[] getRoles(String realm, String client);
void updateClientRoles(String realm, String client, Role[] roles);
@@ -138,12 +145,18 @@ public interface ManagerIdentityProvider extends IdentityProvider {
sb.append(")");
}
if (userQuery.usernames != null && userQuery.usernames.length > 0) {
- sb.append(" AND u.username IN (?").append(parameters.size() + 1);
- parameters.add(userQuery.usernames[0]);
-
- for (int i = 1; i < userQuery.usernames.length; i++) {
- sb.append(",?").append(parameters.size() + 1);
- parameters.add(userQuery.usernames[i]);
+ sb.append(" and (");
+ boolean isFirst = true;
+
+ for (StringPredicate pred : userQuery.usernames) {
+ if (!isFirst) {
+ sb.append(" or ");
+ }
+ isFirst = false;
+ final int pos = parameters.size() + 1;
+ sb.append(pred.caseSensitive ? "u.username " : "upper(u.username)");
+ sb.append(buildMatchFilter(pred, pos));
+ parameters.add(pred.prepareValue());
}
sb.append(")");
}
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 564f993eb..eb57ba4e9 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -38,13 +38,16 @@ import org.openremote.model.Constants;
import org.openremote.model.Container;
import org.openremote.model.auth.OAuthGrant;
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 javax.ws.rs.BadRequestException;
import javax.ws.rs.NotAllowedException;
+import javax.ws.rs.NotFoundException;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriBuilder;
@@ -117,6 +120,30 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
return getUsers(new UserQuery().tenant(new TenantPredicate(realm)));
}
+ @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 -> {
+ // Need to load secrets from client resource
+ return Arrays.stream(users).filter(user -> {
+ user.setServiceAccount(true);
+ ClientsResource clientsResource = realmsResource.realm(realm).clients();
+ List<ClientRepresentation> clients = clientsResource.findByClientId(user.getUsername());
+
+ if (clients != null && !clients.isEmpty()) {
+ ClientRepresentation client = clients.get(0);
+ CredentialRepresentation credentialRepresentation = realmsResource.realm(realm).clients()
+ .get(client.getId()).getSecret();
+ if (credentialRepresentation != null) {
+ user.setSecret(credentialRepresentation.getValue());
+ return true;
+ }
+ }
+ return false;
+ }).toArray(User[]::new);
+ });
+ }
+
@Override
public User[] getUsers(List<String> userIds) {
return getUsers(new UserQuery().ids(userIds.toArray(new String[0])));
@@ -124,6 +151,14 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
@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));
+ } else {
+ userQuery.usernames = Arrays.copyOf(userQuery.usernames, userQuery.usernames.length+1);
+ userQuery.usernames[userQuery.usernames.length-1] = new StringPredicate(AssetQuery.Match.BEGIN, User.SERVICE_ACCOUNT_PREFIX).negate(true);
+ }
+
return ManagerIdentityProvider.getUsersFromDb(persistenceService, userQuery);
}
@@ -147,8 +182,8 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
boolean isUpdate = false;
User existingUser = user.getId() != null ? getUser(realm, user.getId()) : getUserByUsername(realm, user.getUsername());
- ClientRepresentation clientRepresentation = null;
- UserRepresentation userRepresentation = null;
+ ClientRepresentation clientRepresentation;
+ UserRepresentation userRepresentation;
if (existingUser == null && user.isServiceAccount()) {
// Could be a service user
@@ -158,7 +193,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
userRepresentation = clientRepresentation != null ? realmsResource.realm(realm)
.clients()
- .get(user.getUsername()).getServiceAccountUser() : null;
+ .get(clientRepresentation.getId()).getServiceAccountUser() : null;
if (userRepresentation != null) {
existingUser = convert(userRepresentation, User.class);
@@ -195,41 +230,15 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
// For service users we don't actually create the user - keycloak does that when the client is created
if (isUpdate) {
- if (user.isServiceAccount()) {
-
- if (passwordSecret != null) {
- if (clientRepresentation == null) {
- clientRepresentation = realmsResource.realm(realm)
- .clients()
- .get(user.getUsername()).toRepresentation();
- }
+ // User only has a subset of user representation so overlay on actual user representation
+ UserResource userResource = realmsResource.realm(realm).users().get(existingUser.getId());
+ userRepresentation = userResource.toRepresentation();
+ userRepresentation.setFirstName(user.getFirstName());
+ userRepresentation.setLastName(user.getLastName());
+ userRepresentation.setEmail(user.getEmail());
+ userRepresentation.setEnabled(user.getEnabled());
+ userResource.update(userRepresentation);
- if (clientRepresentation == null) {
- String msg = "Attempt to update service user secret failed to find client: User=" + user;
- LOG.info(msg);
- throw new BadRequestException(msg);
- }
- clientRepresentation.setSecret(passwordSecret);
- createUpdateClient(realm, clientRepresentation);
- } else {
- String msg = "Attempt to update service user but only secret can be udpated and no new value provided: User=" + user;
- LOG.info(msg);
- throw new BadRequestException(msg);
- }
-
- } else {
-
- // User only has a subset of user representation so overlay on actual user representation
- UserResource userResource = realmsResource.realm(realm).users().get(user.getId());
- userRepresentation = userResource.toRepresentation();
- userRepresentation.setUsername(user.getUsername());
- userRepresentation.setFirstName(user.getFirstName());
- userRepresentation.setLastName(user.getLastName());
- userRepresentation.setEmail(user.getEmail());
- userRepresentation.setEnabled(user.getEnabled());
- userResource.update(userRepresentation);
-
- }
} else {
if (user.isServiceAccount()) {
@@ -260,15 +269,15 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
String[] locationArr = location.split("/");
String userId = locationArr.length > 0 ? locationArr[locationArr.length-1] : null;
userRepresentation = realmResource.users().get(userId).toRepresentation();
+ }
+ }
- if (passwordSecret != null) {
- CredentialRepresentation credentials = new CredentialRepresentation();
- credentials.setType("password");
- credentials.setValue(passwordSecret);
- credentials.setTemporary(false);
- realmResource.users().get(userRepresentation.getId()).resetPassword(credentials);
- }
-
+ if (passwordSecret != null) {
+ if (user.isServiceAccount()) {
+ resetSecret(realm, userRepresentation.getId());
+ } else {
+ Credential credential = new Credential(passwordSecret, false);
+ resetPassword(realm, userRepresentation.getId(), credential);
}
}
@@ -283,11 +292,24 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
@Override
public void deleteUser(String realm, String userId) {
+
+ User user = getUser(realm, userId);
+
+ if (user == null) {
+ return;
+ }
+
getRealms(realmsResource -> {
- Response response = realmsResource.realm(realm).users().delete(userId);
- response.close();
- if (!response.getStatusInfo().equals(Response.Status.NO_CONTENT)) {
- throw new IllegalStateException("Failed to delete user: " + userId);
+
+ if (user.isServiceAccount()) {
+ // Delete the client
+ deleteClient(realm, user.getUsername());
+ } else {
+ Response response = realmsResource.realm(realm).users().delete(userId);
+ response.close();
+ if (!response.getStatusInfo().equals(Response.Status.NO_CONTENT)) {
+ throw new IllegalStateException("Failed to delete user: " + userId);
+ }
}
return null;
});
@@ -303,6 +325,33 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
});
}
+ @Override
+ public String resetSecret(String realm, String userId) {
+ return getRealms(realmsResource -> {
+ UserRepresentation userRepresentation = realmsResource.realm(realm).users().get(userId).toRepresentation();
+ if (userRepresentation == null) {
+ return null;
+ }
+
+ ClientsResource clientsResource = realmsResource.realm(realm).clients();
+ List<ClientRepresentation> clients = clientsResource.findByClientId(userRepresentation.getUsername().substring(User.SERVICE_ACCOUNT_PREFIX.length()));
+
+ if (!clients.isEmpty()) {
+ ClientRepresentation client = clients.get(0);
+
+ CredentialRepresentation credentialRepresentation = realmsResource.realm(realm).clients()
+ .get(client.getId())
+ .generateNewSecret();
+
+ if (credentialRepresentation != null) {
+ return credentialRepresentation.getValue();
+ }
+ }
+
+ return null;
+ });
+ }
+
@Override
public Role[] getRoles(String realm, String client) {
return getRealms(realmsResource -> {
@@ -430,9 +479,14 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
RealmResource realmResource = realmsResource.realm(realm);
RoleMappingResource roleMappingResource = realmResource.users().get(userId).roles();
ClientsResource clientsResource = realmResource.clients();
- String clientId = clientsResource.findByClientId(client).get(0).getId();
- RolesResource rolesResource = clientsResource.get(clientId).roles();
+ List<ClientRepresentation> clientRepresentations = clientsResource.findByClientId(client);
+
+ if (clientRepresentations == null || clientRepresentations.isEmpty()) {
+ return null;
+ }
+ String clientId = clientRepresentations.get(0).getId();
+ RolesResource rolesResource = clientsResource.get(clientId).roles();
List<RoleRepresentation> allRoles = rolesResource.list();
List<RoleRepresentation> effectiveRoles = roleMappingResource.clientLevel(clientId).listEffective();
@@ -471,6 +525,10 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
RoleMappingResource roleMappingResource = realmResource.users().get(user.getId()).roles();
ClientRepresentation clientRepresentation = getClient(realm, client);
+ if (clientRepresentation == null) {
+ throw new IllegalStateException("Invalid client: " + client);
+ }
+
// Get all role mappings for user on this client and remove any no longer in the roles
List<RoleRepresentation> clientMappedRoles = roleMappingResource.clientLevel(clientRepresentation.getId()).listAll();
List<RoleRepresentation> availableRoles = roleMappingResource.clientLevel(clientRepresentation.getId()).listAvailable();
@@ -642,15 +700,7 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
return null;
}
- ClientRepresentation client = clients.get(0);
- if ("client-secret".equals(client.getClientAuthenticatorType())) {
- // Need to get secret separately for some reason
- CredentialRepresentation credentialRepresentation = clientsResource.get(client.getId()).getSecret();
- if (credentialRepresentation != null) {
- client.setSecret(credentialRepresentation.getValue());
- }
- }
- return client;
+ return clients.get(0);
});
}
@@ -715,8 +765,17 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
}
LOG.info("Deleting client: realm=" + realm + ", client ID=" + clientId);
- ClientsResource clients = realmResource.clients();
- clients.findByClientId(clientId).forEach(client -> clients.get(client.getId()).remove());
+ ClientsResource clientsResource = realmResource.clients();
+ List<ClientRepresentation> clientRepresentations = clientsResource.findByClientId(clientId);
+
+ if (clientRepresentations.isEmpty()) {
+ throw new NotFoundException("Delete client failed as client not found: " + clientId);
+ }
+ if (clientRepresentations.size() > 1) {
+ throw new BadRequestException("Delete client failed as more than one client found matching the specified client ID: " + clientId);
+ }
+
+ clientsResource.get(clientRepresentations.get(0).getId()).remove();
return null;
});
}
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 8c6be92da..11f28628f 100644
--- a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
@@ -72,6 +72,11 @@ 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)) {
@@ -98,25 +103,27 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
}
@Override
- public void update(RequestParams requestParams, String realm, String userId, User user) {
+ public User createUpdate(RequestParams requestParams, String realm, User user) {
throwIfIllegalMasterAdminUserMutation(requestParams, realm, user);
try {
- identityService.getIdentityProvider().createUpdateUser(realm, user, null);
+ return identityService.getIdentityProvider().createUpdateUser(realm, user, null);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
+ } catch (WebApplicationException ex) {
+ throw ex;
} catch (Exception ex) {
throw new WebApplicationException(ex);
}
}
@Override
- public User create(RequestParams requestParams, String realm, User user) {
+ public void delete(RequestParams requestParams, String realm, String userId) {
+ throwIfIllegalMasterAdminUserDeletion(requestParams, realm, userId);
+
try {
- return identityService.getIdentityProvider().createUpdateUser(
- realm, user,
- null);
+ identityService.getIdentityProvider().deleteUser(realm, userId);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
} catch (WebApplicationException ex) {
@@ -127,28 +134,20 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
}
@Override
- public void delete(RequestParams requestParams, String realm, String userId) {
- throwIfIllegalMasterAdminUserDeletion(requestParams, realm, userId);
-
+ public void resetPassword(@BeanParam RequestParams requestParams, String realm, String userId, Credential credential) {
try {
- identityService.getIdentityProvider().deleteUser(
- realm, userId
- );
+ identityService.getIdentityProvider().resetPassword(realm, userId, credential);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
- } catch (WebApplicationException ex) {
- throw ex;
} catch (Exception ex) {
throw new WebApplicationException(ex);
}
}
@Override
- public void resetPassword(@BeanParam RequestParams requestParams, String realm, String userId, Credential credential) {
+ public String resetSecret(RequestParams requestParams, String realm, String userId) {
try {
- identityService.getIdentityProvider().resetPassword(
- realm, userId, credential
- );
+ return identityService.getIdentityProvider().resetSecret(realm, userId);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
} catch (Exception ex) {
@@ -158,21 +157,32 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
@Override
public Role[] getCurrentUserRoles(RequestParams requestParams) {
+ return getCurrentUserClientRoles(requestParams, KEYCLOAK_CLIENT_ID);
+ }
+
+ @Override
+ public Role[] getCurrentUserClientRoles(RequestParams requestParams, String clientId) {
if (!isAuthenticated()) {
throw new ForbiddenException("Must be authenticated");
}
- return getUserRoles(requestParams, getRequestRealm(), getUserId());
+
+ return getUserClientRoles(requestParams, getRequestRealm(), getUserId(), clientId);
+ }
+
+ @Override
+ public Role[] getUserRoles(RequestParams requestParams, String realm, String userId) {
+ return getUserClientRoles(requestParams, realm, userId, KEYCLOAK_CLIENT_ID);
}
@Override
- public Role[] getUserRoles(@BeanParam RequestParams requestParams, String realm, String userId) {
+ public Role[] getUserClientRoles(@BeanParam RequestParams requestParams, String realm, String userId, String clientId) {
if (!isSuperUser() && !Objects.equals(getUserId(), userId)) {
throw new ForbiddenException("Regular users can only retrieve their own roles");
}
try {
return identityService.getIdentityProvider().getUserRoles(
- realm, userId, KEYCLOAK_CLIENT_ID
+ realm, userId, clientId
);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
@@ -182,12 +192,17 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
}
@Override
- public void updateUserRoles(@BeanParam RequestParams requestParams, String realm, String userId, Role[] roles) {
+ public void updateUserRoles(RequestParams requestParams, String realm, String userId, Role[] roles) {
+ updateUserClientRoles(requestParams, realm, userId, roles, KEYCLOAK_CLIENT_ID);
+ }
+
+ @Override
+ public void updateUserClientRoles(@BeanParam RequestParams requestParams, String realm, String userId, Role[] roles, String clientId) {
try {
identityService.getIdentityProvider().updateUserRoles(
realm,
userId,
- KEYCLOAK_CLIENT_ID,
+ clientId,
Arrays.stream(roles)
.filter(Role::isAssigned)
.map(Role::getName)
@@ -202,10 +217,15 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
@Override
public Role[] getRoles(RequestParams requestParams, String realm) {
+ return getClientRoles(requestParams, realm, KEYCLOAK_CLIENT_ID);
+ }
+
+ @Override
+ public Role[] getClientRoles(RequestParams requestParams, String realm, String clientId) {
try {
return identityService.getIdentityProvider().getRoles(
realm,
- KEYCLOAK_CLIENT_ID);
+ clientId);
} catch (ClientErrorException ex) {
throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
} catch (Exception ex) {
@@ -215,10 +235,15 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
@Override
public void updateRoles(RequestParams requestParams, String realm, Role[] roles) {
+ updateClientRoles(requestParams, realm, roles, KEYCLOAK_CLIENT_ID);
+ }
+
+ @Override
+ public void updateClientRoles(RequestParams requestParams, String realm, Role[] roles, String clientId) {
try {
identityService.getIdentityProvider().updateClientRoles(
realm,
- KEYCLOAK_CLIENT_ID,
+ clientId,
roles);
} catch (ClientErrorException ex) {
ex.printStackTrace(System.out);
@@ -229,23 +254,25 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
}
protected void throwIfIllegalMasterAdminUserDeletion(RequestParams requestParams, String realm, String userId) throws WebApplicationException {
- if (!realm.equals(MASTER_REALM))
+ if (!realm.equals(MASTER_REALM)) {
return;
+ }
- if (!identityService.getIdentityProvider().isMasterRealmAdmin(
- userId
- )) return;
+ if (!identityService.getIdentityProvider().isMasterRealmAdmin(userId)) {
+ return;
+ }
throw new NotAllowedException("The master realm admin user cannot be deleted");
}
protected void throwIfIllegalMasterAdminUserMutation(RequestParams requestParams, String realm, User user) throws WebApplicationException {
- if (!realm.equals(MASTER_REALM))
+ if (!realm.equals(MASTER_REALM)) {
return;
+ }
- if (!identityService.getIdentityProvider().isMasterRealmAdmin(
- user.getId()
- )) return;
+ if (!identityService.getIdentityProvider().isMasterRealmAdmin(user.getId())) {
+ return;
+ }
if (user.getEnabled() == null || !user.getEnabled()) {
throw new NotAllowedException("The master realm admin user cannot be disabled");
diff --git a/manager/src/web/shared/locales/en/or.json b/manager/src/web/shared/locales/en/or.json
index 310c34d1b..4321ad489 100644
--- a/manager/src/web/shared/locales/en/or.json
+++ b/manager/src/web/shared/locales/en/or.json
@@ -198,10 +198,12 @@
"tenant": "Tenant",
"tenant_plural": "Tenants",
"displayName":"Friendly name",
- "realm management":"Realm management",
"deleteTenantConfirm":"Are you sure you want to delete this Realm?",
"user_plural": "Users",
- "user_role": "Role",
+ "regularUser_plural": "Regular users",
+ "serviceUser_plural": "Service users",
+ "regenerateSecret": "Regenerate secret",
+ "role": "Role",
"role_plural": "Roles",
"description": "Description",
"passwordMismatch":"Passwords do not match",
diff --git a/manager/src/web/shared/locales/nl/or.json b/manager/src/web/shared/locales/nl/or.json
index 9877625bc..4d81c70fc 100644
--- a/manager/src/web/shared/locales/nl/or.json
+++ b/manager/src/web/shared/locales/nl/or.json
@@ -199,10 +199,9 @@
"tenant": "Tenant",
"tenant_plural": "Tenants",
"displayName":"Friendly name",
- "realm management":"Realm management",
"deleteTenantConfirm":"Are you sure you want to delete this Realm?",
"user_plural": "Gebruikers",
- "user_role": "Rol",
+ "role": "Rol",
"role_plural": "Rollen",
"description": "Omschrijving",
"username":"Gebruikersnaam",
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 2b8e00ee7..576057d03 100644
--- a/model/src/main/java/org/openremote/model/query/UserQuery.java
+++ b/model/src/main/java/org/openremote/model/query/UserQuery.java
@@ -2,6 +2,7 @@ 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;
import org.openremote.model.query.filter.UserAssetPredicate;
@@ -14,7 +15,7 @@ public class UserQuery {
public UserAssetPredicate assetPredicate;
public PathPredicate pathPredicate;
public String[] ids;
- public String[] usernames;
+ public StringPredicate[] usernames;
public int limit;
public UserQuery() {
@@ -40,7 +41,7 @@ public class UserQuery {
return this;
}
- public UserQuery usernames(String...usernames) {
+ public UserQuery usernames(StringPredicate...usernames) {
this.usernames = usernames;
return this;
}
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 c89bb4e74..9795bea56 100644
--- a/model/src/main/java/org/openremote/model/security/User.java
+++ b/model/src/main/java/org/openremote/model/security/User.java
@@ -68,7 +68,7 @@ public class User {
protected Boolean enabled;
@Transient
- protected boolean serviceAccount;
+ protected String secret; // For service users
public User() {
}
@@ -105,31 +105,35 @@ public class User {
@Pattern(regexp = "[a-zA-Z0-9-_]+", message = "{User.username.Pattern}")
@JsonProperty
public String getUsername() {
- return serviceAccount ? username.replace(SERVICE_ACCOUNT_PREFIX, "") : username;
+ return username.replace(SERVICE_ACCOUNT_PREFIX, "");
}
@JsonSetter("username")
public User setUsername(String username) {
- if (this.serviceAccount && !username.startsWith(SERVICE_ACCOUNT_PREFIX)) {
+
+ boolean isService = isServiceAccount() || username.startsWith(SERVICE_ACCOUNT_PREFIX);
+
+ username = username.replace(SERVICE_ACCOUNT_PREFIX, "");
+
+ if (isService) {
username = SERVICE_ACCOUNT_PREFIX + username;
}
+
this.username = username;
return this;
}
+ @JsonProperty
public boolean isServiceAccount() {
- return serviceAccount;
+ return username != null && username.startsWith(SERVICE_ACCOUNT_PREFIX);
}
public User setServiceAccount(boolean serviceAccount) {
- if (serviceAccount == this.serviceAccount) {
- return this;
- }
-
- this.serviceAccount = serviceAccount;
if (username != null) {
username = serviceAccount ? SERVICE_ACCOUNT_PREFIX + username.replace(SERVICE_ACCOUNT_PREFIX, "") : username.replace(SERVICE_ACCOUNT_PREFIX, "");
+ } else {
+ username = serviceAccount ? SERVICE_ACCOUNT_PREFIX : null;
}
return this;
}
@@ -177,6 +181,15 @@ public class User {
return getUsername() + " (" + getFirstName() + " " + getLastName() + ")";
}
+ public User setSecret(String secret) {
+ this.secret = secret;
+ return this;
+ }
+
+ public String getSecret() {
+ return secret;
+ }
+
@Override
public String toString() {
return getClass().getName() + "{" +
@@ -186,6 +199,7 @@ public class User {
", firstName='" + firstName + '\'' +
", lastName='" + lastName + '\'' +
", email='" + email + '\'' +
+ ", secret='" + secret + '\'' +
", enabled=" + enabled +
'}';
}
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 6013f4adf..2322f4062 100644
--- a/model/src/main/java/org/openremote/model/security/UserResource.java
+++ b/model/src/main/java/org/openremote/model/security/UserResource.java
@@ -27,6 +27,8 @@ import javax.validation.Valid;
import javax.ws.rs.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static org.openremote.model.Constants.READ_ADMIN_ROLE;
+import static org.openremote.model.Constants.READ_USERS_ROLE;
/**
* Manage users in realms and get info of current user.
@@ -43,17 +45,36 @@ public interface UserResource {
@RolesAllowed(Constants.WRITE_ADMIN_ROLE)
Role[] getRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);
+ @GET
+ @Path("{realm}/{clientId}/roles")
+ @Produces(APPLICATION_JSON)
+ @SuppressWarnings("unusable-by-js")
+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)
+ Role[] getClientRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("clientId") String clientId);
+
@PUT
@Path("{realm}/roles")
@Consumes(APPLICATION_JSON)
@RolesAllowed(Constants.WRITE_ADMIN_ROLE)
void updateRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, Role[] roles);
+ @PUT
+ @Path("{realm}/{clientId}/roles")
+ @Consumes(APPLICATION_JSON)
+ @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
+ @Produces(APPLICATION_JSON)
+ @Path("{realm}/service-users")
+ @RolesAllowed({READ_USERS_ROLE, READ_ADMIN_ROLE})
+ User[] getAllService(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);
+
@GET
@Path("{realm}/{userId}")
@Produces(APPLICATION_JSON)
@@ -64,19 +85,12 @@ public interface UserResource {
@Produces(APPLICATION_JSON)
User getCurrent(@BeanParam RequestParams requestParams);
- @PUT
- @Path("{realm}/users/{userId}")
- @Consumes(APPLICATION_JSON)
- @Produces(APPLICATION_JSON)
- @RolesAllowed(Constants.WRITE_ADMIN_ROLE)
- void update(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId, @Valid User user);
-
@POST
@Path("{realm}/users")
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
@RolesAllowed(Constants.WRITE_ADMIN_ROLE)
- User create(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @Valid User user);
+ User createUpdate(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @Valid User user);
@DELETE
@Path("{realm}/users/{userId}")
@@ -91,19 +105,42 @@ public interface UserResource {
@RolesAllowed(Constants.WRITE_ADMIN_ROLE)
void resetPassword(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId, Credential credential);
+ @GET
+ @Path("{realm}/reset-secret/{userId}")
+ @Consumes(APPLICATION_JSON)
+ @Produces(APPLICATION_JSON)
+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)
+ String resetSecret(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId);
+
@GET
@Path("{realm}/userRoles/{userId}")
@Produces(APPLICATION_JSON)
Role[] getUserRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId);
+ @GET
+ @Path("{realm}/userRoles/{userId}/{clientId}")
+ @Produces(APPLICATION_JSON)
+ Role[] getUserClientRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId, @PathParam("clientId") String clientId);
+
@GET
@Path("userRoles")
@Produces(APPLICATION_JSON)
Role[] getCurrentUserRoles(@BeanParam RequestParams requestParams);
+ @GET
+ @Path("userRoles/{clientId}")
+ @Produces(APPLICATION_JSON)
+ Role[] getCurrentUserClientRoles(@BeanParam RequestParams requestParams, @PathParam("clientId") String clientId);
+
@PUT
@Path("{realm}/userRoles/{userId}")
@Consumes(APPLICATION_JSON)
@RolesAllowed(Constants.WRITE_ADMIN_ROLE)
void updateUserRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId, Role[] roles);
+
+ @PUT
+ @Path("{realm}/userRoles/{userId}//{clientId}")
+ @Consumes(APPLICATION_JSON)
+ @RolesAllowed(Constants.WRITE_ADMIN_ROLE)
+ void updateUserClientRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @PathParam("userId") String userId, Role[] roles, @PathParam("clientId") String clientId);
}
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 eb38caa4b..b42dd9696 100644
--- a/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java
+++ b/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java
@@ -104,7 +104,7 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {
keycloakProvider.updateUserRoles(tenantCity.getRealm(), smartCityUserId, "account"); // Remove all roles for account client
/*
- * Client event keycloak client
+ * Service user client
*/
serviceUser = new User()
.setServiceAccount(true)
diff --git a/ui/app/manager/src/pages/page-roles.ts b/ui/app/manager/src/pages/page-roles.ts
index c741c7ee5..482055217 100644
--- a/ui/app/manager/src/pages/page-roles.ts
+++ b/ui/app/manager/src/pages/page-roles.ts
@@ -297,7 +297,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {
}
private doDelete(role) {
- this._compositeRoles = [...this._compositeRoles.filter(u => u.id != role.id)]
+ this._compositeRoles = [...this._compositeRoles.filter(u => u.id !== role.id)]
this._updateRoles()
}
@@ -382,7 +382,7 @@ class PageRoles<S extends AppStateKeyed> extends Page<S> {
<div class="row">
<div class="column">
- <or-mwc-input .label="${i18next.t("user_role")}" .type="${InputType.TEXT}" min="1" required .value="${role.name}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => role.name = e.detail.value}"></or-mwc-input>
+ <or-mwc-input .label="${i18next.t("role")}" .type="${InputType.TEXT}" min="1" required .value="${role.name}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => role.name = e.detail.value}"></or-mwc-input>
</div>
<div class="column">
<or-mwc-input .label="${i18next.t("description")}" .type="${InputType.TEXT}" min="1" required .value="${role.description}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => role.description = e.detail.value}"></or-mwc-input>
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index 0bf596ec1..714d61238 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -1,23 +1,13 @@
-import {
- css,
- customElement,
- html,
- property,
- PropertyValues,
- TemplateResult,
- unsafeCSS,
-} from "lit-element";
-import manager, { OREvent, DefaultColor3 } from "@openremote/core";
+import {css, customElement, html, property, PropertyValues, TemplateResult, unsafeCSS} from "lit-element";
+import manager, {DefaultColor3, OREvent, Util} from "@openremote/core";
import "@openremote/or-panel";
import "@openremote/or-translate";
-import { ifDefined } from "lit-html/directives/if-defined";
-import { EnhancedStore } from "@reduxjs/toolkit";
-import {Page, PageProvider} from "@openremote/or-app";
-import {AppStateKeyed} from "@openremote/or-app";
-import { ClientRole, Role, User } from "@openremote/model";
-import { i18next } from "@openremote/or-translate";
-import { OrIcon } from "@openremote/or-icon";
-import { InputType, OrMwcInput, OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";
+import {EnhancedStore} from "@reduxjs/toolkit";
+import {AppStateKeyed, Page, PageProvider} from "@openremote/or-app";
+import {ClientRole, Role, User} 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 {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
const tableStyle = require("@material/data-table/dist/mdc.data-table.css");
@@ -32,444 +22,599 @@ export function pageUsersProvider<S extends AppStateKeyed>(store: EnhancedStore<
};
}
+interface UserModel extends User {
+ password?: string;
+ roles?: Role[];
+}
+
@customElement("page-users")
class PageUsers<S extends AppStateKeyed> extends Page<S> {
- static get styles() {
- // language=CSS
- return [
- unsafeCSS(tableStyle),
- css`
- #wrapper {
- height: 100%;
- width: 100%;
- display: flex;
- flex-direction: column;
- overflow: auto;
- }
+ static get styles() {
+ // language=CSS
+ return [
+ unsafeCSS(tableStyle),
+ css`
+ #wrapper {
+ height: 100%;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: auto;
+ }
+
+ #title {
+ padding: 0 20px;
+ font-size: 18px;
+ font-weight: bold;
+ width: calc(100% - 40px);
+ max-width: 1360px;
+ margin: 20px auto;
+ align-items: center;
+ display: flex;
+ }
+
+ #title or-icon {
+ margin-right: 10px;
+ margin-left: 14px;
+ }
+
+ .panel {
+ width: calc(100% - 90px);
+ max-width: 1310px;
+ background-color: white;
+ border: 1px solid #e5e5e5;
+ border-radius: 5px;
+ position: relative;
+ margin: 20px auto;
+ padding: 24px;
+ }
+
+ .panel-title {
+ text-transform: uppercase;
+ font-weight: bolder;
+ line-height: 1em;
+ color: var(--internal-or-asset-viewer-title-text-color);
+ flex: 0 0 auto;
+ letter-spacing: 0.025em;
+ }
+
+ #table-users,
+ #table-users table {
+ width: 100%;
+ white-space: nowrap;
+ }
+
+ .mdc-data-table__row {
+ cursor: pointer;
+ border-top-color: #D3D3D3;
+ }
+
+ td, th {
+ width: 25%
+ }
+
+ .meta-item-container {
+ flex-direction: row;
+ overflow: hidden;
+ max-height: 0;
+ transition: max-height 0.25s ease-out;
+ padding-left: 16px;
+ }
+
+ or-mwc-input {
+ margin-bottom: 20px;
+ margin-right: 16px;
+ }
+
+ or-icon {
+ vertical-align: middle;
+ --or-icon-width: 20px;
+ --or-icon-height: 20px;
+ margin-right: 2px;
+ margin-left: -5px;
+ }
+
+ .row {
+ display: flex;
+ flex-direction: row;
+ margin: 10px 0;
+ flex: 1 1 0;
+ }
+
+ .column {
+ display: flex;
+ flex-direction: column;
+ margin: 0px;
+ flex: 1 1 0;
+
+ }
+
+ .mdc-data-table__header-cell {
+ font-weight: bold;
+ color: ${unsafeCSS(DefaultColor3)};
+ }
+
+ .mdc-data-table__header-cell:first-child {
+ padding-left: 36px;
+ }
+
+ .attribute-meta-row td {
+ padding: 0;
+ }
+
+ .attribute-meta-row.expanded .meta-item-container {
+ max-height: 1000px;
+ transition: max-height 1s ease-in;
+ }
+
+ .button {
+ cursor: pointer;
+ align-content: center;
+ align-items: center;
+ margin: 0;
+ }
+
+ @media screen and (max-width: 768px) {
+ #title {
+ padding: 0;
+ width: 100%;
+ }
+
+ .hide-mobile {
+ display: none;
+ }
+
+ .row {
+ display: block;
+ flex-direction: column;
+ }
+
+ .panel {
+ border-radius: 0;
+ border-left: 0px;
+ border-right: 0px;
+ width: calc(100% - 48px);
+ }
+
+ td, th {
+ width: 50%
+ }
+ }
+ `,
+ ];
+ }
- #title {
- padding: 0 20px;
- font-size: 18px;
- font-weight: bold;
- width: calc(100% - 40px);
- max-width: 1360px;
- margin: 20px auto;
- align-items: center;
- display: flex;
- }
+ @property()
+ protected _users: UserModel[] = [];
- #title or-icon {
- margin-right: 10px;
- margin-left: 14px;
- }
+ @property()
+ protected _serviceUsers: UserModel[] = [];
- .panel {
- width: calc(100% - 90px);
- max-width: 1310px;
- background-color: white;
- border: 1px solid #e5e5e5;
- border-radius: 5px;
- position: relative;
- margin: 0 auto;
- padding: 24px;
- }
+ @property()
+ protected _compositeRoles: Role[] = [];
- .panel-title {
- text-transform: uppercase;
- font-weight: bolder;
- line-height: 1em;
- color: var(--internal-or-asset-viewer-title-text-color);
- margin-bottom: 20px;
- margin-top: 0;
- flex: 0 0 auto;
- letter-spacing: 0.025em;
- }
+ @property()
+ public validPassword?: boolean = true;
- #table-users,
- #table-users table {
- width: 100%;
- white-space: nowrap;
- }
+ @property()
+ public realm?: string;
- .mdc-data-table__row {
- border-top-color: #D3D3D3;
- }
+ @property()
+ protected loading: boolean = true;
- td, th {
- width: 25%
- }
+ get name(): string {
+ return "user_plural";
+ }
- .meta-item-container {
- flex-direction: row;
- overflow: hidden;
- max-height: 0;
- transition: max-height 0.25s ease-out;
- padding-left: 16px;
- }
+ constructor(store: EnhancedStore<S>) {
+ super(store);
+ this.loadUsers();
+ }
- or-mwc-input {
- margin-bottom: 20px;
- margin-right: 16px;
+ protected _onManagerEvent = (event: OREvent) => {
+ switch (event) {
+ case OREvent.DISPLAY_REALM_CHANGED:
+ this.realm = manager.displayRealm;
+ break;
}
+ };
- or-icon {
- vertical-align: middle;
- --or-icon-width: 20px;
- --or-icon-height: 20px;
- margin-right: 2px;
- margin-left: -5px;
- }
+ public shouldUpdate(_changedProperties: PropertyValues): boolean {
- .row {
- display: flex;
- flex-direction: row;
- margin: 10px 0;
- flex: 1 1 0;
+ if (_changedProperties.has("realm")) {
+ this.loadUsers();
}
- .column {
- display: flex;
- flex-direction: column;
- margin: 0px;
- flex: 1 1 0;
-
- }
+ return super.shouldUpdate(_changedProperties);
+ }
- .mdc-data-table__header-cell {
- font-weight: bold;
- color: ${unsafeCSS(DefaultColor3)};
- }
+ public connectedCallback() {
+ super.connectedCallback();
+ manager.addListener(this._onManagerEvent);
+ }
- .mdc-data-table__header-cell:first-child {
- padding-left: 36px;
- }
-
- .attribute-meta-row td {
- padding: 0;
- }
+ public disconnectedCallback() {
+ super.disconnectedCallback();
+ manager.removeListener(this._onManagerEvent);
+ }
- .attribute-meta-row.expanded .meta-item-container {
- max-height: 1000px;
- transition: max-height 1s ease-in;
- }
-
- .button {
- cursor: pointer;
- display: flex;
- flex-direction: row;
- align-content: center;
- padding: 16px;
- align-items: center;
- font-size: 14px;
- text-transform: uppercase;
- color: var(--or-app-color4);
- }
+ private async loadUsers() {
- .button or-icon {
- --or-icon-fill: var(--or-app-color4);
- margin-right: 5px;
- }
-
- @media screen and (max-width: 768px){
- #title {
- padding: 0;
- width: 100%;
- }
- .hide-mobile {
- display: none;
- }
- .row {
- display: block;
- flex-direction: column;
- }
- .panel {
- border-radius: 0;
- border-left: 0px;
- border-right: 0px;
- width: calc(100% - 48px);
- }
-
- td, th {
- width: 50%
- }
+ this._users = [];
+ this._serviceUsers = [];
+ this._compositeRoles = [];
+ this.loading = true;
+ const ORClientRoleResponse = await manager.rest.api.UserResource.getRoles(manager.displayRealm);
+
+ if (!ORClientRoleResponse.data) {
+ this.loading = false;
+ return;
}
- `,
- ];
- }
- @property()
- protected _users: User[] = [];
+ const compositeRoles = ORClientRoleResponse.data.filter(role => role.composite);
+ const usersResponse = await manager.rest.api.UserResource.getAll(manager.displayRealm);
+ const serviceUsersResponse = await manager.rest.api.UserResource.getAllService(manager.displayRealm);
- @property()
- protected _compositeRoles: Role[] = [];
+ if (!usersResponse.data || !serviceUsersResponse.data) {
+ this.loading = false;
+ return;
+ }
- @property()
- protected _userRoleMapper = {};
-
- @property()
- public validPassword?: boolean = true;
+ const users: UserModel[] = usersResponse.data;
+ const serviceUsers: UserModel[] = serviceUsersResponse.data;
- @property()
- public realm?: string;
+ // 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.composite && r.assigned);
+ });
- get name(): string {
- return "user_plural";
- }
+ await Promise.all(roleLoaders);
+ this._users = users.sort(Util.sortByString(u => u.username));
+ this._serviceUsers = serviceUsers.sort(Util.sortByString(u => u.username));
+ this._compositeRoles = compositeRoles;
+ this.loading = false;
+ }
- constructor(store: EnhancedStore<S>) {
- super(store);
- this.getUsers();
- }
+ private async _createUpdateUser(user: UserModel) {
- protected _onManagerEvent = (event: OREvent) => {
- switch (event) {
- case OREvent.DISPLAY_REALM_CHANGED:
- this.realm = manager.displayRealm;
- break;
- }
- };
-
- public shouldUpdate(_changedProperties: PropertyValues): boolean {
-
- if (_changedProperties.has("realm")) {
- this.getUsers();
- }
-
- return super.shouldUpdate(_changedProperties);
- }
-
- public connectedCallback() {
- super.connectedCallback();
- manager.addListener(this._onManagerEvent);
- }
-
- public disconnectedCallback() {
- super.disconnectedCallback();
- manager.removeListener(this._onManagerEvent);
- }
-
-
- private getUsers() {
- manager.rest.api.UserResource.getRoles(manager.displayRealm).then(roleResponse => {
- this._compositeRoles = [...roleResponse.data.filter(role => role.composite)];
- })
- manager.rest.api.UserResource.getAll(manager.displayRealm).then(
- (usersResponse) => {
- this._users = [...usersResponse.data];
- this._users.map(user => {
- manager.rest.api.UserResource.getUserRoles(manager.displayRealm, user.id).then(userRoleResponse => {
- const role = userRoleResponse.data.find(r => r.composite && r.assigned);
- this._userRoleMapper[user.id] = role ? role : {};
- this.requestUpdate()
- })
- })
- }
- );
- }
-
- private checkPassword(index) {
- const repeatPasswordComponent = this.shadowRoot.getElementById("repeatPassword-"+index) as OrMwcInput;
- const passwordComponent = this.shadowRoot.getElementById("password-"+index) as OrMwcInput;
-
- if (repeatPasswordComponent.value !== passwordComponent.value) {
- const error = i18next.t("passwordMismatch");
- repeatPasswordComponent.validationMessage = error;
- repeatPasswordComponent.setCustomValidity(error);
- repeatPasswordComponent.helperText = error;
- return false;
- } else {
- if (repeatPasswordComponent) {
- repeatPasswordComponent.helperText = "";
- }
- return passwordComponent.value;
+ if (user.password === "") {
+ // Means a validation failure shouldn't get here
+ return;
+ }
+ this.loading = true;
+
+ try {
+ const response = await manager.rest.api.UserResource.createUpdate(manager.displayRealm, user);
+
+ if (user.password) {
+ const id = response.data.id;
+ const credentials = {value: user.password}
+ manager.rest.api.UserResource.resetPassword(manager.displayRealm, id, credentials);
+ }
+ (response.data as UserModel).roles = user.roles;
+ await this._updateRoles(response.data);
+ } finally {
+ this.loadUsers();
+ }
}
- }
-
- private _createUser(user, index) {
- const password = this.checkPassword(index)
- if(password === false) return
- manager.rest.api.UserResource.create(manager.displayRealm, user).then((response:any) => {
- if(password){
- const id = response.data.id;
- const credentials = {value: password}
- manager.rest.api.UserResource.resetPassword(manager.displayRealm, id, credentials);
+
+ /**
+ * 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 || user.roles.length === 0) {
+ return;
+ }
+
+ const compositeRoles = this._compositeRoles.filter(c => user.roles.some(r => r.name === c.name)).map(r => {
+ return {...r, assigned: true}
+ });
+
+ if (compositeRoles.length === 0) {
+ return;
}
- if(this._userRoleMapper["newUser"]) {
- this._updateRole(response.data, this._userRoleMapper["newUser"]);
+
+ if (!user.serviceAccount) {
+ await manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, compositeRoles);
} else {
- this.getUsers()
+ await manager.rest.api.UserResource.updateUserClientRoles(manager.displayRealm, user.id, user.username, compositeRoles);
}
- });
- }
-
- private _updateRole(user, value) {
- if(this._compositeRoles.length === 0) return
- const role = this._compositeRoles.find(c => c.id === value);
- if(role){
- role['assigned'] = true;
- delete this._userRoleMapper["newUser"];
- manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, [role]).then(response => {
- this.getUsers()
- })
- this._userRoleMapper[user.id] = role;
- }
- }
-
- private _updateUser(user, index) {
- const password = this.checkPassword(index)
- if(password){
- const credentials = {value: password}
- manager.rest.api.UserResource.resetPassword(manager.displayRealm, user.id, credentials);
- }
- if(this._userRoleMapper[user.id]) {
- this._updateRole(user, this._userRoleMapper[user.id])
}
-
- manager.rest.api.UserResource.update(manager.displayRealm, user.id, user).then(respoonse => {
- this.getUsers();
-
- });
- }
-
- private _deleteUser(user) {
- showOkCancelDialog(i18next.t("delete"), i18next.t("deleteUserConfirm"))
- .then((ok) => {
- if (ok) {
- this.doDelete(user);
- }
- });
- }
-
- private doDelete(user) {
- manager.rest.api.UserResource.delete(manager.displayRealm, user.id).then(response => {
- this._users = [...this._users.filter(u => u.id != user.id)]
- })
- }
-
- protected render(): TemplateResult | void {
- if (!manager.authenticated) {
- return html`
- <or-translate value="notAuthenticated"></or-translate>
- `;
+
+
+ private _deleteUser(user) {
+ showOkCancelDialog(i18next.t("delete"), i18next.t("deleteUserConfirm"))
+ .then((ok) => {
+ if (ok) {
+ this.doDelete(user);
+ }
+ });
}
- if (!manager.isKeycloak()) {
- return html`
- <or-translate value="notSupported"></or-translate>
- `;
+ private doDelete(user) {
+ manager.rest.api.UserResource.delete(manager.displayRealm, user.id).then(response => {
+ if (user.serviceAccount) {
+ this._serviceUsers = [...this._serviceUsers.filter(u => u.id !== user.id)];
+ } else {
+ this._users = [...this._users.filter(u => u.id !== user.id)];
+ }
+ })
}
- const expanderToggle = (ev: MouseEvent, index:number) => {
- const metaRow = this.shadowRoot.getElementById('attribute-meta-row-'+index)
- const expanderIcon = this.shadowRoot.getElementById('mdc-data-table-icon-'+index) as OrIcon
- if(metaRow.classList.contains('expanded')){
- metaRow.classList.remove("expanded");
- expanderIcon.icon = "chevron-right";
- } else {
- metaRow.classList.add("expanded");
- expanderIcon.icon = "chevron-down";
- }
- };
- const selectOptions = this._compositeRoles.map(role => {
- return [role.id, role.name]
- })
- const readonly = !manager.hasRole(ClientRole.WRITE_USER);
- return html`
- <div id="wrapper">
+
+ protected render(): TemplateResult | void {
+ if (!manager.authenticated) {
+ return html`
+ <or-translate value="notAuthenticated"></or-translate>
+ `;
+ }
+
+ if (this.loading) {
+ return html``;
+ }
+
+ const roleOptions: string[] = this._compositeRoles.map(cr => cr.name);
+ const readonly = !manager.hasRole(ClientRole.WRITE_USER);
+
+ return html`
+ <div id="wrapper">
<div id="title">
- <or-icon icon="account-group"></or-icon>${i18next.t(
- "user_plural"
- )}
+ <or-icon icon="account-group"></or-icon>
+ ${i18next.t(
+ "user_plural"
+ )}
</div>
+
<div class="panel">
- <p class="panel-title">${i18next.t("user_plural")}</p>
- <div id="table-users" class="mdc-data-table">
- <table class="mdc-data-table__table" aria-label="attribute list" >
- <thead>
- <tr class="mdc-data-table__header-row">
- <th class="mdc-data-table__header-cell" role="columnheader" scope="col"><or-translate value="username"></or-translate></th>
- <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col"><or-translate value="email"></or-translate></th>
- <th class="mdc-data-table__header-cell" role="columnheader" scope="col"><or-translate value="user_role"></or-translate></th>
- <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col"><or-translate value="status"></or-translate></th>
- </tr>
- </thead>
- <tbody class="mdc-data-table__content">
- ${this._users.length > 0 ? this._users.map(
- (user, index) => {
- const isSameUser = user.username === manager.username;
- const userRole = this._userRoleMapper[user.id];
- return html`
- <tr id="mdc-data-table-row-${index}" class="mdc-data-table__row" @click="${(ev) => expanderToggle(ev, index)}">
- <td class="padded-cell mdc-data-table__cell">
- <or-icon id="mdc-data-table-icon-${index}" icon="chevron-right"></or-icon>
- <span>${user.username}</span>
- </td>
- <td class="padded-cell mdc-data-table__cell hide-mobile">
- ${user.email}
- </td>
- <td class="padded-cell mdc-data-table__cell">
- ${userRole ? userRole.name : null}
- </td>
- <td class="padded-cell mdc-data-table__cell hide-mobile">
- ${user.enabled ? "Active" : "Inactive"}
- </td>
- </tr>
- <tr id="attribute-meta-row-${index}" class="attribute-meta-row${!user.id ? " expanded" : ""}">
- <td colspan="100%">
- <div class="meta-item-container">
- <div class="row">
- <div class="column">
- <or-mwc-input ?readonly="${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}" .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}" .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}" .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>
- </div>
-
- <div class="column">
- ${user.id && this._userRoleMapper[user.id] ? html`
- <or-mwc-input ?readonly="${readonly}" ?disabled="${isSameUser}" .value="${userRole ? ifDefined(userRole.id) : ifDefined(null)}" .type="${InputType.SELECT}" .options="${selectOptions}" .label="${i18next.t("role")}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => this._userRoleMapper[user.id] = e.detail.value}"></or-mwc-input>
- ` : html`
- <or-mwc-input ?readonly="${readonly}" ?disabled="${isSameUser}" .type="${InputType.SELECT}" .options="${selectOptions}" .label="${i18next.t("role")}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => this._userRoleMapper["newUser"] = e.detail.value}"></or-mwc-input>
- `}
-
- <or-mwc-input id="password-${index}" ?readonly="${readonly}" .label="${i18next.t("password")}" .type="${InputType.PASSWORD}" min="1" @or-mwc-input-changed="${(e: OrInputChangedEvent) => { this.checkPassword(index) }}"></or-mwc-input>
- <or-mwc-input id="repeatPassword-${index}" helperPersistent ?readonly="${readonly}" .label="${i18next.t("repeatPassword")}" .type="${InputType.PASSWORD}" min="1" @or-mwc-input-changed="${(e: OrInputChangedEvent) => { this.checkPassword(index) }}"></or-mwc-input>
- <or-mwc-input ?readonly="${readonly}" .label="${i18next.t("enabled")}" .type="${InputType.SWITCH}" min="1" .value="${user.enabled}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}" style="height: 56px;"></or-mwc-input>
- </div>
- </div>
-
- <div class="row" style="margin-bottom: 0;">
- ${user.id && !readonly ? html`
- ${!isSameUser ? html`
- <or-mwc-input .label="${i18next.t("delete")}" .type="${InputType.BUTTON}" @click="${() => this._deleteUser(user)}"></or-mwc-input>
- ` : ``}
- <or-mwc-input style="margin-left: auto;" .label="${i18next.t("save")}" .type="${InputType.BUTTON}" @click="${() => this._updateUser(user, index)}"></or-mwc-input>
- ` : html`
- <or-mwc-input .label="${i18next.t("cancel")}" .type="${InputType.BUTTON}" @click="${() => {this._users.splice(-1,1); this._users = [...this._users]}}"></or-mwc-input>
- <or-mwc-input style="margin-left: auto;" .label="${i18next.t("create")}" .type="${InputType.BUTTON}" @click="${() => this._createUser(user, index)}"></or-mwc-input>
- `}
- </div>
- </div>
- </td>
- </tr>
- `
- }) : ``}
- ${this._users.length === 0 || this._users.length > 0 && !!this._users[this._users.length -1].id && !readonly ? html`
- <tr class="mdc-data-table__row">
- <td colspan="100%">
- <a class="button" @click="${() => this._users = [...this._users, {enabled: true}]}"><or-icon icon="plus"></or-icon>${i18next.t("add")} ${i18next.t("user")}</a>
- </td>
- </tr>
- ` : ``}
-
- </tbody>
- </table>
+ <p class="panel-title">${i18next.t("regularUser_plural")}</p>
+ <div id="table-users" class="mdc-data-table">
+ <table class="mdc-data-table__table" aria-label="attribute list">
+ <thead>
+ <tr class="mdc-data-table__header-row">
+ <th class="mdc-data-table__header-cell" role="columnheader" scope="col">
+ <or-translate value="username"></or-translate>
+ </th>
+ <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col">
+ <or-translate value="email"></or-translate>
+ </th>
+ <th class="mdc-data-table__header-cell" role="columnheader" scope="col">
+ <or-translate value="role"></or-translate>
+ </th>
+ <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col">
+ <or-translate value="status"></or-translate>
+ </th>
+ </tr>
+ </thead>
+ <tbody class="mdc-data-table__content">
+ ${this._users.map((user, index) => this._getUserTemplate(() => {
+ this._users.pop(); this._users = [...this._users];
+ }, user, readonly, roleOptions, "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}];
+ }}">
+ <td colspan="100%">
+ <or-mwc-input class="button" .type="${InputType.BUTTON}"
+ .label="${i18next.t("add")} ${i18next.t("user")}"
+ icon="plus">
+ </or-mwc-input>
+ </td>
+ </tr>
+ ` : ``}
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ <div class="panel">
+ <p class="panel-title">${i18next.t("serviceUser_plural")}</p>
+ <div id="table-users" class="mdc-data-table">
+ <table class="mdc-data-table__table" aria-label="attribute list">
+ <thead>
+ <tr class="mdc-data-table__header-row">
+ <th class="mdc-data-table__header-cell" role="columnheader" scope="col">
+ <or-translate value="username"></or-translate>
+ </th>
+ <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col">
+ <or-translate value="email"></or-translate>
+ </th>
+ <th class="mdc-data-table__header-cell" role="columnheader" scope="col">
+ <or-translate value="role"></or-translate>
+ </th>
+ <th class="mdc-data-table__header-cell hide-mobile" role="columnheader" scope="col">
+ <or-translate value="status"></or-translate>
+ </th>
+ </tr>
+ </thead>
+ <tbody class="mdc-data-table__content">
+ ${this._serviceUsers.map((user, index) => this._getUserTemplate(() => {
+ this._serviceUsers.pop(); this._serviceUsers = [...this._serviceUsers];
+ }, user, readonly, roleOptions, "serviceuser" + index))}
+ ${(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, {
+ enabled: true,
+ serviceAccount: true}]
+ }}">
+ <td colspan="100%">
+ <or-mwc-input class="button" .type="${InputType.BUTTON}"
+ .label="${i18next.t("add")} ${i18next.t("user")}"
+ icon="plus">
+ </or-mwc-input>
+ </td>
+ </tr>
+ ` : ``}
+ </tbody>
+ </table>
+ </div>
</div>
-
- </div>
</div>
-
`;
- }
+ }
- public stateChanged(state: S) {}
+ public stateChanged(state: S) {
+ }
+
+ protected _toggleUserExpand(ev: MouseEvent) {
+ 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 (expanderIcon.icon === "chevron-right") {
+ expanderIcon.icon = "chevron-down";
+ userRow.classList.add("expanded");
+ } else {
+ expanderIcon.icon = "chevron-right";
+ userRow.classList.remove("expanded");
+ }
+ }
+
+ protected _onPasswordChanged(user: UserModel, suffix: string) {
+
+ const passwordComponent = this.shadowRoot.getElementById("password-" + suffix) as OrMwcInput;
+ const repeatPasswordComponent = this.shadowRoot.getElementById("repeatPassword-" + suffix) as OrMwcInput;
+ const saveBtn = this.shadowRoot.getElementById("savebtn-" + suffix) as OrMwcInput;
+
+ if (repeatPasswordComponent.value !== passwordComponent.value) {
+ const error = i18next.t("passwordMismatch");
+ repeatPasswordComponent.validationMessage = error;
+ repeatPasswordComponent.setCustomValidity(error);
+ repeatPasswordComponent.helperText = error;
+ saveBtn.disabled = true;
+ user.password = "";
+ } else {
+ repeatPasswordComponent.helperText = "";
+ user.password = passwordComponent.value;
+ saveBtn.disabled = false;
+ }
+ }
+
+ protected async _regenerateSecret(ev: OrInputChangedEvent, user: UserModel, secretInputId: string) {
+ const btnElem = ev.currentTarget as OrMwcInput;
+ const secretElem = this.shadowRoot.getElementById(secretInputId) as OrMwcInput;
+ if (!btnElem || !secretElem) {
+ return;
+ }
+ btnElem.disabled = true;
+ secretElem.disabled = true;
+ const resetResponse = await manager.rest.api.UserResource.resetSecret(manager.displayRealm, user.id);
+ if (resetResponse.data) {
+ secretElem.value = resetResponse.data;
+ }
+ btnElem.disabled = false;
+ secretElem.disabled = false;
+ }
+
+ protected _getUserTemplate(addCancel: () => void, user: UserModel, readonly: boolean, roleOptions: string[], suffix: string): TemplateResult {
+ const isSameUser = user.username === manager.username;
+
+ return html`
+ <tr class="mdc-data-table__row" @click="${(ev) => this._toggleUserExpand(ev)}">
+ <td class="padded-cell mdc-data-table__cell">
+ <or-icon icon="chevron-right"></or-icon>
+ <span>${user.username}</span>
+ </td>
+ <td class="padded-cell mdc-data-table__cell hide-mobile">
+ ${user.email}
+ </td>
+ <td class="padded-cell mdc-data-table__cell">
+ ${user.roles ? user.roles.map(r => r.name).join(",") : null}
+ </td>
+ <td class="padded-cell mdc-data-table__cell hide-mobile">
+ <or-translate .value="${user.enabled ? "enabled" : "disabled"}"></or-translate>
+ </td>
+ </tr>
+ <tr class="attribute-meta-row${!user.id ? " expanded" : ""}">
+ <td colspan="4">
+ <div class="meta-item-container">
+ <div class="row">
+ <div class="column">
+ <or-mwc-input ?readonly="${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}"
+ .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}"
+ .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}"
+ .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>
+ </div>
+
+ <div class="column">
+ <or-mwc-input ?readonly="${readonly}"
+ ?disabled="${isSameUser}"
+ .value="${user.roles && user.roles.length > 0 ? user.roles.map(r => r.name) : undefined}"
+ .type="${InputType.SELECT}"
+ .options="${roleOptions}"
+ .label="${i18next.t("role")}"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => {
+ const roleName = e.detail.value;
+ const role = this._compositeRoles.find(cr => cr.name === roleName);
+ user.roles = role ? [role] : undefined;
+ }}"></or-mwc-input>
+ ${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>
+ `}
+ <or-mwc-input ?readonly="${readonly}"
+ .label="${i18next.t("enabled")}"
+ .type="${InputType.SWITCH}" min="1"
+ .value="${user.enabled}"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => user.enabled = e.detail.value}"
+ style="height: 56px;"></or-mwc-input>
+ </div>
+ </div>
+
+ ${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._createUpdateUser(user)}"></or-mwc-input>
+ </div>
+ `}
+ </div>
+ </td>
+ </tr>
+ `
+ }
}
diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.ts
index d726cd2c9..984380c2e 100644
--- a/ui/component/core/src/index.ts
+++ b/ui/component/core/src/index.ts
@@ -1029,7 +1029,7 @@ export class Manager implements EventProviderFactory {
const rolesResponse = await rest.api.UserResource.getCurrentUserRoles();
this._basicIdentity!.roles = rolesResponse.data;
} else {
- console.log("Unkown response so aborting");
+ console.log("Unknown response so aborting");
this._basicIdentity = undefined;
break;
}