diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddGroupMemberAction.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddGroupMemberAction.java index 9577061cca259dcc76f5e4dae527685aafc7164d..c842e9708c09ea603ebc77c21173802586bd1bea 100755 --- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddGroupMemberAction.java +++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddGroupMemberAction.java @@ -73,7 +73,6 @@ import ca.nrc.cadc.ac.GroupAlreadyExistsException; import ca.nrc.cadc.ac.server.GroupPersistence; import java.util.ArrayList; import java.util.List; -import java.util.Set; public class AddGroupMemberAction extends GroupsAction { @@ -93,7 +92,7 @@ public class AddGroupMemberAction extends GroupsAction { GroupPersistence groupPersistence = getGroupPersistence(); Group group = groupPersistence.getGroup(this.groupName); - Group toAdd = groupPersistence.getGroup(this.groupMemberName); + Group toAdd = new Group(this.groupMemberName); if (!group.getGroupMembers().add(toAdd)) { throw new GroupAlreadyExistsException(this.groupMemberName); diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java index d8a84b2650cf2b3d4cd191b5fbf7f4a54014235c..7c6873401e1aa28c94b36e0980ec70bedf72bea5 100755 --- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java +++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java @@ -99,14 +99,14 @@ public class AddUserMemberAction extends GroupsAction throws Exception { GroupPersistence groupPersistence = getGroupPersistence(); - UserPersistence userPersistence = getUserPersistence(); Group group = groupPersistence.getGroup(this.groupName); Principal userPrincipal = AuthenticationUtil.createPrincipal(this.userID, this.userIDType); - User toAdd = userPersistence.getUser(userPrincipal); + User<Principal> toAdd = new User(userPrincipal); if (!group.getUserMembers().add(toAdd)) { throw new MemberAlreadyExistsException(); } + groupPersistence.modifyGroup(group); List<String> addedMembers = new ArrayList<String>(); diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveGroupMemberAction.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveGroupMemberAction.java index 39e148916a204e9369340fe50a5b0eabc22c69bf..269984b17e2d626ed58551a7c5ad130349405cc4 100755 --- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveGroupMemberAction.java +++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveGroupMemberAction.java @@ -92,7 +92,7 @@ public class RemoveGroupMemberAction extends GroupsAction { GroupPersistence groupPersistence = getGroupPersistence(); Group group = groupPersistence.getGroup(this.groupName); - Group toRemove = groupPersistence.getGroup(this.groupMemberName); + Group toRemove = new Group(this.groupMemberName); if (!group.getGroupMembers().remove(toRemove)) { throw new GroupNotFoundException(this.groupMemberName); diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java index c9612f663c5009d88c9d00d17fa82974a266a6bb..9b4d34f73c8af063650ac3ecf5245ba2c7058b5b 100755 --- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java +++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java @@ -97,10 +97,9 @@ public class RemoveUserMemberAction extends GroupsAction throws Exception { GroupPersistence groupPersistence = getGroupPersistence(); - UserPersistence userPersistence = getUserPersistence(); Group group = groupPersistence.getGroup(this.groupName); Principal userPrincipal = AuthenticationUtil.createPrincipal(this.userID, this.userIDType); - User toRemove = userPersistence.getUser(userPrincipal); + User<Principal> toRemove = new User(userPrincipal); if (!group.getUserMembers().remove(toRemove)) { throw new MemberNotFoundException();