Users and groups deletion: use UsersService and RolesService instead of deleting directly in db to fix caching issues.

Author: cdujeu

core/src/core/src/pydio/Core/Services/UsersService.php

@@ -452,6 +452,7 @@ public static function deleteUser($userId)
         foreach ($subUsers as $deletedUser) {
             $authDriver->deleteUser($deletedUser);
         }
+        CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:user:".$userId);
         Controller::applyHook("user.after_delete", array($ctx, $userId));
         Logger::info(__CLASS__, "Delete User", array("user_id" => $userId, "sub_user" => implode(",", $subUsers)));
         return true;

core/src/plugins/conf.sql/SqlConfDriver.php

@@ -35,6 +35,7 @@
 use Pydio\Conf\Core\AjxpRole;
 
 use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\RolesService;
 use Pydio\Core\Services\UsersService;
 use Pydio\Core\Utils\DBHelper;
 use Pydio\Core\Utils\Vars\InputFilter;
@@ -919,16 +920,23 @@ public function relabelGroup($groupPath, $groupLabel)
      */
     public function deleteGroup($groupPath)
     {
-        // Delete users of this group, as well as subgroups
-        $res = dibi::query("SELECT * FROM [ajxp_users] WHERE [groupPath] LIKE %like~ OR [groupPath] = %s ORDER BY [login] ASC", $groupPath."/", $groupPath);
+        // Delete users of this group
+        $res = dibi::query("SELECT [login] FROM [ajxp_users] WHERE [groupPath] LIKE %like~ OR [groupPath] = %s ORDER BY [login] ASC", $groupPath."/", $groupPath);
         $rows = $res->fetchAll();
-        $subUsers = array();
         foreach ($rows as $row) {
-            $this->deleteUser($row["login"], $subUsers);
-            dibi::query("DELETE FROM [ajxp_users] WHERE [login] = %s", $row["login"]);
+            UsersService::deleteUser($row["login"]);
         }
+
+        // Delete associated roles
+        $res = dibi::query("SELECT [groupPath] FROM [ajxp_groups] WHERE [groupPath] LIKE %like~ OR [groupPath] = %s", $groupPath."/", $groupPath);
+        $rows = $res->fetchAll();
+        foreach($rows as $row){
+            RolesService::deleteRole('AJXP_GRP_'.$row['groupPath']);
+        }
+
+        // Now delete groups and subgroups
         dibi::query("DELETE FROM [ajxp_groups] WHERE [groupPath] LIKE %like~ OR [groupPath] = %s", $groupPath."/", $groupPath);
-        dibi::query('DELETE FROM [ajxp_roles] WHERE [role_id] = %s', 'AJXP_GRP_'.$groupPath);
+
     }
 
     /**
@@ -976,12 +984,12 @@ public function deleteUser($userId, &$deletedSubUsers)
             dibi::query('DELETE FROM [ajxp_user_prefs] WHERE [login] = %s', $userId);
             dibi::query('DELETE FROM [ajxp_user_bookmarks] WHERE [login] = %s', $userId);
             dibi::query('DELETE FROM [ajxp_user_teams] WHERE [owner_id] = %s', $userId);
-            dibi::query('DELETE FROM [ajxp_roles] WHERE [role_id] = %s', 'AJXP_USR_/'.$userId);
             dibi::commit();
             foreach ($children as $childId) {
                 $this->deleteUser($childId, $deletedSubUsers);
                 $deletedSubUsers[] = $childId;
             }
+            RolesService::deleteRole("AJXP_USR_/".$userId);
         } catch (DibiException $e) {
             throw new \Exception('Failed to delete user, Reason: '.$e->getMessage());
         }