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 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 ); } }