From 7db01ff8055c660dfaa2ab9d88865245dcac9e62 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 23 Aug 2016 15:43:54 +0200 Subject: [PATCH 1/7] delete calendars when users are deleted Signed-off-by: Lukas Reschke --- apps/dav/lib/HookManager.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php index 5a3e328f70..9a14c322d0 100644 --- a/apps/dav/lib/HookManager.php +++ b/apps/dav/lib/HookManager.php @@ -40,6 +40,9 @@ class HookManager { /** @var IUser[] */ private $usersToDelete; + /** @var array */ + private $calendarsToDelete; + /** @var CalDavBackend */ private $calDav; @@ -85,7 +88,11 @@ class HookManager { } public function preDeleteUser($params) { - $this->usersToDelete[$params['uid']] = $this->userManager->get($params['uid']); + $user = $this->userManager->get($params['uid']); + + $this->usersToDelete[$params['uid']] = $user; + + $this->calendarsToDelete = $this->calDav->getCalendarsForUser('principals/users/' . $user->getUID()); } public function postDeleteUser($params) { @@ -93,6 +100,11 @@ class HookManager { if (isset($this->usersToDelete[$uid])){ $this->syncService->deleteUser($this->usersToDelete[$uid]); } + if (!is_null($this->calendarsToDelete)) { + foreach ($this->calendarsToDelete as $calendar) { + $this->calDav->deleteCalendar($calendar['id']); + } + } } public function changeUser($params) { From 18c07f06929679cccf0b1dabe55bb549bae32ddd Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 23 Aug 2016 16:20:41 +0200 Subject: [PATCH 2/7] delete also addressbooks on user deletion Signed-off-by: Lukas Reschke --- apps/dav/lib/HookManager.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php index 9a14c322d0..f82e642c00 100644 --- a/apps/dav/lib/HookManager.php +++ b/apps/dav/lib/HookManager.php @@ -43,6 +43,9 @@ class HookManager { /** @var array */ private $calendarsToDelete; + /** @var array */ + private $addressBooksToDelete; + /** @var CalDavBackend */ private $calDav; @@ -93,6 +96,7 @@ class HookManager { $this->usersToDelete[$params['uid']] = $user; $this->calendarsToDelete = $this->calDav->getCalendarsForUser('principals/users/' . $user->getUID()); + $this->addressBooksToDelete = $this->cardDav->getAddressBooksForUser('principals/users/' . $user->getUID()); } public function postDeleteUser($params) { @@ -105,6 +109,11 @@ class HookManager { $this->calDav->deleteCalendar($calendar['id']); } } + if (!is_null($this->addressBooksToDelete)) { + foreach ($this->addressBooksToDelete as $addressBook) { + $this->cardDav->deleteAddressBook($addressBook['id']); + } + } } public function changeUser($params) { From 97a47f49a14a9dd2b0edb12ac54649cf9f66584a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 22 Sep 2016 11:24:33 +0200 Subject: [PATCH 3/7] Adjust delete logic and ann unit tests Signed-off-by: Lukas Reschke --- apps/dav/lib/HookManager.php | 29 +++------ apps/dav/tests/unit/DAV/HookManagerTest.php | 72 ++++++++++++++++----- 2 files changed, 66 insertions(+), 35 deletions(-) diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php index f82e642c00..03728eaf59 100644 --- a/apps/dav/lib/HookManager.php +++ b/apps/dav/lib/HookManager.php @@ -40,12 +40,6 @@ class HookManager { /** @var IUser[] */ private $usersToDelete; - /** @var array */ - private $calendarsToDelete; - - /** @var array */ - private $addressBooksToDelete; - /** @var CalDavBackend */ private $calDav; @@ -91,12 +85,7 @@ class HookManager { } public function preDeleteUser($params) { - $user = $this->userManager->get($params['uid']); - - $this->usersToDelete[$params['uid']] = $user; - - $this->calendarsToDelete = $this->calDav->getCalendarsForUser('principals/users/' . $user->getUID()); - $this->addressBooksToDelete = $this->cardDav->getAddressBooksForUser('principals/users/' . $user->getUID()); + $this->usersToDelete[$params['uid']] = $this->userManager->get($params['uid']); } public function postDeleteUser($params) { @@ -104,15 +93,15 @@ class HookManager { if (isset($this->usersToDelete[$uid])){ $this->syncService->deleteUser($this->usersToDelete[$uid]); } - if (!is_null($this->calendarsToDelete)) { - foreach ($this->calendarsToDelete as $calendar) { - $this->calDav->deleteCalendar($calendar['id']); - } + + $calendarsToDelete = $this->calDav->getCalendarsForUser('principals/users/' . $uid); + foreach ($calendarsToDelete as $calendar) { + $this->calDav->deleteCalendar($calendar['id']); } - if (!is_null($this->addressBooksToDelete)) { - foreach ($this->addressBooksToDelete as $addressBook) { - $this->cardDav->deleteAddressBook($addressBook['id']); - } + + $addressBooksToDelete = $this->cardDav->getAddressBooksForUser('principals/users/' . $uid); + foreach ($addressBooksToDelete as $addressBook) { + $this->cardDav->deleteAddressBook($addressBook['id']); } } diff --git a/apps/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php index 0db66bf76c..05384813f0 100644 --- a/apps/dav/tests/unit/DAV/HookManagerTest.php +++ b/apps/dav/tests/unit/DAV/HookManagerTest.php @@ -28,29 +28,30 @@ use OCA\DAV\CalDAV\CalDavBackend; use OCA\DAV\CardDAV\CardDavBackend; use OCA\DAV\CardDAV\SyncService; use OCA\DAV\HookManager; +use OCP\IUser; use OCP\IUserManager; use Test\TestCase; class HookManagerTest extends TestCase { public function test() { - $user = $this->getMockBuilder('\OCP\IUser') + $user = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $user->expects($this->once())->method('getUID')->willReturn('newUser'); /** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ - $userManager = $this->getMockBuilder('\OCP\IUserManager') + $userManager = $this->getMockBuilder(IUserManager::class) ->disableOriginalConstructor() ->getMock(); $userManager->expects($this->once())->method('get')->willReturn($user); /** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */ - $syncService = $this->getMockBuilder('OCA\DAV\CardDAV\SyncService') + $syncService = $this->getMockBuilder(SyncService::class) ->disableOriginalConstructor() ->getMock(); /** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */ - $cal = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend') + $cal = $this->getMockBuilder(CalDavBackend::class) ->disableOriginalConstructor() ->getMock(); $cal->expects($this->once())->method('getCalendarsForUserCount')->willReturn(0); @@ -59,7 +60,7 @@ class HookManagerTest extends TestCase { 'personal', ['{DAV:}displayname' => 'Personal']); /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ - $card = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend') + $card = $this->getMockBuilder(CardDavBackend::class) ->disableOriginalConstructor() ->getMock(); $card->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(0); @@ -72,31 +73,31 @@ class HookManagerTest extends TestCase { } public function testWithExisting() { - $user = $this->getMockBuilder('\OCP\IUser') + $user = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $user->expects($this->once())->method('getUID')->willReturn('newUser'); /** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ - $userManager = $this->getMockBuilder('\OCP\IUserManager') + $userManager = $this->getMockBuilder(IUserManager::class) ->disableOriginalConstructor() ->getMock(); $userManager->expects($this->once())->method('get')->willReturn($user); /** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */ - $syncService = $this->getMockBuilder('OCA\DAV\CardDAV\SyncService') + $syncService = $this->getMockBuilder(SyncService::class) ->disableOriginalConstructor() ->getMock(); /** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */ - $cal = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend') + $cal = $this->getMockBuilder(CalDavBackend::class) ->disableOriginalConstructor() ->getMock(); $cal->expects($this->once())->method('getCalendarsForUserCount')->willReturn(1); $cal->expects($this->never())->method('createCalendar'); /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ - $card = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend') + $card = $this->getMockBuilder(CardDavBackend::class) ->disableOriginalConstructor() ->getMock(); $card->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(1); @@ -107,24 +108,24 @@ class HookManagerTest extends TestCase { } public function testWithBirthdayCalendar() { - $user = $this->getMockBuilder('\OCP\IUser') + $user = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() ->getMock(); $user->expects($this->once())->method('getUID')->willReturn('newUser'); /** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ - $userManager = $this->getMockBuilder('\OCP\IUserManager') + $userManager = $this->getMockBuilder(IUserManager::class) ->disableOriginalConstructor() ->getMock(); $userManager->expects($this->once())->method('get')->willReturn($user); /** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */ - $syncService = $this->getMockBuilder('OCA\DAV\CardDAV\SyncService') + $syncService = $this->getMockBuilder(SyncService::class) ->disableOriginalConstructor() ->getMock(); /** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */ - $cal = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend') + $cal = $this->getMockBuilder(CalDavBackend::class) ->disableOriginalConstructor() ->getMock(); $cal->expects($this->once())->method('getCalendarsForUserCount')->willReturn(0); @@ -133,7 +134,7 @@ class HookManagerTest extends TestCase { 'personal', ['{DAV:}displayname' => 'Personal']); /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ - $card = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend') + $card = $this->getMockBuilder(CardDavBackend::class) ->disableOriginalConstructor() ->getMock(); $card->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(0); @@ -144,4 +145,45 @@ class HookManagerTest extends TestCase { $hm = new HookManager($userManager, $syncService, $cal, $card); $hm->postLogin(['uid' => 'newUser']); } + + public function testDeleteCalendar() { + $user = $this->getMockBuilder(IUser::class) + ->disableOriginalConstructor() + ->getMock(); + + /** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userManager */ + $userManager = $this->getMockBuilder(IUserManager::class) + ->disableOriginalConstructor() + ->getMock(); + $userManager->expects($this->once())->method('get')->willReturn($user); + + /** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $syncService */ + $syncService = $this->getMockBuilder(SyncService::class) + ->disableOriginalConstructor() + ->getMock(); + $syncService->expects($this->once()) + ->method('deleteUser'); + + /** @var CalDavBackend | \PHPUnit_Framework_MockObject_MockObject $cal */ + $cal = $this->getMockBuilder(CalDavBackend::class) + ->disableOriginalConstructor() + ->getMock(); + $cal->expects($this->once())->method('getCalendarsForUser')->willReturn([ + ['id' => 'personal'] + ]); + $cal->expects($this->once())->method('deleteCalendar'); + + /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ + $card = $this->getMockBuilder(CardDavBackend::class) + ->disableOriginalConstructor() + ->getMock(); + $card->expects($this->once())->method('getAddressBooksForUser')->willReturn([ + ['id' => 'personal'] + ]); + $card->expects($this->once())->method('deleteAddressBook'); + + $hm = new HookManager($userManager, $syncService, $cal, $card, $this->l10n); + $hm->preDeleteUser(['uid' => 'newUser']); + $hm->postDeleteUser(['uid' => 'newUser']); + } } From 5215833fe4b661c46dfed88eb29754011dbb899f Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 23 Sep 2016 14:30:24 +0200 Subject: [PATCH 4/7] delete shares to an user Signed-off-by: Lukas Reschke --- apps/dav/lib/CalDAV/CalDavBackend.php | 10 ++++++++++ apps/dav/lib/DAV/Sharing/Backend.php | 8 ++++++++ apps/dav/lib/HookManager.php | 1 + apps/dav/tests/unit/DAV/HookManagerTest.php | 1 + 4 files changed, 20 insertions(+) diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 17479c490a..367b239a67 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -507,6 +507,16 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $this->sharingBackend->deleteAllShares($calendarId); } + /** + * Delete all of an user's shares + * + * @param string $principaluri + * @return void + */ + function deleteAllSharesForUser($principaluri) { + $this->sharingBackend->deleteAllSharesByUser($principaluri); + } + /** * Returns all calendar objects within a calendar. * diff --git a/apps/dav/lib/DAV/Sharing/Backend.php b/apps/dav/lib/DAV/Sharing/Backend.php index 006fe334ba..f662d8e1b8 100644 --- a/apps/dav/lib/DAV/Sharing/Backend.php +++ b/apps/dav/lib/DAV/Sharing/Backend.php @@ -110,6 +110,14 @@ class Backend { ->execute(); } + public function deleteAllSharesByUser($principaluri) { + $query = $this->db->getQueryBuilder(); + $query->delete('dav_shares') + ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principaluri))) + ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType))) + ->execute(); + } + /** * @param IShareable $shareable * @param string $element diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php index 03728eaf59..1680a90775 100644 --- a/apps/dav/lib/HookManager.php +++ b/apps/dav/lib/HookManager.php @@ -98,6 +98,7 @@ class HookManager { foreach ($calendarsToDelete as $calendar) { $this->calDav->deleteCalendar($calendar['id']); } + $this->calDav->deleteAllSharesForUser('principals/users/' . $uid); $addressBooksToDelete = $this->cardDav->getAddressBooksForUser('principals/users/' . $uid); foreach ($addressBooksToDelete as $addressBook) { diff --git a/apps/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php index 05384813f0..cde24214dd 100644 --- a/apps/dav/tests/unit/DAV/HookManagerTest.php +++ b/apps/dav/tests/unit/DAV/HookManagerTest.php @@ -172,6 +172,7 @@ class HookManagerTest extends TestCase { ['id' => 'personal'] ]); $cal->expects($this->once())->method('deleteCalendar'); + $cal->expects($this->once())->method('deleteAllSharesForUser'); /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ $card = $this->getMockBuilder(CardDavBackend::class) From da1543eef7d0e00a928b582858fc0f906c671b36 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 25 Sep 2016 13:35:53 +0200 Subject: [PATCH 5/7] fix deletion of calendars Signed-off-by: Lukas Reschke --- apps/dav/lib/CalDAV/CalDavBackend.php | 42 +++++++++++++++++++++ apps/dav/lib/HookManager.php | 17 ++++++--- apps/dav/tests/unit/DAV/HookManagerTest.php | 2 +- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 367b239a67..535bf3956e 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -282,6 +282,48 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription return array_values($calendars); } + public function getUsersOwnCalendars($principalUri) { + $principalUri = $this->convertPrincipal($principalUri, true); + $fields = array_values($this->propertyMap); + $fields[] = 'id'; + $fields[] = 'uri'; + $fields[] = 'synctoken'; + $fields[] = 'components'; + $fields[] = 'principaluri'; + $fields[] = 'transparent'; + // Making fields a comma-delimited list + $query = $this->db->getQueryBuilder(); + $query->select($fields)->from('calendars') + ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri))) + ->orderBy('calendarorder', 'ASC'); + $stmt = $query->execute(); + $calendars = []; + while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) { + $components = []; + if ($row['components']) { + $components = explode(',',$row['components']); + } + $calendar = [ + 'id' => $row['id'], + 'uri' => $row['uri'], + 'principaluri' => $this->convertPrincipal($row['principaluri'], false), + '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'), + '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0', + '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components), + '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'), + ]; + foreach($this->propertyMap as $xmlName=>$dbName) { + $calendar[$xmlName] = $row[$dbName]; + } + if (!isset($calendars[$calendar['id']])) { + $calendars[$calendar['id']] = $calendar; + } + } + $stmt->closeCursor(); + return array_values($calendars); + } + + private function getUserDisplayName($uid) { if (!isset($this->userDisplayNames[$uid])) { $user = $this->userManager->get($uid); diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php index 1680a90775..e54a39acf2 100644 --- a/apps/dav/lib/HookManager.php +++ b/apps/dav/lib/HookManager.php @@ -46,6 +46,12 @@ class HookManager { /** @var CardDavBackend */ private $cardDav; + /** @var array */ + private $calendarsToDelete; + + /** @var array */ + private $addressBooksToDelete; + public function __construct(IUserManager $userManager, SyncService $syncService, CalDavBackend $calDav, @@ -85,7 +91,10 @@ class HookManager { } public function preDeleteUser($params) { - $this->usersToDelete[$params['uid']] = $this->userManager->get($params['uid']); + $uid = $params['uid']; + $this->usersToDelete[$uid] = $this->userManager->get($uid); + $this->calendarsToDelete = $this->calDav->getUsersOwnCalendars('principals/users/' . $uid); + $this->addressBooksToDelete = $this->cardDav->getAddressBooksForUser('principals/users/' . $uid); } public function postDeleteUser($params) { @@ -94,14 +103,12 @@ class HookManager { $this->syncService->deleteUser($this->usersToDelete[$uid]); } - $calendarsToDelete = $this->calDav->getCalendarsForUser('principals/users/' . $uid); - foreach ($calendarsToDelete as $calendar) { + foreach ($this->calendarsToDelete as $calendar) { $this->calDav->deleteCalendar($calendar['id']); } $this->calDav->deleteAllSharesForUser('principals/users/' . $uid); - $addressBooksToDelete = $this->cardDav->getAddressBooksForUser('principals/users/' . $uid); - foreach ($addressBooksToDelete as $addressBook) { + foreach ($this->addressBooksToDelete as $addressBook) { $this->cardDav->deleteAddressBook($addressBook['id']); } } diff --git a/apps/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php index cde24214dd..4a60542a01 100644 --- a/apps/dav/tests/unit/DAV/HookManagerTest.php +++ b/apps/dav/tests/unit/DAV/HookManagerTest.php @@ -168,7 +168,7 @@ class HookManagerTest extends TestCase { $cal = $this->getMockBuilder(CalDavBackend::class) ->disableOriginalConstructor() ->getMock(); - $cal->expects($this->once())->method('getCalendarsForUser')->willReturn([ + $cal->expects($this->once())->method('getUsersOwnCalendars')->willReturn([ ['id' => 'personal'] ]); $cal->expects($this->once())->method('deleteCalendar'); From 479c427f2a3328ccf34b5ef57598eb8fc305f995 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 27 Sep 2016 21:12:24 +0200 Subject: [PATCH 6/7] Add IL10N to unit test Signed-off-by: Lukas Reschke --- apps/dav/tests/unit/DAV/HookManagerTest.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/apps/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php index 4a60542a01..e9351ebc84 100644 --- a/apps/dav/tests/unit/DAV/HookManagerTest.php +++ b/apps/dav/tests/unit/DAV/HookManagerTest.php @@ -28,11 +28,26 @@ use OCA\DAV\CalDAV\CalDavBackend; use OCA\DAV\CardDAV\CardDavBackend; use OCA\DAV\CardDAV\SyncService; use OCA\DAV\HookManager; +use OCP\IL10N; use OCP\IUser; use OCP\IUserManager; use Test\TestCase; class HookManagerTest extends TestCase { + /** @var IL10N */ + private $l10n; + + public function setUp() { + parent::setUp(); + $this->l10n = $this->createMock(IL10N::class); + $this->l10n + ->expects($this->any()) + ->method('t') + ->will($this->returnCallback(function ($text, $parameters = []) { + return vsprintf($text, $parameters); + })); + } + public function test() { $user = $this->getMockBuilder(IUser::class) ->disableOriginalConstructor() From 6c8bcb38f1124d0be7cee770ab67730d90dbd783 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 28 Sep 2016 15:32:03 +0200 Subject: [PATCH 7/7] Rename deleteAllSharesForUser() to deleteAllSharesByUser() Signed-off-by: Thomas Citharel --- apps/dav/lib/CalDAV/CalDavBackend.php | 2 +- apps/dav/lib/HookManager.php | 2 +- apps/dav/tests/unit/DAV/HookManagerTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 535bf3956e..d9537368eb 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -555,7 +555,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription * @param string $principaluri * @return void */ - function deleteAllSharesForUser($principaluri) { + function deleteAllSharesByUser($principaluri) { $this->sharingBackend->deleteAllSharesByUser($principaluri); } diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php index e54a39acf2..364db19d76 100644 --- a/apps/dav/lib/HookManager.php +++ b/apps/dav/lib/HookManager.php @@ -106,7 +106,7 @@ class HookManager { foreach ($this->calendarsToDelete as $calendar) { $this->calDav->deleteCalendar($calendar['id']); } - $this->calDav->deleteAllSharesForUser('principals/users/' . $uid); + $this->calDav->deleteAllSharesByUser('principals/users/' . $uid); foreach ($this->addressBooksToDelete as $addressBook) { $this->cardDav->deleteAddressBook($addressBook['id']); diff --git a/apps/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php index e9351ebc84..5b7d4700a5 100644 --- a/apps/dav/tests/unit/DAV/HookManagerTest.php +++ b/apps/dav/tests/unit/DAV/HookManagerTest.php @@ -187,7 +187,7 @@ class HookManagerTest extends TestCase { ['id' => 'personal'] ]); $cal->expects($this->once())->method('deleteCalendar'); - $cal->expects($this->once())->method('deleteAllSharesForUser'); + $cal->expects($this->once())->method('deleteAllSharesByUser'); /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ $card = $this->getMockBuilder(CardDavBackend::class)