Merge branch 'master' into dependabot/npm_and_yarn/follow-redirects-1.16.0

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

Author: CarlSchwan

apps/dav/lib/CardDAV/SyncService.php

@@ -201,7 +201,10 @@ public function syncInstance(?\Closure $progressCallback = null) {
 			$vCard = Reader::read($card['carddata']);
 			$uid = $vCard->UID->getValue();
 			// load backend and see if user exists
-			if (!$this->userManager->userExists($uid)) {
+			$user = $this->userManager->get($uid);
+
+			// If the user does not exist
+			if ($user === null || self::getCardUri($user) !== $card['uri']) {
 				$this->deleteUser($card['uri']);
 			}
 		}

apps/dav/tests/unit/CardDAV/SyncServiceTest.php

@@ -367,6 +367,44 @@ public function testUpdateAndDeleteUser(bool $activated, int $createCalls, int $
 		$ss->deleteUser($user);
 	}
 
+	public function testSyncInstance(): void {
+		/** @var CardDavBackend | MockObject $backend */
+		$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
+		$logger = $this->getMockBuilder(LoggerInterface::class)->disableOriginalConstructor()->getMock();
+
+		$backend->expects($this->exactly(1))->method('deleteCard');
+
+		$backend->method('getCards')->willReturn([
+			[
+				'carddata' => "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.8//EN\r\nUID:test-user\r\nFN:test-user\r\nN:test-user;;;;\r\nEND:VCARD\r\n\r\n",
+				'uri' => 'Database:test-user.vcf',
+			],
+			[
+				'carddata' => "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.8//EN\r\nUID:test-user\r\nFN:test-user\r\nN:test-user;;;;\r\nEND:VCARD\r\n\r\n",
+				'uri' => 'LDAP:test-user.vcf',
+			],
+		]
+		);
+
+		$backend->method('getAddressBooksByUri')
+			->with('principals/system/system', 'system')
+			->willReturn(['id' => -1]);
+
+		$userManager = $this->createMock(IUserManager::class);
+		$dbConnection = $this->createMock(IDBConnection::class);
+		$user = $this->createMock(IUser::class);
+		$user->method('getBackendClassName')->willReturn('LDAP');
+		$user->method('getUID')->willReturn('test-user');
+		$userManager->method('get')->willReturn($user);
+
+		$converter = $this->createMock(Converter::class);
+		$clientService = $this->createMock(IClientService::class);
+		$config = $this->createMock(IConfig::class);
+
+		$ss = new SyncService($clientService, $config, $backend, $userManager, $dbConnection, $logger, $converter);
+		$ss->syncInstance();
+	}
+
 	public function testDeleteAddressbookWhenAccessRevoked(): void {
 		$this->expectException(ClientExceptionInterface::class);
 

build/frontend-legacy/package-lock.json

@@ -147,7 +147,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 3.5.28
 	- license: MIT
 - axios
-	- version: 1.13.5
+	- version: 1.15.0
 	- license: MIT
 - base64-js
 	- version: 1.5.1

dist/1140-1140.js.license

@@ -57,7 +57,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 11.3.0
 	- license: MIT
 - axios
-	- version: 1.13.5
+	- version: 1.15.0
 	- license: MIT
 - base64-js
 	- version: 1.5.1

dist/1216-1216.js.license

@@ -159,7 +159,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 11.3.0
 	- license: MIT
 - axios
-	- version: 1.13.5
+	- version: 1.15.0
 	- license: MIT
 - base64-js
 	- version: 1.5.1

dist/1598-1598.js.license

@@ -93,7 +93,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 4.5.0
 	- license: Apache-2.0
 - axios
-	- version: 1.13.5
+	- version: 1.15.0
 	- license: MIT
 - base64-js
 	- version: 1.5.1

dist/1764-1764.js.license

@@ -71,7 +71,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 11.3.0
 	- license: MIT
 - axios
-	- version: 1.13.5
+	- version: 1.15.0
 	- license: MIT
 - base64-js
 	- version: 1.5.1

dist/1930-1930.js.license

@@ -64,7 +64,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 11.3.0
 	- license: MIT
 - axios
-	- version: 1.13.5
+	- version: 1.15.0
 	- license: MIT
 - base64-js
 	- version: 1.5.1

dist/2311-2311.js.license

@@ -109,7 +109,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 8.37.0
 	- license: AGPL-3.0-or-later
 - axios
-	- version: 1.13.5
+	- version: 1.15.0
 	- license: MIT
 - base64-js
 	- version: 1.5.1