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

KEYCLOAK-18471 Added ID to admin event object.

Browse source
This commit is contained in:
bal1imb 2021-04-22 01:29:33 -07:00 committed by Hynek Mlnařík
parent 740248fd54
commit fbaeb18a5f
6 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java
View file

@ -146,7 +146,7 @@ public class JpaEventStoreProvider implements EventStoreProvider {
private EventEntity convertEvent(Event event) {
EventEntity eventEntity = new EventEntity();
eventEntity.setId(UUID.randomUUID().toString());
eventEntity.setId(event.getId() == null ? UUID.randomUUID().toString() : event.getId());
eventEntity.setTime(event.getTime());
eventEntity.setType(event.getType().toString());
eventEntity.setRealmId(event.getRealmId());
@ -183,6 +183,7 @@ public class JpaEventStoreProvider implements EventStoreProvider {
static Event convertEvent(EventEntity eventEntity) {
Event event = new Event();
event.setId(eventEntity.getId() == null ? UUID.randomUUID().toString() : eventEntity.getId());
event.setTime(eventEntity.getTime());
event.setType(EventType.valueOf(eventEntity.getType()));
event.setRealmId(eventEntity.getRealmId());
@ -202,7 +203,7 @@ public class JpaEventStoreProvider implements EventStoreProvider {
static AdminEventEntity convertAdminEvent(AdminEvent adminEvent, boolean includeRepresentation) {
AdminEventEntity adminEventEntity = new AdminEventEntity();
adminEventEntity.setId(UUID.randomUUID().toString());
adminEventEntity.setId(adminEvent.getId() == null ? UUID.randomUUID().toString() : adminEvent.getId());
adminEventEntity.setTime(adminEvent.getTime());
adminEventEntity.setRealmId(adminEvent.getRealmId());
setAuthDetails(adminEventEntity, adminEvent.getAuthDetails());
@ -223,6 +224,7 @@ public class JpaEventStoreProvider implements EventStoreProvider {
static AdminEvent convertAdminEvent(AdminEventEntity adminEventEntity) {
AdminEvent adminEvent = new AdminEvent();
adminEvent.setId(adminEventEntity.getId() == null ? UUID.randomUUID().toString() : adminEventEntity.getId());
adminEvent.setTime(adminEventEntity.getTime());
adminEvent.setRealmId(adminEventEntity.getRealmId());
setAuthDetails(adminEvent, adminEventEntity);

11
server-spi-private/src/main/java/org/keycloak/events/Event.java
View file

@ -25,6 +25,8 @@ import java.util.Map;
*/
public class Event {
private String id;
private long time;
private EventType type;
@ -43,6 +45,14 @@ public class Event {
private Map<String, String> details;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public long getTime() {
return time;
}
@ -117,6 +127,7 @@ public class Event {
public Event clone() {
Event clone = new Event();
clone.id = id;
clone.time = time;
clone.type = type;
clone.realmId = realmId;

2
server-spi-private/src/main/java/org/keycloak/events/EventBuilder.java
View file

@ -30,6 +30,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
/**
@ -178,6 +179,7 @@ public class EventBuilder {
private void send() {
event.setTime(Time.currentTimeMillis());
event.setId(UUID.randomUUID().toString());
if (store != null) {
Set<String> eventTypes = realm.getEnabledEventTypesStream().collect(Collectors.toSet());

16
server-spi-private/src/main/java/org/keycloak/events/admin/AdminEvent.java
View file

@ -22,6 +22,8 @@ package org.keycloak.events.admin;
*/
public class AdminEvent {
private String id;
private long time;
private String realmId;
@ -43,6 +45,7 @@ public class AdminEvent {
public AdminEvent() {}
public AdminEvent(AdminEvent toCopy) {
this.id = toCopy.getId();
this.time = toCopy.getTime();
this.realmId = toCopy.getRealmId();
this.authDetails = new AuthDetails(toCopy.getAuthDetails());
@ -53,8 +56,19 @@ public class AdminEvent {
this.error = toCopy.getError();
}
/**
* Returns the UUID of the event.
*
* @return
*/
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
/**
* Returns the time of the event
*

2
services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java
View file

@ -36,6 +36,7 @@ import javax.ws.rs.core.UriInfo;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import java.util.function.Predicate;
public class AdminEventBuilder {
@ -238,6 +239,7 @@ public class AdminEventBuilder {
// Event needs to be copied because the same builder can be used with another event
AdminEvent eventCopy = new AdminEvent(adminEvent);
eventCopy.setTime(Time.currentTimeMillis());
eventCopy.setId(UUID.randomUUID().toString());
if (store != null) {
try {

3
testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java
View file

@ -109,6 +109,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.UUID;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
@ -391,6 +392,7 @@ public class TestingResourceProvider implements RealmResourceProvider {
private Event repToModel(EventRepresentation rep) {
Event event = new Event();
event.setId(UUID.randomUUID().toString());
event.setClientId(rep.getClientId());
event.setDetails(rep.getDetails());
event.setError(rep.getError());
@ -536,6 +538,7 @@ public class TestingResourceProvider implements RealmResourceProvider {
private AdminEvent repToModel(AdminEventRepresentation rep) {
AdminEvent event = new AdminEvent();
event.setId(UUID.randomUUID().toString());
event.setAuthDetails(repToModel(rep.getAuthDetails()));
event.setError(rep.getError());
event.setOperationType(OperationType.valueOf(rep.getOperationType()));