Merge pull request #4241 from nextcloud/tests/testUsersIndex

nextcloud · Jun 6, 2023 · 80bdef9 · 80bdef9
2 parents e9dc7b8 + 851528c
commit 80bdef9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Controller/UserApiController.php b/lib/Controller/UserApiController.php
@@ -41,7 +41,7 @@ public function index(int $documentId, int $sessionId, string $sessionToken, str
 			$sessionUserId = $session['userId'];
 			if ($sessionUserId !== null && !isset($users[$sessionUserId])) {
 				$displayName = $this->userManager->getDisplayName($sessionUserId);
-				if (stripos($displayName, $filter) !== false || stripos($sessionUserId, $filter) !== false) {
+				if ($displayName && stripos($displayName, $filter) !== false || stripos($sessionUserId, $filter) !== false) {
 					$users[$sessionUserId] = $displayName;
 				}
 			}

diff --git a/tests/unit/Controller/UserApiControllerTest.php b/tests/unit/Controller/UserApiControllerTest.php
@@ -69,6 +69,9 @@ public function testUsersIndex(int $documentId, int $sessionId, string $sessionT
 				'userId' => 'admin',
 				'displayName' => 'admin',
 			]]);
+		$this->userManager->expects($this->once())
+			->method('getDisplayName')
+			->willReturn('Administrator');
 		$this->sessionService
 			->expects($this->once())
 			->method('getSession')->willReturn($session);