diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java index 1b2a3d60bde..a29ec53d25e 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java @@ -49,9 +49,9 @@ public static String getUserId(@NotNull HttpServletRequest request) { String userId = session.getUserContext().getUserId(); if (userId == null) { if (session.getUserContext().isAuthorizedInSecurityManager()) { - return QMConstants.QM_ANONYMOUS_DOMAIN; + return QMConstants.QM_ANONYMOUS_USER; } - return QMConstants.QM_UNAUTHORIZED_DOMAIN; + return QMConstants.QM_UNAUTHORIZED_USER; } return userId; } 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 a7709f7db2a..e6d3e9aa855 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 @@ protected final void service(HttpServletRequest request, HttpServletResponse res } finally { if (WebAppUtils.getWebApplication() instanceof ApiCallInterceptor apiCallInterceptor) { apiCallInterceptor.onApiCallEvent( - request, getVariables(request), request.getRequestURI(), null, startTime, errorMessage, API_PROTOCOL + request, getVariables(request), request.getRequestURI(), webSession.getUserId(), startTime, errorMessage, API_PROTOCOL ); } } diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java index 851edd2f6fc..7df05d3c467 100644 --- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java +++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java @@ -44,6 +44,7 @@ import org.jkiss.dbeaver.model.auth.SMAuthStatus; import org.jkiss.dbeaver.model.auth.SMSessionExternal; import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor; +import org.jkiss.dbeaver.model.qm.QMConstants; import org.jkiss.dbeaver.model.security.SMConstants; import org.jkiss.dbeaver.model.security.SMController; import org.jkiss.dbeaver.model.security.SMSubjectType; @@ -385,7 +386,7 @@ private WebUserInfo getAnonymousUserInfo(@NotNull WebSession webSession) { if (!application.getAppConfiguration().isAnonymousAccessEnabled() || !webSession.isAuthorizedInSecurityManager()) { return null; } - SMUser anonymous = new SMUser("anonymous", true, null); + SMUser anonymous = new SMUser(QMConstants.QM_ANONYMOUS_USER, true, null); return new WebUserInfo(webSession, new WebUser(anonymous)); } }