check for removed user in webhoook createdBy field (#58)

p2-inc · Apr 22, 2024 · f2ab6f6 · f2ab6f6
1 parent a18a332
commit f2ab6f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,8 +30,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <main.java.package>io.phasetwo.keycloak.events</main.java.package>
     <junit.version>5.8.2</junit.version>
-    <keycloak.version>24.0.0</keycloak.version>
-    <lombok.version>1.18.30</lombok.version>
+    <keycloak.version>24.0.3</keycloak.version>
+    <lombok.version>1.18.32</lombok.version>
     <auto-service.version>1.1.1</auto-service.version>
     <ossrh.url>https://s01.oss.sonatype.org</ossrh.url>
   </properties>

diff --git a/src/main/java/io/phasetwo/keycloak/resources/WebhooksResource.java b/src/main/java/io/phasetwo/keycloak/resources/WebhooksResource.java
@@ -19,6 +19,7 @@
 import java.util.stream.Stream;
 import lombok.extern.jbosslog.JBossLog;
 import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.UserModel;
 import org.keycloak.services.resources.admin.AdminRoot;
 
 @JBossLog
@@ -43,7 +44,10 @@ private WebhookRepresentation toRepresentation(WebhookModel w) {
     webhook.setId(w.getId());
     webhook.setEnabled(w.isEnabled());
     webhook.setUrl(w.getUrl());
-    webhook.setCreatedBy(w.getCreatedBy().getId());
+    UserModel u = w.getCreatedBy();
+    if (u != null) {
+      webhook.setCreatedBy(u.getId());
+    }
     webhook.setCreatedAt(w.getCreatedAt());
     webhook.setRealm(w.getRealm().getName());
     webhook.setEventTypes(w.getEventTypes());