libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Add an endpoint to the organizations endpoint to return the organizations for a given user

Browse source 
Closes #32158

Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com>
This commit is contained in:
Pedro Igor 2024-08-15 08:37:02 -03:00
parent b2999ada2d
commit 4376a3c757
6 changed files with 75 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java
View file

@ -86,4 +86,9 @@ public interface OrganizationMembersResource {
@GET
@Produces(MediaType.APPLICATION_JSON)
Long count();
@Path("{id}/organizations")
@GET
@Produces(MediaType.APPLICATION_JSON)
List<OrganizationRepresentation> getOrganizations(@PathParam("id") String id);
}

36
integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsMembersResource.java Normal file
View file

@ -0,0 +1,36 @@
/*
* Copyright 2024 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.keycloak.admin.client.resource;
import java.util.List;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.keycloak.representations.idm.OrganizationRepresentation;
public interface OrganizationsMembersResource {
@Path("{id}/organizations")
@GET
@Produces(MediaType.APPLICATION_JSON)
List<OrganizationRepresentation> getOrganizations(@PathParam("id") String id);
}

3
integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java
View file

@ -105,4 +105,7 @@ public interface OrganizationsResource {
@QueryParam("first") Integer first,
@QueryParam("max") Integer max
);
@Path("members")
OrganizationsMembersResource members();
}

12
services/src/main/java/org/keycloak/organization/admin/resource/OrganizationMemberResource.java
View file

@ -190,7 +190,7 @@ public class OrganizationMemberResource {
throw ErrorResponse.error("id cannot be null", Status.BAD_REQUEST);
}
UserModel member = getMember(id);
UserModel member = getUser(id);
return provider.getByMember(member).map((org) -> {
OrganizationRepresentation organization = new OrganizationRepresentation();
@ -222,6 +222,16 @@ public class OrganizationMemberResource {
return member;
}
private UserModel getUser(String id) {
UserModel user = session.users().getUserById(realm, id);
if (user == null) {
throw new NotFoundException();
}
return user;
}
private MemberRepresentation toRepresentation(UserModel member) {
MemberRepresentation result = new MemberRepresentation(ModelToRepresentation.toRepresentation(session, realm, member));
result.setMembershipType(provider.isManagedMember(organization, member) ? MembershipType.MANAGED : MembershipType.UNMANAGED);

10
services/src/main/java/org/keycloak/organization/admin/resource/OrganizationsResource.java
View file

@ -162,4 +162,14 @@ public class OrganizationsResource {
return new OrganizationResource(session, organizationModel, adminEvent);
}
@Path("members/{id}/organizations")
@GET
@Produces(MediaType.APPLICATION_JSON)
@NoCache
@Tag(name = KeycloakOpenAPI.Admin.Tags.ORGANIZATIONS)
@Operation(summary = "Returns the organizations associated with the user that has the specified id")
public Stream<OrganizationRepresentation> getOrganizations(@PathParam("id") String id) {
return new OrganizationMemberResource(session, null, adminEvent).getOrganizations(id);
}
}

10
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberTest.java
View file

@ -115,10 +115,20 @@ public class OrganizationMemberTest extends AbstractOrganizationTest {
public void testGetMemberOrganization() {
OrganizationResource organization = testRealm().organizations().get(createOrganization().getId());
UserRepresentation member = addMember(organization);
OrganizationRepresentation orgB = createOrganization("orgb");
testRealm().organizations().get(orgB.getId()).members().addMember(member.getId()).close();
OrganizationRepresentation expected = organization.toRepresentation();
List<OrganizationRepresentation> actual = organization.members().member(member.getId()).getOrganizations();
assertNotNull(actual);
assertEquals(2, actual.size());
assertTrue(actual.stream().map(OrganizationRepresentation::getId).anyMatch(expected.getId()::equals));
assertTrue(actual.stream().map(OrganizationRepresentation::getId).anyMatch(orgB.getId()::equals));
actual = testRealm().organizations().members().getOrganizations(member.getId());
assertNotNull(actual);
assertEquals(2, actual.size());
assertTrue(actual.stream().map(OrganizationRepresentation::getId).anyMatch(expected.getId()::equals));
assertTrue(actual.stream().map(OrganizationRepresentation::getId).anyMatch(orgB.getId()::equals));
}
@Test