opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

dbeaver/pro#6622 preference fixes after the demo (#3670) revert (#3679)

Browse Source 
This reverts commit 426fd40c82.
This commit is contained in:
Alexander Skoblikov
2025-08-20 10:33:11 +00:00
committed by GitHub
parent 426fd40c82
commit 8a4d88e721
3 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java
-8
View File
@@ -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<String> userTeamIds = Arrays.stream(userContext.getSecurityController().getCurrentUserTeams())
.map(SMTeam::getTeamId)
.toList();
userContext.getUser().setTeams(userTeamIds.toArray(new String[0]));
}
}
} catch (DBException e) {
addSessionError(e);
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/user/WebUser.java
-4
View File
@@ -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();
server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/events/WSSubjectPermissionUpdatedEventHandler.java
+1 -1
View File
@@ -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;