added pagination to webhooks list. formatting. (#89)

p2-inc · Jan 6, 2025 · 5efe9da · 5efe9da
1 parent 4dbd2c2
commit 5efe9da
Show file tree

Hide file tree

Showing 5 changed files with 277 additions and 289 deletions.
diff --git a/src/main/java/io/phasetwo/keycloak/events/WebhookSenderEventListenerProvider.java b/src/main/java/io/phasetwo/keycloak/events/WebhookSenderEventListenerProvider.java
@@ -159,7 +159,8 @@ private ExtendedAdminEvent completeAdminEventAttributes(String uid, Event event)
   private ExtendedAdminEvent completeAdminEventAttributes(String uid, AdminEvent adminEvent) {
     RealmModel eventRealm = session.realms().getRealm(adminEvent.getRealmId());
     RealmModel authRealm = session.realms().getRealm(adminEvent.getAuthDetails().getRealmId());
-    ExtendedAdminEvent extendedAdminEvent = new ExtendedAdminEvent(uid, adminEvent, eventRealm, authRealm);
+    ExtendedAdminEvent extendedAdminEvent =
+        new ExtendedAdminEvent(uid, adminEvent, eventRealm, authRealm);
     // add always missing agent username
     ExtendedAuthDetails extendedAuthDetails = extendedAdminEvent.getAuthDetails();
     if (!Strings.isNullOrEmpty(extendedAuthDetails.getUserId())) {

diff --git a/src/main/java/io/phasetwo/keycloak/representation/ExtendedAdminEvent.java b/src/main/java/io/phasetwo/keycloak/representation/ExtendedAdminEvent.java
@@ -36,7 +36,8 @@ private static String createType(Event event) {
 
   public ExtendedAdminEvent() {}
 
-  public ExtendedAdminEvent(String uid, AdminEvent event, RealmModel eventRealm, RealmModel authRealm) {
+  public ExtendedAdminEvent(
+      String uid, AdminEvent event, RealmModel eventRealm, RealmModel authRealm) {
     this.uid = uid;
     this.type = createType(event);
 

diff --git a/src/main/java/io/phasetwo/keycloak/resources/WebhooksResource.java b/src/main/java/io/phasetwo/keycloak/resources/WebhooksResource.java
@@ -32,11 +32,19 @@ public WebhooksResource(KeycloakSession session) {
     this.webhooks = session.getProvider(WebhookProvider.class);
   }
 
+  private static final Integer DEFAULT_MAX_RESULTS = 100;
+
   @GET
   @Produces(MediaType.APPLICATION_JSON)
-  public Stream<WebhookRepresentation> getWebhooks() {
+  public Stream<WebhookRepresentation> getWebhooks(
+      @QueryParam("first") Integer firstResult, @QueryParam("max") Integer maxResults) {
     permissions.realm().requireViewEvents();
-    return webhooks.getWebhooksStream(realm).map(w -> toRepresentation(w));
+    firstResult = firstResult != null ? firstResult : 0;
+    maxResults =
+        (maxResults != null && maxResults <= DEFAULT_MAX_RESULTS)
+            ? maxResults
+            : DEFAULT_MAX_RESULTS;
+    return webhooks.getWebhooksStream(realm, firstResult, maxResults).map(w -> toRepresentation(w));
   }
 
   private WebhookRepresentation toRepresentation(WebhookModel w) {

diff --git a/src/test/java/io/phasetwo/keycloak/Helpers.java b/src/test/java/io/phasetwo/keycloak/Helpers.java
@@ -88,18 +88,15 @@ public static String createWebhook(
   }
 
   public static void removeWebhook(
-	      Keycloak keycloak,
-	      CloseableHttpClient httpClient,
-	      String baseUrl,
-	      String webhookId)
-	      throws Exception {
+      Keycloak keycloak, CloseableHttpClient httpClient, String baseUrl, String webhookId)
+      throws Exception {
 
-	    LegacySimpleHttp.Response response =
-	        LegacySimpleHttp.doDelete(baseUrl + "/" + webhookId, httpClient)
-	            .auth(keycloak.tokenManager().getAccessTokenString())
-	            .asResponse();
-	    assertThat(response.getStatus(), is(204));
-	  }
+    LegacySimpleHttp.Response response =
+        LegacySimpleHttp.doDelete(baseUrl + "/" + webhookId, httpClient)
+            .auth(keycloak.tokenManager().getAccessTokenString())
+            .asResponse();
+    assertThat(response.getStatus(), is(204));
+  }
 
   public static String urlencode(String u) {
     try {