KEYCLOAK-432 Added user sessions

audit/api/src/main/java/org/keycloak/audit/Audit.java

@@ -4,6 +4,7 @@ import org.jboss.logging.Logger;
 import org.keycloak.models.ClientModel;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserModel;
+import org.keycloak.models.UserSessionModel;
 import org.keycloak.provider.ProviderFactoryLoader;
 
 import java.util.HashMap;
@@ -61,6 +62,16 @@ public class Audit {
         return this;
     }
 
+    public Audit session(UserSessionModel session) {
+        event.setSessionId(session.getId());
+        return this;
+    }
+
+    public Audit session(String sessionId) {
+        event.setSessionId(sessionId);
+        return this;
+    }
+
     public Audit ipAddress(String ipAddress) {
         event.setIpAddress(ipAddress);
         return this;

audit/api/src/main/java/org/keycloak/audit/Errors.java

@@ -34,4 +34,8 @@ public interface Errors {
     String SOCIAL_PROVIDER_NOT_FOUND = "social_provider_not_found";
     String SOCIAL_ID_IN_USE = "social_id_in_use";
 
+    String USER_NOT_LOGGED_IN = "user_not_logged_in";
+    String USER_SESSION_NOT_FOUND = "user_session_not_found";
+
+
 }

audit/api/src/main/java/org/keycloak/audit/Event.java

@@ -18,6 +18,8 @@ public class Event {
 
     private String userId;
 
+    private String sessionId;
+
     private String ipAddress;
 
     private String error;
@@ -64,6 +66,14 @@ public class Event {
         this.userId = userId;
     }
 
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
     public String getIpAddress() {
         return ipAddress;
     }
@@ -95,6 +105,7 @@ public class Event {
         clone.realmId = realmId;
         clone.clientId = clientId;
         clone.userId = userId;
+        clone.sessionId = sessionId;
         clone.ipAddress = ipAddress;
         clone.error = error;
         clone.details = details != null ? new HashMap<String, String>(details) : null;

audit/jpa/src/main/java/org/keycloak/audit/jpa/EventEntity.java

@@ -23,6 +23,8 @@ public class EventEntity {
 
     private String userId;
 
+    private String sessionId;
+
     private String ipAddress;
 
     private String error;
@@ -78,6 +80,14 @@ public class EventEntity {
         this.userId = userId;
     }
 
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
     public String getIpAddress() {
         return ipAddress;
     }

audit/jpa/src/main/java/org/keycloak/audit/jpa/JpaAuditProvider.java

@@ -83,6 +83,7 @@ public class JpaAuditProvider implements AuditProvider {
         e.setRealmId(o.getRealmId());
         e.setClientId(o.getClientId());
         e.setUserId(o.getUserId());
+        e.setSessionId(o.getSessionId());
         e.setIpAddress(o.getIpAddress());
         e.setError(o.getError());
         try {
@@ -100,6 +101,7 @@ public class JpaAuditProvider implements AuditProvider {
         e.setRealmId(o.getRealmId());
         e.setClientId(o.getClientId());
         e.setUserId(o.getUserId());
+        e.setSessionId(o.getSessionId());
         e.setIpAddress(o.getIpAddress());
         e.setError(o.getError());
         try {

audit/mongo/src/main/java/org/keycloak/audit/mongo/MongoAuditProvider.java

@@ -60,6 +60,7 @@ public class MongoAuditProvider implements AuditProvider {
         e.put("realmId", o.getRealmId());
         e.put("clientId", o.getClientId());
         e.put("userId", o.getUserId());
+        e.put("sessionId", o.getSessionId());
         e.put("ipAddress", o.getIpAddress());
         e.put("error", o.getError());
 
@@ -81,6 +82,7 @@ public class MongoAuditProvider implements AuditProvider {
         e.setRealmId(o.getString("realmId"));
         e.setClientId(o.getString("clientId"));
         e.setUserId(o.getString("userId"));
+        e.setSessionId(o.getString("sessionId"));
         e.setIpAddress(o.getString("ipAddress"));
         e.setError(o.getString("error"));