Retrieve realm from correct field in admin events (#79)

* Retrieve realm from correct place

* Better bugfix and extra unit test

* test/test event case also covered by tests

* Test "user remove" events too

* Created from master / deleted from another realm case also covered

.gitignore

@@ -9,3 +9,4 @@ NOTES
 .factorypath
 .project
 .settings/
+bin

src/main/java/io/phasetwo/keycloak/events/WebhookSenderEventListenerProvider.java

@@ -157,12 +157,12 @@ private ExtendedAdminEvent completeAdminEventAttributes(String uid, Event event)
   }
 
   private ExtendedAdminEvent completeAdminEventAttributes(String uid, AdminEvent adminEvent) {
-    RealmModel realm = session.realms().getRealm(adminEvent.getAuthDetails().getRealmId());
-    ExtendedAdminEvent extendedAdminEvent = new ExtendedAdminEvent(uid, adminEvent, realm);
+    RealmModel eventRealm = session.realms().getRealm(adminEvent.getRealmId());
+    RealmModel authRealm = session.realms().getRealm(adminEvent.getAuthDetails().getRealmId());
+    ExtendedAdminEvent extendedAdminEvent = new ExtendedAdminEvent(uid, adminEvent, eventRealm, authRealm);
     // add always missing agent username
     ExtendedAuthDetails extendedAuthDetails = extendedAdminEvent.getAuthDetails();
     if (!Strings.isNullOrEmpty(extendedAuthDetails.getUserId())) {
-      RealmModel authRealm = session.realms().getRealm(adminEvent.getAuthDetails().getRealmId());
       UserModel user = session.users().getUserById(authRealm, extendedAuthDetails.getUserId());
       extendedAuthDetails.setUsername(user.getUsername());
     }

src/main/java/io/phasetwo/keycloak/representation/ExtendedAdminEvent.java

@@ -36,14 +36,14 @@ private static String createType(Event event) {
 
   public ExtendedAdminEvent() {}
 
-  public ExtendedAdminEvent(String uid, AdminEvent event, RealmModel realm) {
+  public ExtendedAdminEvent(String uid, AdminEvent event, RealmModel eventRealm, RealmModel authRealm) {
     this.uid = uid;
     this.type = createType(event);
 
     setTime(event.getTime());
-    setRealmId(realm.getName());
+    setRealmId(eventRealm.getName());
     setAuthDetails(event.getAuthDetails());
-    extAuthDetails.setRealmId(realm.getName());
+    extAuthDetails.setRealmId(authRealm.getName());
     setResourceType(event.getResourceType());
     setResourceTypeAsString(event.getResourceTypeAsString());
     setOperationType(event.getOperationType());

src/test/java/io/phasetwo/keycloak/Helpers.java

@@ -87,6 +87,20 @@ public static String createWebhook(
     return id;
   }
 
+  public static void removeWebhook(
+	      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));
+	  }
+
   public static String urlencode(String u) {
     try {
       return URLEncoder.encode(u, "UTF-8");