upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 14:50:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

Fix avatar cleanup on user delete

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2022-09-19 21:36:50 +02:00
parent ea08fabca3
commit 144514e49e
No known key found for this signature in database
GPG key ID: 74434EFE0D2E2205
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/Server.php
View file

@ -153,8 +153,8 @@ use OC\Tagging\TagMapper;
use OC\Talk\Broker;
use OC\Template\JSCombiner;
use OC\User\DisplayNameCache;
use OC\User\Listeners\BeforeUserDeletedListener;
use OC\User\Listeners\UserChangedListener;
use OC\User\Listeners\UserDeletedListener;
use OCA\Theming\ImageManager;
use OCA\Theming\ThemingDefaults;
use OCA\Theming\Util;
@ -248,13 +248,13 @@ use OCP\SystemTag\ISystemTagManager;
use OCP\SystemTag\ISystemTagObjectMapper;
use OCP\Talk\IBroker;
use OCP\User\Events\BeforePasswordUpdatedEvent;
use OCP\User\Events\BeforeUserDeletedEvent;
use OCP\User\Events\BeforeUserLoggedInEvent;
use OCP\User\Events\BeforeUserLoggedInWithCookieEvent;
use OCP\User\Events\BeforeUserLoggedOutEvent;
use OCP\User\Events\PasswordUpdatedEvent;
use OCP\User\Events\PostLoginEvent;
use OCP\User\Events\UserChangedEvent;
use OCP\User\Events\UserDeletedEvent;
use OCP\User\Events\UserLoggedInEvent;
use OCP\User\Events\UserLoggedInWithCookieEvent;
use OCP\User\Events\UserLoggedOutEvent;
@ -1499,7 +1499,7 @@ class Server extends ServerContainer implements IServerContainer {
$eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
$eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
$eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedListener::class);
$eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
}
/**

10
lib/private/User/Listeners/UserDeletedListener.php → lib/private/User/Listeners/BeforeUserDeletedListener.php
View file

@ -25,15 +25,15 @@ namespace OC\User\Listeners;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventListener;
use OCP\User\Events\UserDeletedEvent;
use OCP\User\Events\BeforeUserDeletedEvent;
use OCP\Files\NotFoundException;
use OCP\IAvatarManager;
use Psr\Log\LoggerInterface;
/**
* @template-implements IEventListener<UserDeletedEvent>
* @template-implements IEventListener<BeforeUserDeletedEvent>
*/
class UserDeletedListener implements IEventListener {
class BeforeUserDeletedListener implements IEventListener {
private IAvatarManager $avatarManager;
private LoggerInterface $logger;
@ -43,10 +43,10 @@ class UserDeletedListener implements IEventListener {
}
public function handle(Event $event): void {
if (!($event instanceof UserDeletedEvent)) {
if (!($event instanceof BeforeUserDeletedEvent)) {
return;
}
$user = $event->getUser();
// Delete avatar on user deletion