Merge pull request #54424 from nextcloud/fix/dav/user-addressbook-clean-up

fix(dav): clean up user's addressbook shares on deletion

Author: ChristophWurst

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -1091,6 +1091,13 @@ public function updateShares(IShareable $shareable, array $add, array $remove):
 		}, $this->db);
 	}
 
+	/**
+	 * Delete all of a user's shares
+	 */
+	public function deleteAllSharesByUser(string $principaluri): void {
+		$this->sharingBackend->deleteAllSharesByUser($principaluri);
+	}
+
 	/**
 	 * Search contacts in a specific address-book
 	 *

apps/dav/lib/Listener/UserEventsListener.php

@@ -122,6 +122,7 @@ public function postDeleteUser(string $uid): void {
 			);
 		}
 		$this->calDav->deleteAllSharesByUser('principals/users/' . $uid);
+		$this->cardDav->deleteAllSharesByUser('principals/users/' . $uid);
 
 		foreach ($this->addressBooksToDelete[$uid] as $addressBook) {
 			$this->cardDav->deleteAddressBook($addressBook['id']);

apps/dav/tests/unit/DAV/Listener/UserEventsListenerTest.php

@@ -132,7 +132,7 @@ public function testWithBirthdayCalendar(): void {
 		$this->userEventsListener->firstLogin($user);
 	}
 
-	public function testDeleteCalendar(): void {
+	public function testDeleteUser(): void {
 		$user = $this->createMock(IUser::class);
 		$user->expects($this->once())->method('getUID')->willReturn('newUser');
 
@@ -148,6 +148,7 @@ public function testDeleteCalendar(): void {
 		$this->calDavBackend->expects($this->once())->method('deleteCalendar')->with('personal');
 		$this->calDavBackend->expects($this->once())->method('deleteSubscription')->with('some-subscription');
 		$this->calDavBackend->expects($this->once())->method('deleteAllSharesByUser');
+		$this->cardDavBackend->expects($this->once())->method('deleteAllSharesByUser');
 
 		$this->cardDavBackend->expects($this->once())->method('getUsersOwnAddressBooks')->willReturn([
 			['id' => 'personal']