8000 Organization group: Error response when removing non-member from org group by pedroigor · Pull Request #52588 · keycloak/keycloak · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;

import org.keycloak.authorization.fgap.AdminPermissionsSchema;
import org.keycloak.common.util.ObjectUtil;
Expand Down Expand Up @@ -424,6 +425,8 @@ public void leaveGroup(@PathParam("userId") String userId) {
} catch (ModelException me) {
throw ErrorResponse.error(me.getMessage(), Response.Status.BAD_REQUEST);
}
} else {
throw ErrorResponse.error("User not a member", Status.BAD_REQUEST);
Comment thread
pedroigor marked this conversation as resolved.
Resolved
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.fail;

/**
Expand Down Expand Up @@ -571,4 +572,27 @@ public void testGroupMembershipsRequiresMembershipInCurrentOrganization() {
// expected - memberB is not a member of orgA
}
}

@Test
public void testRemoveMemberFailsForNonMembers() {
OrganizationRepresentation orgRep = createOrganization();
OrganizationResource orgResource = realm.admin().organizations().get(orgRep.getId());

MemberRepresentation member = addMember(orgResource);

// Create a group
GroupRepresentation groupRep = new GroupRepresentation();
groupRep.setName("test-group");
String groupId;
try (Response response = orgResource.groups().addTopLevelGroup(groupRep)) {
groupId = ApiUtil.getCreatedId(response);
}

// Attempt to remove user from group they're not in - should throw BadRequest
String finalGroupId = groupId;
assertThrows(jakarta.ws.rs.BadRequestException.class,
() -> orgResource.groups().group(finalGroupId).removeMember(member.getId()),
"removeMember should fail when user is not a member of the group"
);
}
}
Loading
0