invalidates user when plugin reported deletion success

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index ada07aa53a9c3a3067af37bf1b28e846210759a4..a2b5c99a1c20c8c570c6da4a06b969f4fa4d59aa 100644 (file)
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -382,18 +382,21 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
        */
        public function deleteUser($uid) {
                if ($this->userPluginManager->canDeleteUser()) {
-                       return $this->userPluginManager->deleteUser($uid);
+                       $status = $this->userPluginManager->deleteUser($uid);
+                       if($status === false) {
+                               return false;
+                       }
                }
 
                $marked = $this->ocConfig->getUserValue($uid, 'user_ldap', 'isDeleted', 0);
                if((int)$marked === 0) {
                        \OC::$server->getLogger()->notice(
                                'User '.$uid . ' is not marked as deleted, not cleaning up.',
-                               array('app' => 'user_ldap'));
+                               ['app' => 'user_ldap']);
                        return false;
                }
                \OC::$server->getLogger()->info('Cleaning up after user ' . $uid,
-                       array('app' => 'user_ldap'));
+                       ['app' => 'user_ldap']);
 
                $this->access->getUserMapper()->unmap($uid); // we don't emit unassign signals here, since it is implicit to delete signals fired from core
                $this->access->userManager->invalidate($uid);

diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php
index e4f7bb8b6d29c5776a8182c1fc46677384a325b3..b89d6816c5a6d8c7946381535b4c1346138f7499 100644 (file)
--- a/apps/user_ldap/tests/User_LDAPTest.php
+++ b/apps/user_ldap/tests/User_LDAPTest.php
@@ -342,9 +342,27 @@ class User_LDAPTest extends TestCase {
                $this->pluginManager->expects($this->once())
                        ->method('deleteUser')
                        ->with('uid')
-                       ->willReturn('result');
+                       ->willReturn(true);
+
+               $this->config->expects($this->once())
+                       ->method('getUserValue')
+                       ->with('uid', 'user_ldap', 'isDeleted', 0)
+                       ->willReturn(1);
+
+               $mapper = $this->createMock(UserMapping::class);
+               $mapper->expects($this->once())
+                       ->method('unmap')
+                       ->with('uid');
+
+               $this->access->expects($this->atLeastOnce())
+                       ->method('getUserMapper')
+                       ->willReturn($mapper);
+
+               $this->userManager->expects($this->once())
+                       ->method('invalidate')
+                       ->with('uid');
 
-               $this->assertEquals($this->backend->deleteUser('uid'),'result');
+               $this->assertEquals(true, $this->backend->deleteUser('uid'));
        }
 
        /**