diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java index 40a1e84267..d763f4b12d 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java @@ -29,7 +29,6 @@ import org.jkiss.dbeaver.model.auth.SMAuthSpace; import org.jkiss.dbeaver.model.auth.SMSessionContext; import org.jkiss.dbeaver.model.auth.impl.AbstractSessionPersistent; import org.jkiss.dbeaver.model.meta.Property; -import org.jkiss.dbeaver.model.security.user.SMTeam; import org.jkiss.dbeaver.model.websocket.event.WSEvent; import org.jkiss.dbeaver.model.websocket.event.WSEventDeleteTempFile; import org.jkiss.dbeaver.model.websocket.event.session.WSSessionExpiredEvent; @@ -37,7 +36,6 @@ import org.jkiss.dbeaver.model.websocket.event.session.WSSessionExpiredEvent; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.Arrays; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -124,12 +122,6 @@ public abstract class BaseWebSession extends AbstractSessionPersistent { userContext.refreshPermissions(); if (userContext.isAuthorizedInSecurityManager()) { userContext.refreshAccessibleProjects(); - if (userContext.getUser() != null) { - List userTeamIds = Arrays.stream(userContext.getSecurityController().getCurrentUserTeams()) - .map(SMTeam::getTeamId) - .toList(); - userContext.getUser().setTeams(userTeamIds.toArray(new String[0])); - } } } catch (DBException e) { addSessionError(e); diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/user/WebUser.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/user/WebUser.java index 4297584009..a41c5aa21e 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/user/WebUser.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/user/WebUser.java @@ -77,10 +77,6 @@ public class WebUser { return user.getUserTeams(); } - public void setTeams(@NotNull String[] teams) { - user.setUserTeams(teams); - } - @Override public int hashCode() { return user.getUserId().hashCode(); diff --git a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/events/WSSubjectPermissionUpdatedEventHandler.java b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/events/WSSubjectPermissionUpdatedEventHandler.java index c742bb976e..513b4eca5b 100644 --- a/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/events/WSSubjectPermissionUpdatedEventHandler.java +++ b/server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/events/WSSubjectPermissionUpdatedEventHandler.java @@ -40,6 +40,7 @@ public class WSSubjectPermissionUpdatedEventHandler extends WSDefaultEventHandle activeUserSession.addSessionError(e); log.error("Error refreshing session", e); } + activeUserSession.refreshUserData(); var newUserPermissions = activeUserSession.getUserContext().getUserPermissions(); boolean shouldUpdateData = activeUserSession instanceof WebHeadlessSession || !(SMUtils.isRMAdmin(oldUserPermissions) && SMUtils.isRMAdmin(newUserPermissions)); @@ -53,7 +54,6 @@ public class WSSubjectPermissionUpdatedEventHandler extends WSDefaultEventHandle if (!super.isAcceptableInSession(activeUserSession, event)) { return false; } - activeUserSession.refreshUserData(); var user = activeUserSession.getUserContext().getUser(); if (user == null) { return false;