aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCôme Chilliet <come.chilliet@nextcloud.com>2025-06-30 10:28:49 +0200
committerCôme Chilliet <come.chilliet@nextcloud.com>2025-06-30 10:28:49 +0200
commitf4b780bfeac64f12218e374e3a0acb70bdb19d5c (patch)
treebd2002c642f91d8d1c01b3b8417d7e2281642587
parent07f9d8f4c2f80fa21f61f0781588e43b37fb56c2 (diff)
downloadnextcloud-server-fix/catch-exception-in-encryption-listener.tar.gz
nextcloud-server-fix/catch-exception-in-encryption-listener.zip
fix(encryption): Pass an IUser and not a string to getUpdatefix/catch-exception-in-encryption-listener
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
-rw-r--r--lib/private/Encryption/EncryptionEventListener.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/Encryption/EncryptionEventListener.php b/lib/private/Encryption/EncryptionEventListener.php
index 415f8afcec5..d51b4b0d531 100644
--- a/lib/private/Encryption/EncryptionEventListener.php
+++ b/lib/private/Encryption/EncryptionEventListener.php
@@ -19,6 +19,7 @@ use OCP\EventDispatcher\IEventListener;
use OCP\Files\Events\Node\NodeRenamedEvent;
use OCP\Files\NotFoundException;
use OCP\IUser;
+use OCP\IUserManager;
use OCP\IUserSession;
use OCP\Share\Events\ShareCreatedEvent;
use OCP\Share\Events\ShareDeletedEvent;
@@ -32,6 +33,7 @@ class EncryptionEventListener implements IEventListener {
private IUserSession $userSession,
private SetupManager $setupManager,
private Manager $encryptionManager,
+ private IUserManager $userManager,
) {
}
@@ -54,7 +56,7 @@ class EncryptionEventListener implements IEventListener {
try {
// In case the unsharing happens in a background job, we don't have
// a session and we load instead the user from the UserManager
- $owner = $event->getShare()->getShareOwner();
+ $owner = $this->userManager->get($event->getShare()->getShareOwner());
$this->getUpdate($owner)->postUnshared($event->getShare()->getNode());
} catch (NotFoundException $e) {
/* The node was deleted already, nothing to update */
@@ -83,7 +85,7 @@ class EncryptionEventListener implements IEventListener {
$this->updater = new Update(
new Util(
new View(),
- \OC::$server->getUserManager(),
+ $this->userManager,
\OC::$server->getGroupManager(),
\OC::$server->getConfig()),
\OC::$server->getEncryptionManager(),