Commit 11df3702 authored by Jeff Burke's avatar Jeff Burke
Browse files

s1848: rollbacked bug fixes until int-tests fixed.

parent ed57e5f7

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberAction.java

+15 −10
Original line number Diff line number Diff line
@@ -91,16 +91,21 @@ public class RemoveGroupMemberAction extends AbstractGroupAction 
        Group group = groupPersistence.getGroup(this.groupName);

        Group toRemove = new Group(this.groupMemberName);



        boolean removedMember = false;

        if (group.getGroupMembers().remove(toRemove))

        {

            removedMember = true;

        }

        if (group.getGroupAdmins().remove(toRemove))

        {

            removedMember = true;

        }

        if (!removedMember)

//        boolean removedMember = false;

//        if (group.getGroupMembers().remove(toRemove))

//        {

//            removedMember = true;

//        }

//        if (group.getGroupAdmins().remove(toRemove))

//        {

//            removedMember = true;

//        }

//        if (!removedMember)

//        {

//            throw new GroupNotFoundException(this.groupMemberName);

//        }



        if (!group.getGroupMembers().remove(toRemove))

        {

            throw new GroupNotFoundException(this.groupMemberName);

        }

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java

+13 −7
Original line number Diff line number Diff line
@@ -100,19 +100,25 @@ public class RemoveUserMemberAction extends AbstractGroupAction 
    {

        Group group = groupPersistence.getGroup(this.groupName);

        Principal userPrincipal = AuthenticationUtil.createPrincipal(this.userID, this.userIDType);



        User<Principal> user = getUserPersistence().getAugmentedUser(userPrincipal);

        Set<X500Principal> x500Principals = user.getIdentities(X500Principal.class);

        X500Principal x500Principal = x500Principals.iterator().next();



        if (!group.getUserMembers().remove(x500Principal))

        User<Principal> toRemove = new User(userPrincipal);

        if (!group.getUserMembers().remove(toRemove))

        {

            throw new MemberNotFoundException();

        }



//        User<Principal> user = getUserPersistence().getAugmentedUser(userPrincipal);

//        Set<X500Principal> x500Principals = user.getIdentities(X500Principal.class);

//        X500Principal x500Principal = x500Principals.iterator().next();

//

//        if (!group.getUserMembers().remove(x500Principal))

//        {

//            throw new MemberNotFoundException();

//        }

        groupPersistence.modifyGroup(group);



        List<String> deletedMembers = new ArrayList<String>();

        deletedMembers.add(user.getUserID().getName());

        deletedMembers.add(toRemove.getUserID().getName());

//        deletedMembers.add(user.getUserID().getName());

        logGroupInfo(group.getID(), deletedMembers, null);

    }