Skip to content

armgit / core

Public Imported from GitHub
0

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

Finished realm roles endpoints

Michael Rademaker96b280d5e664
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 05cfba5d6..bf6dbfd63 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerBasicIdentityProvider.java
@@ -184,11 +184,6 @@ public class ManagerBasicIdentityProvider extends BasicIdentityProvider implemen
throw new UnsupportedOperationException("This provider does not support updating roles");
}
- @Override
- public void updateRealmRoles(String realm, Role[] roles) {
- throw new UnsupportedOperationException("This provider does not support updating realm roles");
- }
-
@Override
public Role[] getUserRoles(String realm, String userId, String client) {
return ClientRole.ALL_ROLES.stream()
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 4d394bdd7..58d799a9a 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerIdentityProvider.java
@@ -71,8 +71,6 @@ public interface ManagerIdentityProvider extends IdentityProvider {
void updateClientRoles(String realm, String client, Role[] roles);
- void updateRealmRoles(String realm, Role[] roles);
-
Role[] getUserRoles(String realm, String userId, String client);
Role[] getUserRealmRoles(String realm, String userId);
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 9644d7fda..1d7175e88 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -563,83 +563,6 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
});
}
- @Override
- public void updateRealmRoles(String realm, Role[] roles) {
-
- getRealms(realmsResource -> {
- RealmResource realmResource = realmsResource.realm(realm);
- List<RoleRepresentation> existingRoles = new ArrayList<>(realmResource.roles().list());
-
- List<RoleRepresentation> removedRoles = existingRoles.stream()
- .filter(existingRole -> Arrays.stream(roles).noneMatch(r -> existingRole.getId().equals(r.getId())))
- .collect(Collectors.toList());
-
- removedRoles.forEach(removedRole -> {
- realmResource.rolesById().deleteRole(removedRole.getId());
- existingRoles.remove(removedRole);
- });
-
- Arrays.stream(roles).forEach(role -> {
-
- RoleRepresentation existingRole;
- boolean compositesModified = false;
- Set<RoleRepresentation> existingComposites = new HashSet<>();
- Set<RoleRepresentation> requestedComposites = new HashSet<>();
-
- if (role.getId() == null) {
- existingRole = saveRealmRole(realmResource, role, null);
- existingRoles.add(existingRole);
- compositesModified = role.getCompositeRoleIds() != null && role.getCompositeRoleIds().length > 0;
- if (compositesModified) {
- requestedComposites.addAll(Arrays.stream(role.getCompositeRoleIds())
- .map(id -> existingRoles.stream().filter(er -> er.getId().equals(id)).findFirst().orElse(null))
- .filter(Objects::nonNull)
- .collect(Collectors.toSet()));
- }
- } else {
- existingRole = existingRoles.stream().filter(r -> r.getId().equals(role.getId())).findFirst().orElseThrow(() -> new IllegalStateException("One or more supplied roles have an ID that doesn't exist"));
-
- boolean isComposite = role.isComposite() && role.getCompositeRoleIds() != null && role.getCompositeRoleIds().length > 0;
-
- boolean rolePropertiesModified = !Objects.equals(existingRole.getName(), role.getName())
- || !Objects.equals(existingRole.getDescription(), role.getDescription());
-
- if (isComposite || existingRole.isComposite()) {
- existingComposites.addAll(Optional.ofNullable(realmResource.rolesById().getRoleComposites(existingRole.getId())).orElse(new HashSet<>()));
- requestedComposites.addAll(Arrays.stream(role.getCompositeRoleIds())
- .map(id -> existingRoles.stream().filter(er -> er.getId().equals(id)).findFirst().orElse(null))
- .filter(Objects::nonNull)
- .collect(Collectors.toSet()));
-
- if (requestedComposites.size() != role.getCompositeRoleIds().length) {
- throw new IllegalStateException("One or more composite roles contain an invalid role ID");
- }
-
- compositesModified = !Objects.equals(existingComposites, requestedComposites);
- }
-
- if (rolePropertiesModified) {
- // Merge the role property changes
- saveRealmRole(realmResource, role, existingRole);
- }
- }
-
- if (compositesModified) {
- List<RoleRepresentation> removed = existingComposites.stream().filter(existing -> !requestedComposites.contains(existing)).collect(Collectors.toList());
- List<RoleRepresentation> added = requestedComposites.stream().filter(existing -> !existingComposites.contains(existing)).collect(Collectors.toList());
- if (!removed.isEmpty()) {
- realmResource.rolesById().deleteComposites(existingRole.getId(), removed);
- }
- if (!added.isEmpty()) {
- realmResource.rolesById().addComposites(existingRole.getId(), added);
- }
- }
- });
-
- return null;
- });
- }
-
protected RoleRepresentation saveClientRole(RealmResource realmResource, ClientResource clientResource, Role role, RoleRepresentation representation) {
if (representation == null) {
representation = new RoleRepresentation();
@@ -656,22 +579,6 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
return clientResource.roles().get(representation.getName()).toRepresentation();
}
- protected RoleRepresentation saveRealmRole(RealmResource realmResource, Role role, RoleRepresentation representation) {
- if (representation == null) {
- representation = new RoleRepresentation();
- }
- representation.setName(role.getName());
- representation.setDescription(role.getDescription());
- representation.setClientRole(false);
- if (representation.getId() == null) {
- realmResource.roles().create(representation);
- } else {
- realmResource.rolesById().updateRole(representation.getId(), representation);
- }
-
- return realmResource.roles().get(representation.getName()).toRepresentation();
- }
-
@Override
public Role[] getUserRoles(String realm, String userId, String client) {
return getRealms(realmsResource -> {
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 2054bdc9b..8e4ae0e35 100644
--- a/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/security/UserResourceImpl.java
@@ -310,20 +310,6 @@ public class UserResourceImpl extends ManagerWebResource implements UserResource
}
}
- @Override
- public void updateRealmRoles(RequestParams requestParams, String realm, Role[] roles) {
- try {
- identityService.getIdentityProvider().updateRealmRoles(
- realm,
- roles);
- } catch (ClientErrorException ex) {
- ex.printStackTrace(System.out);
- throw new WebApplicationException(ex.getCause(), ex.getResponse().getStatus());
- } catch (Exception ex) {
- throw new NotFoundException(ex);
- }
- }
-
protected void throwIfIllegalMasterAdminUserDeletion(RequestParams requestParams, String realm, String userId) throws WebApplicationException {
if (!realm.equals(MASTER_REALM)) {
return;
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 2e4ab0cbe..34d47996c 100644
--- a/model/src/main/java/org/openremote/model/security/UserResource.java
+++ b/model/src/main/java/org/openremote/model/security/UserResource.java
@@ -71,12 +71,6 @@ public interface UserResource {
@RolesAllowed(Constants.WRITE_ADMIN_ROLE)
void updateClientRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, Role[] roles, @PathParam("clientId") String clientId);
- @PUT
- @Path("{realm}/realm-roles")
- @Consumes(APPLICATION_JSON)
- @RolesAllowed(Constants.WRITE_ADMIN_ROLE)
- void updateRealmRoles(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, Role[] roles);
-
@GET
@Produces(APPLICATION_JSON)
@Path("{realm}/users")
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 2de7069d4..ae59fe56a 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,6 @@
*/
package org.openremote.test.users
-import org.junit.Ignore
import org.openremote.manager.setup.SetupService
import org.openremote.test.setup.KeycloakTestSetup
import org.openremote.model.security.ClientRole
@@ -40,7 +39,6 @@ import static org.openremote.model.Constants.MASTER_REALM
import static org.openremote.model.Constants.MASTER_REALM_ADMIN_USER
import static org.openremote.model.Constants.RESTRICTED_USER_REALM_ROLE
-@Ignore
class UserResourceTest extends Specification implements ManagerContainerTrait {
@Shared
@@ -140,14 +138,14 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
writeRole.compositeRoleIds.contains(roles.find {it.name == ClientRole.READ_ASSETS.value}.id)
}
- def "Get and update realm roles"() {
+ def "Get realm roles"() {
when: "a request is made for the realm roles in the building realm by the admin user"
def roles = adminUserResource.getRealmRoles(null, keycloakTestSetup.tenantBuilding.realm)
then: "the standard realm roles should have been returned"
roles.size() == 4
- def restrictedUser = roles.find {it.name == RESTRICTED_USER_REALM_ROLE}
+ def restrictedUser = roles.find {it.name == RESTRICTED_USER_REALM_ROLE }
restrictedUser != null
when: "a request is made for the realm roles in the building realm by a regular user"
@@ -155,40 +153,5 @@ class UserResourceTest extends Specification implements ManagerContainerTrait {
then: "a not allowed exception should be thrown"
thrown(ForbiddenException.class)
-
- when: "a new realm role is created by the admin user"
- List<Role> updatedRoles = new ArrayList<>(Arrays.asList(roles))
- updatedRoles.add(new Role(
- null,
- "realmTest",
- false, // Value is ignored on update
- false, // Value is ignored on update
- null
- ).setDescription("This is a realm role"))
- adminUserResource.updateRealmRoles(null, keycloakTestSetup.tenantBuilding.realm, updatedRoles as Role[])
- roles = adminUserResource.getRealmRoles(null, keycloakTestSetup.tenantBuilding.realm)
- def realmRole = roles.find {it.name == "realmTest"}
-
- then: "the new realm role should have been saved"
- realmRole != null
- realmRole.description == "This is a realm role"
-//TODO: finish this test
-//
-// when: "an existing realm role is updated by the admin user"
-// def defaultRole = roles.find {it.name == KEYCLOAK_DEFAULT_ROLES_PREFIX + keycloakTestSetup.tenantBuilding.realm}
-// def clientRoles = adminUserResource.getRoles(null, keycloakTestSetup.tenantBuilding.realm)
-// defaultRole.compositeRoleIds = [
-// roles.find {it.name == RESTRICTED_USER_REALM_ROLE}.id,
-// clientRoles.find { it.name == ClientRole.READ_ASSETS.value}
-// ]
-// adminUserResource.updateRealmRoles(null, keycloakTestSetup.tenantBuilding.realm, roles)
-// roles = adminUserResource.getRealmRoles(null, keycloakTestSetup.tenantBuilding.realm)
-// defaultRole = roles.find {it.name == KEYCLOAK_DEFAULT_ROLES_PREFIX + keycloakTestSetup.tenantBuilding.realm}
-//
-// then: "the write role should have been updated"
-// defaultRole != null
-// defaultRole.compositeRoleIds.length == 2
-// defaultRole.compositeRoleIds.contains(roles.find {it.name == RESTRICTED_USER_REALM_ROLE}.id)
-// defaultRole.compositeRoleIds.contains(clientRoles.find {it.name == ClientRole.READ_ASSETS.value}.id)
}
}