CB-3945 subject object event fixes

dbeaver · Sep 20, 2023 · 1f76bef · 1f76bef
1 parent 18b8f6d
commit 1f76bef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebUserContext.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebUserContext.java
@@ -147,6 +147,7 @@ public synchronized void refreshSMSession() throws DBException {
             smCredentials.getSmSessionId(),
             smCredentials.getPermissions()
         );
+        setUser(user == null ? null : new WebUser(securityController.getCurrentUser()));
     }
 
     /**

diff --git a/...er.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java b/...er.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
@@ -2213,11 +2213,7 @@ public void setObjectPermissions(
         @NotNull Set<String> permissions,
         @NotNull String grantor
     ) throws DBException {
-        if (CommonUtils.isEmpty(objectIds)) {
-            subjectIds.forEach(id -> addSubjectPermissionsUpdateEvent(id, null));
-            return;
-        } else if (CommonUtils.isEmpty(subjectIds)) {
-            addObjectPermissionsUpdateEvent(objectIds, objectType);
+        if (CommonUtils.isEmpty(objectIds) || CommonUtils.isEmpty(subjectIds)) {
             return;
         }
         Set<String> filteredSubjects = getFilteredSubjects(subjectIds);
@@ -2307,6 +2303,7 @@ public void deleteAllObjectPermissions(@NotNull String objectId, @NotNull SMObje
         } catch (SQLException e) {
             throw new DBCException("Error deleting object permissions", e);
         }
+        addObjectPermissionsUpdateEvent(Set.of(objectId), objectType);
     }
 
     @Override
@@ -2321,6 +2318,7 @@ public void deleteAllSubjectObjectPermissions(@NotNull String subjectId, @NotNul
         } catch (SQLException e) {
             throw new DBCException("Error deleting subject permissions", e);
         }
+        addSubjectPermissionsUpdateEvent(subjectId, null);
     }
 
     @NotNull
-Original file line number
+Diff line change
@@ Expand Up @@
                 smCredentials.getSmSessionId(),
                 smCredentials.getPermissions()
             );
+            setUser(user == null ? null : new WebUser(securityController.getCurrentUser()));
         }
         /**
@@ Expand Down @@