From c76bd53db1ff11dc7268b8655375c8beaef33c57 Mon Sep 17 00:00:00 2001
From: binsky <timo@binsky.org>
Date: Sat, 10 Jan 2026 23:00:36 +0100
Subject: [PATCH] fix error that prevents requested vault deletion of an
 already deleted user #849

---
 lib/Controller/AdminController.php | 5 ++++-
 lib/Utility/Utils.php              | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php
index afe66e24..84ea3cc3 100644
--- a/lib/Controller/AdminController.php
+++ b/lib/Controller/AdminController.php
@@ -22,6 +22,7 @@
 use OCA\PassmanNext\Utility\Utils;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUserManager;
 
@@ -37,6 +38,7 @@ public function __construct(
 		private readonly CredentialRevisionService $revisionService,
 		private readonly DeleteVaultRequestService $deleteVaultRequestService,
 		private readonly IUserManager $userManager,
+		private readonly IL10N $trans
 	) {
 		parent::__construct(
 			$AppName,
@@ -106,7 +108,8 @@ public function listRequests(){
 		$results = [];
 		foreach($requests as $request){
 			$r = $request->jsonSerialize();
-			$r['displayName'] = Utils::getNameByUid($request->getRequestedBy(), $this->userManager);
+			$r['displayName'] = Utils::getNameByUid($request->getRequestedBy(), $this->userManager)
+				?? sprintf('(%s)', $this->trans->t('User not found'));
 			$results[] = $r;
 		}
 		return new JSONResponse($results);
diff --git a/lib/Utility/Utils.php b/lib/Utility/Utils.php
index 1a5ba3c0..0b30d3a5 100644
--- a/lib/Utility/Utils.php
+++ b/lib/Utility/Utils.php
@@ -56,11 +56,11 @@ public static function GUID() {
 	/**
 	 * @param string $uid
 	 * @param IUserManager $userManager
-	 * @return string
+	 * @return string|null
 	 */
-	public static function getNameByUid(string $uid, IUserManager $userManager){
+	public static function getNameByUid(string $uid, IUserManager $userManager): ?string {
 		$u = $userManager->get($uid);
-		return $u->getDisplayName();
+		return $u?->getDisplayName();
 	}
 
 	/**