libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Merge pull request #5200 from martel-innovate/KEYCLOAK-7337

Browse source 
[KEYCLOAK-7337] Implement return of requester in UMA permissions
This commit is contained in:
Pedro Igor 2018-05-14 09:07:48 -03:00 committed by GitHub
commit 6882f7a9c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/src/main/java/org/keycloak/representations/idm/authorization/PermissionTicketRepresentation.java
View file

@ -28,6 +28,9 @@ public class PermissionTicketRepresentation {
private boolean granted; private boolean granted;
private String scopeName; private String scopeName;
private String resourceName; private String resourceName;
private String requester;
private String ownerName;
private String requesterName;
public String getId() { public String getId() {
return id; return id;
@ -84,4 +87,28 @@ public class PermissionTicketRepresentation {
public String getResourceName() { public String getResourceName() {
return resourceName; return resourceName;
} }
public void setRequesterName(String requesterName) {
this.requesterName = requesterName;
}
public String getRequesterName() {
return requesterName;
}
public void setRequester(String requester) {
this.requester = requester;
}
public String getRequester() {
return requester;
}
public void setOwnerName(String ownerName) {
this.ownerName = ownerName;
}
public String getOwnerName() {
return ownerName;
}
} }

13
server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java
View file

@ -848,16 +848,17 @@ public class ModelToRepresentation {
return resource; return resource;
} }
public static PermissionTicketRepresentation toRepresentation(PermissionTicket ticket) { public static PermissionTicketRepresentation toRepresentation(PermissionTicket ticket, AuthorizationProvider authorization) {
return toRepresentation(ticket, false); return toRepresentation(ticket, authorization, false);
} }
public static PermissionTicketRepresentation toRepresentation(PermissionTicket ticket, boolean returnNames) { public static PermissionTicketRepresentation toRepresentation(PermissionTicket ticket, AuthorizationProvider authorization, boolean returnNames) {
PermissionTicketRepresentation representation = new PermissionTicketRepresentation(); PermissionTicketRepresentation representation = new PermissionTicketRepresentation();
representation.setId(ticket.getId()); representation.setId(ticket.getId());
representation.setGranted(ticket.isGranted()); representation.setGranted(ticket.isGranted());
representation.setOwner(ticket.getOwner()); representation.setOwner(ticket.getOwner());
representation.setRequester(ticket.getRequester());
Resource resource = ticket.getResource(); Resource resource = ticket.getResource();
@ -865,6 +866,12 @@ public class ModelToRepresentation {
if (returnNames) { if (returnNames) {
representation.setResourceName(resource.getName()); representation.setResourceName(resource.getName());
KeycloakSession keycloakSession = authorization.getKeycloakSession();
RealmModel realm = authorization.getRealm();
UserModel owner = keycloakSession.users().getUserById(ticket.getOwner(), realm);
UserModel requester = keycloakSession.users().getUserById(ticket.getRequester(), realm);
representation.setRequesterName(requester.getUsername());
representation.setOwnerName(owner.getUsername());
} }
Scope scope = ticket.getScope(); Scope scope = ticket.getScope();

2
services/src/main/java/org/keycloak/authorization/protection/permission/PermissionService.java
View file

@ -138,7 +138,7 @@ public class PermissionService extends AbstractPermissionService {
return Response.ok().entity(permissionTicketStore.find(filters, resourceServer.getId(), firstResult != null ? firstResult : -1, maxResult != null ? maxResult : Constants.DEFAULT_MAX_RESULTS) return Response.ok().entity(permissionTicketStore.find(filters, resourceServer.getId(), firstResult != null ? firstResult : -1, maxResult != null ? maxResult : Constants.DEFAULT_MAX_RESULTS)
.stream() .stream()
.map(permissionTicket -> ModelToRepresentation.toRepresentation(permissionTicket, returnNames == null ? false : returnNames)) .map(permissionTicket -> ModelToRepresentation.toRepresentation(permissionTicket, authorization, returnNames == null ? false : returnNames))
.collect(Collectors.toList())) .collect(Collectors.toList()))
.build(); .build();
} }