Skip to content

fix error that prevents requested vault deletion of an already deleted user #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
binsky08 merged 1 commit into from
Jan 10, 2026
Merged

fix error that prevents requested vault deletion of an already deleted user #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/Controller/AdminController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions lib/Utility/Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

/**
Expand Down