From 55c776f3e41f683cf287b5c8c3be0895f89010e8 Mon Sep 17 00:00:00 2001
From: Ruslan Musaev <43766501+HocKu7@users.noreply.github.com>
Date: Wed, 20 Aug 2025 12:38:55 +0200
Subject: [PATCH] dbeaver/pro#6326 fixes (#3674)

---
 .../src/io/cloudbeaver/model/apilog/ApiCallInterceptor.java     | 1 +
 .../src/io/cloudbeaver/server/graphql/GraphQLEndpoint.java      | 2 +-
 .../src/io/cloudbeaver/service/WebServiceServletBase.java       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/apilog/ApiCallInterceptor.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/apilog/ApiCallInterceptor.java
index 40a74c7eeb..f323842090 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/apilog/ApiCallInterceptor.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/apilog/ApiCallInterceptor.java
@@ -37,6 +37,7 @@ public interface ApiCallInterceptor {
         @NotNull HttpServletRequest request,
         @Nullable Map<String, Object> variables,
         @NotNull String apiCall,
+        @Nullable String userId,
         @NotNull LocalDateTime startTime,
         @Nullable String errorMessage,
         @NotNull String apiProtocol
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLEndpoint.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLEndpoint.java
index 49f19c97bb..ca011b8bb7 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLEndpoint.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLEndpoint.java
@@ -271,7 +271,7 @@ public class GraphQLEndpoint extends HttpServlet {
                 errorMessage = executionException.getMessage();
             }
             if (WebAppUtils.getWebApplication() instanceof ApiCallInterceptor apiCallInterceptor) {
-                apiCallInterceptor.onApiCallEvent(request, variables, operationName, startTime, errorMessage, API_PROTOCOL);
+                apiCallInterceptor.onApiCallEvent(request, variables, operationName, userId, startTime, errorMessage, API_PROTOCOL);
             }
         }
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceServletBase.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceServletBase.java
index 8fbd1b8888..a7709f7db2 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceServletBase.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceServletBase.java
@@ -75,7 +75,7 @@ public abstract class WebServiceServletBase extends HttpServlet {
         } finally {
             if (WebAppUtils.getWebApplication() instanceof ApiCallInterceptor apiCallInterceptor) {
                 apiCallInterceptor.onApiCallEvent(
-                    request, getVariables(request), request.getRequestURI(), startTime, errorMessage, API_PROTOCOL
+                    request, getVariables(request), request.getRequestURI(), null, startTime, errorMessage, API_PROTOCOL
                 );
             }
         }