LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

RESTful API for managing users completed 

Former-commit-id: b89c2a7076
restapi
Jens Pelzetter 2020-05-25 20:25:37 +02:00
parent c2c50e5899
commit ec09fd98e4
3 changed files with 199 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-core/src/main/java/org/libreccm/security/GroupMembership.java
View File

@ -160,6 +160,10 @@ public class GroupMembership implements Serializable, Exportable {
return obj instanceof GroupMembership; return obj instanceof GroupMembership;
} }
public JsonObject toJson() {
return buildJson().build();
}
public JsonObjectBuilder buildJson() { public JsonObjectBuilder buildJson() {
return Json return Json

5
ccm-core/src/main/java/org/libreccm/security/RoleMembership.java
View File

@ -35,6 +35,7 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators;
import org.libreccm.imexport.Exportable; import org.libreccm.imexport.Exportable;
import javax.json.Json; import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonObjectBuilder; import javax.json.JsonObjectBuilder;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
@ -160,6 +161,10 @@ public class RoleMembership implements Serializable, Exportable {
public boolean canEqual(final Object obj) { public boolean canEqual(final Object obj) {
return obj instanceof RoleMembership; return obj instanceof RoleMembership;
} }
public JsonObject toJson() {
return buildJson().build();
}
public JsonObjectBuilder buildJson() { public JsonObjectBuilder buildJson() {
return Json return Json

210
ccm-core/src/main/java/org/libreccm/security/UsersApi.java
View File

@ -57,11 +57,23 @@ public class UsersApi {
private IdentifierExtractor identifierExtractor; private IdentifierExtractor identifierExtractor;
@Inject @Inject
private UserRepository userRepository; private GroupManager groupManager;
@Inject
private GroupRepository groupRepository;
@Inject
private RoleManager roleManager;
@Inject
private RoleRepository roleRepository;
@Inject @Inject
private UserManager userManager; private UserManager userManager;
@Inject
private UserRepository userRepository;
@GET @GET
@Path("/") @Path("/")
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@ -188,34 +200,34 @@ public class UsersApi {
final JsonObject userData final JsonObject userData
) { ) {
final User user = findUser(userIdentifier); final User user = findUser(userIdentifier);
boolean updated = false; boolean updated = false;
if (!userData.isNull("familyName") if (!userData.isNull("familyName")
&& !userData.getString("familyName").equals(user.getFamilyName())) { && !userData.getString("familyName")
.equals(user.getFamilyName())) {
user.setFamilyName(userIdentifier); user.setFamilyName(userIdentifier);
updated = true; updated = true;
} }
if (!userData.isNull("givenName") if (!userData.isNull("givenName")
&& !userData.getString("givenName").equals(user.getGivenName())) { && !userData.getString("givenName").equals(user.getGivenName())) {
user.setGivenName(userData.getString("givenName")); user.setGivenName(userData.getString("givenName"));
updated = true; updated = true;
} }
if (!userData.isNull("emailAddress") if (!userData.isNull("emailAddress")
&& !userData.getString("emailAddress") && !userData.getString("emailAddress")
.equals(user.getPrimaryEmailAddress().getAddress()) .equals(user.getPrimaryEmailAddress().getAddress())) {
) {
user user
.getPrimaryEmailAddress() .getPrimaryEmailAddress()
.setAddress(userData.getString("emailAddress")); .setAddress(userData.getString("emailAddress"));
updated = true; updated = true;
} }
if (updated) { if (updated) {
userRepository.save(user); userRepository.save(user);
} }
return Response return Response
.status(Response.Status.OK) .status(Response.Status.OK)
.entity( .entity(
@ -234,7 +246,13 @@ public class UsersApi {
@PathParam("userIdentifier") @PathParam("userIdentifier")
final String userIdentifier final String userIdentifier
) { ) {
throw new UnsupportedOperationException(); final User user = findUser(userIdentifier);
final String name = user.getName();
userRepository.delete(user);
return Response
.status(Response.Status.OK)
.entity(String.format("User %s deleted successfully.", name))
.build();
} }
@GET @GET
@ -247,7 +265,11 @@ public class UsersApi {
@PathParam("userIdentifier") @PathParam("userIdentifier")
final String userIdentifier final String userIdentifier
) { ) {
throw new UnsupportedOperationException(); return findUser(userIdentifier)
.getGroupMemberships()
.stream()
.map(GroupMembership::toJson)
.collect(new JsonArrayCollector());
} }
@PUT @PUT
@ -261,7 +283,21 @@ public class UsersApi {
@PathParam("groupIdentifier") @PathParam("groupIdentifier")
final String groupIdentifier final String groupIdentifier
) { ) {
throw new UnsupportedOperationException(); final User user = findUser(userIdentifier);
final Group group = findGroup(groupIdentifier);
groupManager.addMemberToGroup(user, group);
return Response
.ok()
.entity(
String.format(
"User %s successfully added to group %s.",
user.getName(),
group.getName()
)
)
.build();
} }
@DELETE @DELETE
@ -275,7 +311,21 @@ public class UsersApi {
@PathParam("groupIdentifier") @PathParam("groupIdentifier")
final String groupIdentifier final String groupIdentifier
) { ) {
throw new UnsupportedOperationException(); final User user = findUser(userIdentifier);
final Group group = findGroup(groupIdentifier);
groupManager.removeMemberFromGroup(user, group);
return Response
.ok()
.entity(
String.format(
"User %s successfully removed to group %s.",
user.getName(),
group.getName()
)
)
.build();
} }
@GET @GET
@ -288,7 +338,11 @@ public class UsersApi {
@PathParam("userIdentifier") @PathParam("userIdentifier")
final String userIdentifier final String userIdentifier
) { ) {
throw new UnsupportedOperationException(); return findUser(userIdentifier)
.getRoleMemberships()
.stream()
.map(RoleMembership::toJson)
.collect(new JsonArrayCollector());
} }
@PUT @PUT
@ -302,7 +356,21 @@ public class UsersApi {
@PathParam("roleIdentifier") @PathParam("roleIdentifier")
final String roleIdentifier final String roleIdentifier
) { ) {
throw new UnsupportedOperationException(); final User user = findUser(userIdentifier);
final Role role = findRole(roleIdentifier);
roleManager.assignRoleToParty(role, user);
return Response
.ok()
.entity(
String.format(
"Role %s successfully assigned to user %s.",
role.getName(),
user.getName()
)
)
.build();
} }
@DELETE @DELETE
@ -316,7 +384,109 @@ public class UsersApi {
@PathParam("roleIdentifier") @PathParam("roleIdentifier")
final String roleIdentifier final String roleIdentifier
) { ) {
throw new UnsupportedOperationException(); final User user = findUser(userIdentifier);
final Role role = findRole(roleIdentifier);
roleManager.removeRoleFromParty(role, user);
return Response
.ok()
.entity(
String.format(
"Role %s successfully removed from user %s.",
role.getName(),
user.getName()
)
)
.build();
}
private Group findGroup(final String groupIdentifier) {
final ExtractedIdentifier identifier = identifierExtractor
.extractIdentifier(groupIdentifier);
switch (identifier.getType()) {
case ID:
return groupRepository
.findById(Long.parseLong(identifier.getIdentifier()))
.orElseThrow(
() -> new WebApplicationException(
String.format(
"No group with ID %s found",
identifier.getIdentifier()
),
Response.Status.NOT_FOUND
)
);
case UUID:
return groupRepository
.findByUuid(identifier.getIdentifier())
.orElseThrow(
() -> new WebApplicationException(
String.format(
"No group with UUID %s found.",
identifier.getIdentifier()
),
Response.Status.NOT_FOUND
)
);
default:
return groupRepository
.findByName(identifier.getIdentifier())
.orElseThrow(
() -> new WebApplicationException(
String.format(
"No group with name %s found.",
identifier.getIdentifier()
),
Response.Status.NOT_FOUND
)
);
}
}
private Role findRole(final String roleIdentifier) {
final ExtractedIdentifier identifier = identifierExtractor
.extractIdentifier(roleIdentifier);
switch (identifier.getType()) {
case ID:
return roleRepository
.findById(Long.parseLong(identifier.getIdentifier()))
.orElseThrow(
() -> new WebApplicationException(
String.format(
"No role with ID %s found.",
identifier.getIdentifier()
),
Response.Status.NOT_FOUND
)
);
case UUID:
return roleRepository
.findByUuid(identifier.getIdentifier())
.orElseThrow(
() -> new WebApplicationException(
String.format(
"No role with UUID %s found.",
identifier.getIdentifier()
),
Response.Status.NOT_FOUND
)
);
default:
return roleRepository
.findByName(identifier.getIdentifier())
.orElseThrow(
() -> new WebApplicationException(
String.format(
"No role with name %s found.",
identifier.getIdentifier()
),
Response.Status.NOT_FOUND
)
);
}
} }
private User findUser(final String identifierParam) { private User findUser(final String identifierParam) {
@ -341,7 +511,7 @@ public class UsersApi {
.orElseThrow( .orElseThrow(
() -> new WebApplicationException( () -> new WebApplicationException(
String.format( String.format(
"No user with ID %s found.", "No user with UUID %s found.",
identifier.getIdentifier() identifier.getIdentifier()
), ),
Response.Status.NOT_FOUND) Response.Status.NOT_FOUND)
@ -352,7 +522,7 @@ public class UsersApi {
.orElseThrow( .orElseThrow(
() -> new WebApplicationException( () -> new WebApplicationException(
String.format( String.format(
"No user with ID %s found.", "No user with name %s found.",
identifier.getIdentifier() identifier.getIdentifier()
), ),
Response.Status.NOT_FOUND) Response.Status.NOT_FOUND)