Add representation field in Admin Event

This closes #9

Depends-On: https://softwarefactory-project.io/r/c/software-factory/keycloak-extensions-ci/+/28882

Change-Id: I332a39a1dd25066ee65c36d0350e1e37d0fb9136

Author: mhuin

.zuul.yaml

@@ -3,8 +3,12 @@
     check:
       jobs:
         - keycloak-extensions-maven-build
-        - keycloak-extensions-test-deploy
+        - keycloak-extensions-test-deploy-21.0
+        - keycloak-extensions-test-deploy-latest:
+            voting: false
     gate:
       jobs:
         - keycloak-extensions-maven-build
-        - keycloak-extensions-test-deploy
+        - keycloak-extensions-test-deploy-21.0
+        - keycloak-extensions-test-deploy-latest:
+            voting: false

src/main/java/org/softwarefactory/keycloak/providers/events/mqtt/MQTTEventListenerProvider.java

@@ -88,14 +88,14 @@ private MqttMessage toPayload(String s) {
     private String convertEvent(Event event) {
         JSONObject ev = new JSONObject();
 
-        ev.put("type", event.getType().toString());
-        ev.put("realmId", event.getRealmId());
         ev.put("clientId", event.getClientId());
-        ev.put("userId", event.getUserId());
+        ev.put("error", event.getError());
         ev.put("ipAddress", event.getIpAddress());
+        ev.put("realmId", event.getRealmId());
+        ev.put("sessionId", event.getSessionId());
         ev.put("time", event.getTime());
-
-        ev.put("error", event.getError());
+        ev.put("type", event.getType().toString());
+        ev.put("userId", event.getUserId());
 
         JSONObject evDetails = new JSONObject();
         if (event.getDetails() != null) {
@@ -111,16 +111,17 @@ private String convertEvent(Event event) {
     private String convertAdminEvent(AdminEvent adminEvent) {
         JSONObject ev = new JSONObject();
 
-        ev.put("type", adminEvent.getOperationType().toString());
-        ev.put("realmId", adminEvent.getAuthDetails().getRealmId());
+
         ev.put("clientId", adminEvent.getAuthDetails().getClientId());
-        ev.put("userId", adminEvent.getAuthDetails().getUserId());
+        ev.put("error", adminEvent.getError());
         ev.put("ipAddress", adminEvent.getAuthDetails().getIpAddress());
-        ev.put("time", adminEvent.getTime());
+        ev.put("realmId", adminEvent.getAuthDetails().getRealmId());
+        ev.put("representation", adminEvent.getRepresentation());
         ev.put("resourcePath", adminEvent.getResourcePath());
         ev.put("resourceType", adminEvent.getResourceTypeAsString());
-
-        ev.put("error", adminEvent.getError());
+        ev.put("time", adminEvent.getTime());
+        ev.put("type", adminEvent.getOperationType().toString());
+        ev.put("userId", adminEvent.getAuthDetails().getUserId());
 
         return ev.toString();
     }