remove cached display name on user delete

Signed-off-by: Robin Appelman <[email protected]>

apps/files_sharing/lib/AppInfo/Application.php

@@ -107,7 +107,6 @@ function () use ($c) {
 		$context->registerCapability(Capabilities::class);
 
 		$context->registerNotifierService(Notifier::class);
-		$context->registerEventListener(UserChangedEvent::class, DisplayNameCache::class);
 	}
 
 	public function boot(IBootContext $context): void {

lib/private/User/DisplayNameCache.php

@@ -29,6 +29,7 @@
 use OCP\ICacheFactory;
 use OCP\IUserManager;
 use OCP\User\Events\UserChangedEvent;
+use OCP\User\Events\UserDeletedEvent;
 
 /**
  * Class that cache the relation UserId -> Display name
@@ -81,5 +82,10 @@ public function handle(Event $event): void {
 			$this->cache[$userId] = $newDisplayName;
 			$this->memCache->set($userId, $newDisplayName, 60 * 10); // 10 minutes
 		}
+		if ($event instanceof UserDeletedEvent) {
+			$userId = $event->getUser()->getUID();
+			unset($this->cache[$userId]);
+			$this->memCache->remove($userId);
+		}
 	}
 }

lib/private/User/Manager.php

@@ -51,7 +51,9 @@
 use OCP\User\Backend\ICheckPasswordBackend;
 use OCP\User\Backend\ICountUsersBackend;
 use OCP\User\Events\BeforeUserCreatedEvent;
+use OCP\User\Events\UserChangedEvent;
 use OCP\User\Events\UserCreatedEvent;
+use OCP\User\Events\UserDeletedEvent;
 use OCP\UserInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
@@ -111,6 +113,8 @@ public function __construct(IConfig $config,
 		});
 		$this->eventDispatcher = $eventDispatcher;
 		$this->displayNameCache = new DisplayNameCache($cacheFactory, $this);
+		$this->eventDispatcher->addListener(UserChangedEvent::class, [$this->displayNameCache, 'handle']);
+		$this->eventDispatcher->addListener(UserDeletedEvent::class, [$this->displayNameCache, 'handle']);
 	}
 
 	/**
@@ -209,7 +213,7 @@ protected function getUserObject($uid, $backend, $cacheUser = true) {
 			return $this->cachedUsers[$uid];
 		}
 
-		$user = new User($uid, $backend, $this->dispatcher, $this, $this->config);
+		$user = new User($uid, $backend, $this->dispatcher, $this, $this->config, null, $this->eventDispatcher);
 		if ($cacheUser) {
 			$this->cachedUsers[$uid] = $user;
 		}

lib/private/User/User.php

@@ -98,7 +98,15 @@ class User implements IUser {
 	/** @var IURLGenerator */
 	private $urlGenerator;
 
-	public function __construct(string $uid, ?UserInterface $backend, EventDispatcherInterface $dispatcher, $emitter = null, IConfig $config = null, $urlGenerator = null) {
+	public function __construct(
+		string $uid,
+		?UserInterface $backend,
+		EventDispatcherInterface $dispatcher,
+		$emitter = null,
+		IConfig $config = null,
+		$urlGenerator = null,
+		IEventDispatcher $eventDispatcher = null
+	) {
 		$this->uid = $uid;
 		$this->backend = $backend;
 		$this->legacyDispatcher = $dispatcher;
@@ -111,8 +119,7 @@ public function __construct(string $uid, ?UserInterface $backend, EventDispatche
 		if (is_null($this->urlGenerator)) {
 			$this->urlGenerator = \OC::$server->getURLGenerator();
 		}
-		// TODO: inject
-		$this->dispatcher = \OC::$server->query(IEventDispatcher::class);
+		$this->dispatcher = $eventDispatcher ?: \OC::$server->query(IEventDispatcher::class);
 	}
 
 	/**

tests/lib/User/ManagerTest.php

@@ -10,13 +10,16 @@
 namespace Test\User;
 
 use OC\AllConfig;
+use OC\EventDispatcher\EventDispatcher;
 use OC\User\Database;
 use OC\User\Manager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\ICache;
 use OCP\ICacheFactory;
 use OCP\IConfig;
+use OCP\IServerContainer;
 use OCP\IUser;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Test\TestCase;
 
@@ -45,7 +48,11 @@ protected function setUp(): void {
 
 		$this->config = $this->createMock(IConfig::class);
 		$this->oldDispatcher = $this->createMock(EventDispatcherInterface::class);
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+		$this->eventDispatcher = new EventDispatcher(
+			new \Symfony\Component\EventDispatcher\EventDispatcher(),
+			$this->createMock(IServerContainer::class),
+			$this->createMock(LoggerInterface::class),
+		);
 		$this->cacheFactory = $this->createMock(ICacheFactory::class);
 		$this->cache = $this->createMock(ICache::class);