Add handling for geolocation data for audit logs

aq-ikhwa-tech · ludomikula · commit a8cc6d98aa77 · 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
@@ -17,6 +17,7 @@ public abstract class AbstractEvent implements LowcoderEvent
     protected final String userId;
 	protected final String sessionHash;
 	protected final Boolean isAnonymous;
+	private final String ipAddress;
     protected Map<String, Object> details;
     
     public Map<String, Object> details()
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/ApiCallEventPublisher.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/ApiCallEventPublisher.java
@@ -64,7 +64,7 @@ public Object handleAPICallEvent(ProceedingJoinPoint joinPoint) throws Throwable
                             }
                             MultiValueMap<String, String> headers = writableHttpHeaders(request.getHeaders());
                             headers.remove("Cookie");
-                            headers.remove("X-Real-IP");
+                            String ipAddress = headers.remove("X-Real-IP").stream().findFirst().get();
                             APICallEvent event = APICallEvent.builder()
                                     .userId(orgMember.getUserId())
                                     .orgId(orgMember.getOrgId())
@@ -75,6 +75,7 @@ public Object handleAPICallEvent(ProceedingJoinPoint joinPoint) throws Throwable
                                     .requestUri(request.getURI().getPath())
                                     .headers(headers)
                                     .queryParams(request.getQueryParams())
+                                    .ipAddress(ipAddress)
                                     .build();
                             event.populateDetails();
                             applicationEventPublisher.publishEvent(event);
