Add handling for audit logs feature

aq-ikhwa-tech · ludomikula · commit 4930575de212 · 2023-11-24T20:03:52.000+01:00
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java
@@ -1,5 +1,6 @@
 package org.lowcoder.infra.event;
 
+import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -14,9 +15,11 @@ public abstract class AbstractEvent implements LowcoderEvent
 {
     protected final String orgId;
     protected final String userId;
-    protected Map<String, String> details;
+	protected final String sessionHash;
+	protected final Boolean isAnonymous;
+    protected Map<String, Object> details;
     
-    public Map<String, String> details()
+    public Map<String, Object> details()
     {
     	return this.details;
     }
@@ -33,4 +36,20 @@ public B detail(String name, String value)
     		return self();
     	}
     }
+
+	public void populateDetails() {
+		if (details == null) {
+			details = new HashMap<>();
+		}
+		for(Field f : getClass().getDeclaredFields()){
+			Object value = null;
+			try {
+				f.setAccessible(Boolean.TRUE);
+				value = f.get(this);
+				details.put(f.getName(), value);
+			} catch (Exception e) {
+            }
+
+		}
+	}
 }
diff --git a/server/api-service/lowcoder-server/pom.xml b/server/api-service/lowcoder-server/pom.xml
@@ -214,6 +214,9 @@
             <artifactId>jjwt-impl</artifactId>
             <version>0.11.5</version>
             <scope>runtime</scope>
+	</dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/plugin/data/PluginServerRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/plugin/data/PluginServerRequest.java
@@ -1,5 +1,13 @@
 package org.lowcoder.api.framework.plugin.data;
 
+import org.lowcoder.plugin.api.PluginEndpoint;
+import org.lowcoder.plugin.api.PluginEndpoint.Method;
+import org.lowcoder.plugin.api.data.EndpointRequest;
+import org.springframework.http.HttpCookie;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.web.reactive.function.server.ServerRequest;
+
 import java.net.URI;
 import java.security.Principal;
 import java.util.AbstractMap.SimpleEntry;
@@ -10,14 +18,6 @@
 import java.util.Map.Entry;
 import java.util.concurrent.CompletableFuture;
 
-import org.lowcoder.plugin.api.PluginEndpoint;
-import org.lowcoder.plugin.api.PluginEndpoint.Method;
-import org.lowcoder.plugin.api.data.EndpointRequest;
-import org.springframework.http.HttpCookie;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.web.reactive.function.server.ServerRequest;
-
 public class PluginServerRequest implements EndpointRequest 
 {
 	private URI uri;
@@ -27,6 +27,8 @@ public class PluginServerRequest implements EndpointRequest
 	private Map<String, List<Map.Entry<String, String>>> cookies;
 	private Map<String, Object> attributes;
 	private Map<String, String> pathVariables;
+
+	private Map<String, List<String>> queryParams;
 	private CompletableFuture<? extends Principal> principal;
 
 
@@ -36,6 +38,7 @@ public PluginServerRequest()
 		cookies = new HashMap<>();
 		attributes = new HashMap<>();
 		pathVariables = new HashMap<>();
+		queryParams = new HashMap<>();
 	}
 	
 	public static PluginServerRequest fromServerRequest(ServerRequest request)
@@ -74,6 +77,14 @@ public static PluginServerRequest fromServerRequest(ServerRequest request)
 					psr.pathVariables.put(entry.getKey(), entry.getValue());
 				});
 		}
+
+		if (request.queryParams() != null)
+		{
+			request.queryParams().entrySet()
+					.forEach(entry -> {
+						psr.queryParams.put(entry.getKey(), entry.getValue());
+					});
+		}
 		
 		psr.principal =  request.principal().toFuture();
 		
@@ -125,6 +136,11 @@ public Map<String, Object> attributes() {
 	public Map<String, String> pathVariables() {
 		return pathVariables;
 	}
+
+	@Override
+	public Map<String, List<String>> queryParams() {
+		return queryParams;
+	}
 	@Override
 	public CompletableFuture<? extends Principal> principal() {
 		return principal;
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java
@@ -39,6 +39,7 @@
 import org.lowcoder.infra.event.user.UserLoginEvent;
 import org.lowcoder.infra.event.user.UserLogoutEvent;
 import org.lowcoder.plugin.api.event.LowcoderEvent.EventType;
+import org.lowcoder.sdk.constants.Authentication;
 import org.lowcoder.sdk.util.LocaleUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
