fixed: when updating a user permission by DELETING a user from a certain role, it drops ALL the users. Also if you add a user to a role it will still keep the role on previously added users

Author: AleSim94

src/extensions/rbac/RBACManagementModal.tsx

@@ -80,7 +80,6 @@ export const RBACManagementModal = ({ open, handleClose, currentRole, createNoti
 
   const handleSave = async () => {
     createNotification('Updating', `Access for role '${currentRole}' is being updated, please wait...`);
-    console.log(selectedUsers);
     updateUsers(
       driver,
       currentRole,

src/extensions/rbac/RBACUtils.ts

@@ -265,34 +265,36 @@ export async function updateUsers(driver, currentRole, allUsers, selectedUsers,
     `REVOKE ROLE ${currentRole} FROM ${escapedAllUsers}`,
     {},
     1000,
-    (status) => {
+    async (status) => {
       globalStatus = status;
+      if (globalStatus == QueryStatus.NO_DATA || globalStatus == QueryStatus.COMPLETE) {
+        //  TODO: Neo4j is very slow in updating after the previous query, even though it is technically a finished query.
+        // We build in an artificial delay... This must be improved the future.
+        setTimeout(async () => {
+          if (selectedUsers.length > 0) {
+            const escapedSelectedUsers = selectedUsers.map((user) => `\`${user}\``).join(',');
+            await runCypherQuery(
+              driver,
+              'system',
+              `GRANT ROLE ${currentRole} TO ${escapedSelectedUsers};`,
+              {},
+              1000,
+              (status) => {
+                if (status == QueryStatus.NO_DATA || QueryStatus.COMPLETE) {
+                  onSuccess();
+                }
+              }
+            );
+          } else {
+            onSuccess();
+          }
+        }, 2000);
+      }
     },
     (records) => {
       if (records && records[0] && records[0].error) {
         onFail(records[0].error);
       }
     }
   );
-  if (globalStatus == QueryStatus.NO_DATA || globalStatus == QueryStatus.COMPLETE) {
-    //  TODO: Neo4j is very slow in updating after the previous query, even though it is technically a finished query.
-    // We build in an artificial delay...
-    if (selectedUsers.length > 0) {
-      const escapedSelectedUsers = selectedUsers.map((user) => `\`${user}\``).join(',');
-      await runCypherQuery(
-        driver,
-        'system',
-        `GRANT ROLE ${currentRole} TO ${escapedSelectedUsers}`,
-        {},
-        1000,
-        (status) => {
-          if (status == QueryStatus.NO_DATA || QueryStatus.COMPLETE) {
-            onSuccess();
-          }
-        }
-      );
-    } else {
-      onSuccess();
-    }
-  }
 }