Remove edit-member-role web-service
Change-Id: I83c3de51fc664ba22e5441afa4546bc56f2a1e0e
diff --git a/src/main/java/de/ids_mannheim/korap/service/UserGroupService.java b/src/main/java/de/ids_mannheim/korap/service/UserGroupService.java
index 084ed97..52c79b9 100644
--- a/src/main/java/de/ids_mannheim/korap/service/UserGroupService.java
+++ b/src/main/java/de/ids_mannheim/korap/service/UserGroupService.java
@@ -582,47 +582,6 @@
return groupDto;
}
- @Deprecated
- public void editMemberRoles (String username, String groupName,
- String memberUsername, List<PredefinedRole> roleList)
- throws KustvaktException {
-
- ParameterChecker.checkStringValue(username, "username");
- ParameterChecker.checkStringValue(groupName, "groupName");
- ParameterChecker.checkStringValue(memberUsername, "memberUsername");
-
- UserGroup userGroup = userGroupDao.retrieveGroupByName(groupName, true);
- UserGroupStatus groupStatus = userGroup.getStatus();
- if (groupStatus == UserGroupStatus.DELETED) {
- throw new KustvaktException(StatusCodes.GROUP_DELETED,
- "Usergroup has been deleted.");
- }
- else if (isUserGroupAdmin(username, userGroup)
- || adminDao.isAdmin(username)) {
-
- UserGroupMember member = groupMemberDao
- .retrieveMemberById(memberUsername, userGroup.getId());
-
- if (!member.getStatus().equals(GroupMemberStatus.ACTIVE)) {
- throw new KustvaktException(StatusCodes.GROUP_MEMBER_INACTIVE,
- memberUsername + " has status " + member.getStatus(),
- memberUsername, member.getStatus().name());
- }
-
- Set<Role> roles = new HashSet<>();
- for (int i = 0; i < roleList.size(); i++) {
- roles.add(roleDao.retrieveRoleByName(roleList.get(i)));
- }
- member.setRoles(roles);
- groupMemberDao.updateMember(member);
-
- }
- else {
- throw new KustvaktException(StatusCodes.AUTHORIZATION_FAILED,
- "Unauthorized operation for user: " + username, username);
- }
- }
-
public void addAdminRole (String username, String groupName,
String memberUsername) throws KustvaktException {
ParameterChecker.checkStringValue(username, "username");
diff --git a/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java b/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
index d11b0f7..33db5f6 100644
--- a/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
+++ b/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
@@ -222,42 +222,6 @@
}
}
- /** DEPRECATED for simplicity and easier maintenance.
- *
- * Very similar to addMemberRoles web-service, but allows deletion
- * as well.
- *
- * @param securityContext
- * @param groupName
- * the group name
- * @param memberUsername
- * the username of a group-member
- * @param roleId
- * a role id or multiple role ids
- * @return
- */
- @Deprecated
- @POST
- @Path("@{groupName}/role/edit")
- @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- public Response editMemberRoles (@Context SecurityContext securityContext,
- @PathParam("groupName") String groupName,
- @FormParam("memberUsername") String memberUsername,
- @FormParam("roles") List<PredefinedRole> roles) {
- TokenContext context = (TokenContext) securityContext
- .getUserPrincipal();
- try {
- scopeService.verifyScope(context,
- OAuth2Scope.EDIT_USER_GROUP_MEMBER_ROLE);
- service.editMemberRoles(context.getUsername(), groupName,
- memberUsername, roles);
- return Response.ok("SUCCESS").build();
- }
- catch (KustvaktException e) {
- throw kustvaktResponseHandler.throwit(e);
- }
- }
-
/**Add group admin role to a member in a group
*
* @param securityContext
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupMemberTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupMemberTest.java
index 1611da9..b12ff69 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupMemberTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupMemberTest.java
@@ -142,8 +142,6 @@
testAddSameMemberRole(groupId);
testDeleteMemberRole(groupId);
- testEditMemberRoleEmpty(groupId);
- // testEditMemberRole(groupId);
deleteGroupByName(marlinGroupName, "marlin");
}
@@ -178,38 +176,4 @@
Set<Role> roles = member.getRoles();
assertEquals(1, roles.size());
}
-
- @Deprecated
- private void testEditMemberRoleEmpty (int groupId)
- throws ProcessingException, KustvaktException {
- Form form = new Form();
- form.param("memberUsername", "dory");
- Response response = target().path(API_VERSION).path("group")
- .path("@marlin-group").path("role").path("edit").request()
- .header(Attributes.AUTHORIZATION, HttpAuthorizationHandler
- .createBasicAuthorizationHeaderValue("marlin", "pass"))
- .post(Entity.form(form));
- assertEquals(Status.OK.getStatusCode(), response.getStatus());
- UserGroupMember member = memberDao.retrieveMemberById("dory", groupId);
- Set<Role> roles = member.getRoles();
- assertEquals(0, roles.size());
- }
-
- @Deprecated
- private void testEditMemberRole (int groupId)
- throws ProcessingException, KustvaktException {
- Form form = new Form();
- form.param("memberUsername", "dory");
- form.param("roleId", "1");
- form.param("roleId", "3");
- Response response = target().path(API_VERSION).path("group")
- .path("@marlin-group").path("role").path("edit").request()
- .header(Attributes.AUTHORIZATION, HttpAuthorizationHandler
- .createBasicAuthorizationHeaderValue("marlin", "pass"))
- .post(Entity.form(form));
- assertEquals(Status.OK.getStatusCode(), response.getStatus());
- UserGroupMember member = memberDao.retrieveMemberById("dory", groupId);
- Set<Role> roles = member.getRoles();
- assertEquals(2, roles.size());
- }
}