refactor(hooks): Remove all non-used user hooks

And replace the few remaining by converting the event to hooks instead
of the other way around.

Signed-off-by: Carl Schwan <carlschwan@kde.org>

Author: CarlSchwan

apps/dashboard/composer/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'b1797842784b250fb01ed5e3bf130705eb94751b',
+        'reference' => '707699d6351faa181d14cf50abe6be4343938400',
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'b1797842784b250fb01ed5e3bf130705eb94751b',
+            'reference' => '707699d6351faa181d14cf50abe6be4343938400',
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),

apps/files_sharing/lib/AppInfo/Application.php

@@ -121,6 +121,8 @@ function () use ($c) {
 		$context->registerEventListener(UserRemovedEvent::class, SharesUpdatedListener::class);
 		$context->registerEventListener(UserShareAccessUpdatedEvent::class, SharesUpdatedListener::class);
 
+		$context->registerEventListener(UserDeletedEvent::class, SharesUpdatedListener::class);
+
 		$context->registerConfigLexicon(ConfigLexicon::class);
 	}
 

apps/files_sharing/lib/Helper.php

@@ -15,11 +15,9 @@
 use OCP\Util;
 
 class Helper {
-	public static function registerHooks() {
+	public static function registerHooks(): void {
 		Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
 		Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
-
-		Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
 	}
 
 	/**

apps/files_sharing/lib/Hooks.php

@@ -9,21 +9,8 @@
 
 use OC\Files\Filesystem;
 use OC\Files\View;
-use OCP\IUserManager;
-use OCP\Server;
 
 class Hooks {
-	public static function deleteUser(array $params): void {
-		$userManager = Server::get(IUserManager::class);
-		$user = $userManager->get($params['uid']);
-		if ($user === null) {
-			return;
-		}
-
-		$manager = Server::get(External\Manager::class);
-		$manager->removeUserShares($user);
-	}
-
 	public static function unshareChildren(array $params): void {
 		$path = Filesystem::getView()->getAbsolutePath($params['path']);
 		$view = new View('/');

apps/files_sharing/lib/Listener/SharesUpdatedListener.php

@@ -9,6 +9,7 @@
 namespace OCA\Files_Sharing\Listener;
 
 use OCA\Files_Sharing\Event\UserShareAccessUpdatedEvent;
+use OCA\Files_Sharing\External\Manager as ExternalManager;
 use OCA\Files_Sharing\MountProvider;
 use OCA\Files_Sharing\ShareTargetValidator;
 use OCP\EventDispatcher\Event;
@@ -23,11 +24,12 @@
 use OCP\Share\Events\ShareCreatedEvent;
 use OCP\Share\Events\ShareTransferredEvent;
 use OCP\Share\IManager;
+use OCP\User\Events\UserDeletedEvent;
 
 /**
  * Listen to various events that can change what shares a user has access to
  *
- * @template-implements IEventListener<UserAddedEvent|UserRemovedEvent|ShareCreatedEvent|ShareTransferredEvent|BeforeShareDeletedEvent|UserShareAccessUpdatedEvent>
+ * @template-implements IEventListener<UserAddedEvent|UserRemovedEvent|ShareCreatedEvent|ShareTransferredEvent|BeforeShareDeletedEvent|UserShareAccessUpdatedEvent|UserDeletedEvent>
  */
 class SharesUpdatedListener implements IEventListener {
 	private array $inUpdate = [];
@@ -38,6 +40,7 @@ public function __construct(
 		private readonly MountProvider $shareMountProvider,
 		private readonly ShareTargetValidator $shareTargetValidator,
 		private readonly IStorageFactory $storageFactory,
+		private readonly ExternalManager $externalManager,
 	) {
 	}
 	public function handle(Event $event): void {
@@ -62,6 +65,10 @@ public function handle(Event $event): void {
 				$this->updateForUser($user, false, [$event->getShare()]);
 			}
 		}
+
+		if ($event instanceof UserDeletedEvent) {
+			$this->deleteUser($event);
+		}
 	}
 
 	private function updateForUser(IUser $user, bool $verifyMountPoints, array $ignoreShares = []): void {
@@ -97,4 +104,8 @@ private function updateForUser(IUser $user, bool $verifyMountPoints, array $igno
 
 		unset($this->inUpdate[$user->getUID()]);
 	}
+
+	public function deleteUser(UserDeletedEvent $event): void {
+		$this->externalManager->removeUserShares($event->getUser());
+	}
 }

apps/user_ldap/lib/AppInfo/Application.php

@@ -67,6 +67,7 @@ function (ContainerInterface $c) {
 					$c->get(IUserManager::class),
 					$c->get(INotificationManager::class),
 					$c->get(IShareManager::class),
+					$c->get(IEventDispatcher::class),
 				);
 			},
 			// the instance is specific to a lazy bound Access instance, thus cannot be shared.

apps/user_ldap/lib/User/Manager.php

@@ -11,6 +11,7 @@
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\Cache\CappedMemoryCache;
 use OCP\Config\IUserConfig;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IAvatarManager;
 use OCP\IConfig;
 use OCP\IDBConnection;
@@ -44,6 +45,7 @@ public function __construct(
 		protected IUserManager $userManager,
 		protected INotificationManager $notificationManager,
 		private IManager $shareManager,
+		private IEventDispatcher $eventDispatcher,
 	) {
 		$this->usersByDN = new CappedMemoryCache();
 		$this->usersByUid = new CappedMemoryCache();
@@ -52,9 +54,8 @@ public function __construct(
 	/**
 	 * Binds manager to an instance of Access.
 	 * It needs to be assigned first before the manager can be used.
-	 * @param Access
 	 */
-	public function setLdapAccess(Access $access) {
+	public function setLdapAccess(Access $access): void {
 		$this->access = $access;
 	}
 
@@ -63,24 +64,22 @@ public function setLdapAccess(Access $access) {
 	 * property array
 	 * @param string $dn the DN of the user
 	 * @param string $uid the internal (owncloud) username
-	 * @return User
 	 */
-	private function createAndCache($dn, $uid) {
+	private function createAndCache(string $dn, string $uid): User {
 		$this->checkAccess();
 		$user = new User($uid, $dn, $this->access, $this->ocConfig, $this->userConfig, $this->appConfig,
 			clone $this->image, $this->logger,
 			$this->avatarManager, $this->userManager,
-			$this->notificationManager);
+			$this->notificationManager, $this->eventDispatcher);
 		$this->usersByDN[$dn] = $user;
 		$this->usersByUid[$uid] = $user;
 		return $user;
 	}
 
 	/**
-	 * removes a user entry from the cache
-	 * @param $uid
+	 * Removes a user entry from the cache.
 	 */
-	public function invalidate($uid) {
+	public function invalidate(string $uid): void {
 		if (!isset($this->usersByUid[$uid])) {
 			return;
 		}
@@ -93,9 +92,8 @@ public function invalidate($uid) {
 	 * @brief checks whether the Access instance has been set
 	 * @throws \Exception if Access has not been set
 	 * @psalm-assert !null $this->access
-	 * @return null
 	 */
-	private function checkAccess() {
+	private function checkAccess(): void {
 		if (is_null($this->access)) {
 			throw new \Exception('LDAP Access instance must be set first');
 		}

apps/user_ldap/lib/User/User.php

@@ -18,6 +18,7 @@
 use OCP\Accounts\PropertyDoesNotExistException;
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\Config\IUserConfig;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IAvatarManager;
 use OCP\IConfig;
 use OCP\Image;
@@ -27,6 +28,8 @@
 use OCP\Notification\IManager as INotificationManager;
 use OCP\PreConditionNotMetException;
 use OCP\Server;
+use OCP\User\Events\UserLoggedInEvent;
+use OCP\User\Events\UserLoggedInWithCookieEvent;
 use OCP\Util;
 use Psr\Log\LoggerInterface;
 
@@ -66,6 +69,7 @@ public function __construct(
 		protected IAvatarManager $avatarManager,
 		protected IUserManager $userManager,
 		protected INotificationManager $notificationManager,
+		IEventDispatcher $eventDispatcher,
 	) {
 		if ($uid === '') {
 			$logger->error("uid for '$dn' must not be an empty string", ['app' => 'user_ldap']);
@@ -74,7 +78,13 @@ public function __construct(
 		$this->connection = $this->access->getConnection();
 		$this->birthdateParser = new BirthdateParserService();
 
-		Util::connectHook('OC_User', 'post_login', $this, 'handlePasswordExpiry');
+		$eventDispatcher->addListener(UserLoggedInWithCookieEvent::class, function (UserLoggedInWithCookieEvent $event) {
+			$this->handlePasswordExpiry($event->getUser());
+		});
+
+		$eventDispatcher->addListener(UserLoggedInEvent::class, function (UserLoggedInEvent $event) {
+			$this->handlePasswordExpiry($event->getUser());
+		});
 	}
 
 	/**
@@ -735,15 +745,15 @@ public function updateExtStorageHome(?string $valueFromLDAP = null):string {
 	}
 
 	/**
-	 * called by a post_login hook to handle password expiry
+	 * Called by a LoggedIn events to handle password expiry
 	 */
-	public function handlePasswordExpiry(array $params): void {
+	public function handlePasswordExpiry(IUser $user): void {
+		$uid = $user->getUID();
 		$ppolicyDN = $this->connection->ldapDefaultPPolicyDN;
 		if (empty($ppolicyDN) || ((int)$this->connection->turnOnPasswordChange !== 1)) {
 			//password expiry handling disabled
 			return;
 		}
-		$uid = $params['uid'];
 		if (isset($uid) && $uid === $this->getUsername()) {
 			//retrieve relevant user attributes
 			$result = $this->access->search('objectclass=*', $this->dn, ['pwdpolicysubentry', 'pwdgraceusetime', 'pwdreset', 'pwdchangedtime']);

apps/user_ldap/tests/User/ManagerTest.php

@@ -15,6 +15,7 @@
 use OCA\User_LDAP\User\User;
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\Config\IUserConfig;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IAvatarManager;
 use OCP\IConfig;
 use OCP\IDBConnection;
@@ -79,7 +80,8 @@ protected function setUp(): void {
 			$this->image,
 			$this->ncUserManager,
 			$this->notificationManager,
-			$this->shareManager
+			$this->shareManager,
+			$this->createMock(IEventDispatcher::class),
 		);
 
 		$this->manager->setLdapAccess($this->access);

apps/user_ldap/tests/User/UserTest.php

@@ -14,6 +14,7 @@
 use OCA\User_LDAP\User\User;
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\Config\IUserConfig;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IAvatar;
 use OCP\IAvatarManager;
 use OCP\IConfig;
@@ -22,7 +23,8 @@
 use OCP\IUserManager;
 use OCP\Notification\IManager as INotificationManager;
 use OCP\Notification\INotification;
-use OCP\Util;
+use OCP\Server;
+use OCP\User\Events\UserLoggedInEvent;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 
@@ -44,6 +46,7 @@ class UserTest extends \Test\TestCase {
 	protected Image&MockObject $image;
 	protected IAvatarManager&MockObject $avatarManager;
 	protected LoggerInterface&MockObject $logger;
+	protected IEventDispatcher $eventDispatcher;
 	protected string $uid = 'alice';
 	protected string $dn = 'uid=alice,dc=foo,dc=bar';
 	protected User $user;
@@ -69,6 +72,7 @@ protected function setUp(): void {
 		$this->image = $this->createMock(Image::class);
 		$this->userManager = $this->createMock(IUserManager::class);
 		$this->notificationManager = $this->createMock(INotificationManager::class);
+		$this->eventDispatcher = Server::get(IEventDispatcher::class);
 
 		$this->user = new User(
 			$this->uid,
@@ -81,7 +85,8 @@ protected function setUp(): void {
 			$this->logger,
 			$this->avatarManager,
 			$this->userManager,
-			$this->notificationManager
+			$this->notificationManager,
+			$this->eventDispatcher,
 		);
 	}
 
@@ -933,8 +938,9 @@ public function testProcessAttributes(): void {
 		}
 		\OC_Hook::clear();//disconnect irrelevant hooks
 		$userMock->processAttributes($record);
-		/** @noinspection PhpUnhandledExceptionInspection */
-		\OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);
+		$iuserMock = $this->createMock(IUser::class);
+		$iuserMock->method('getUID')->willReturn($this->uid);
+		$this->eventDispatcher->dispatchTyped(new UserLoggedInEvent($iuserMock, $this->uid, null, true));
 	}
 
 	public static function emptyHomeFolderAttributeValueProvider(): array {
@@ -1117,10 +1123,9 @@ public function testHandlePasswordExpiryWarningDefaultPolicy(): void {
 		$this->notificationManager->expects($this->exactly(1))
 			->method('notify');
 
-		\OC_Hook::clear();//disconnect irrelevant hooks
-		Util::connectHook('OC_User', 'post_login', $this->user, 'handlePasswordExpiry');
-		/** @noinspection PhpUnhandledExceptionInspection */
-		\OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);
+		$iuserMock = $this->createMock(IUser::class);
+		$iuserMock->method('getUID')->willReturn($this->uid);
+		$this->eventDispatcher->dispatchTyped(new UserLoggedInEvent($iuserMock, $this->uid, null, true));
 	}
 
 	public function testHandlePasswordExpiryWarningCustomPolicy(): void {
@@ -1181,9 +1186,8 @@ public function testHandlePasswordExpiryWarningCustomPolicy(): void {
 		$this->notificationManager->expects($this->exactly(1))
 			->method('notify');
 
-		\OC_Hook::clear();//disconnect irrelevant hooks
-		Util::connectHook('OC_User', 'post_login', $this->user, 'handlePasswordExpiry');
-		/** @noinspection PhpUnhandledExceptionInspection */
-		\OC_Hook::emit('OC_User', 'post_login', ['uid' => $this->uid]);
+		$iuserMock = $this->createMock(IUser::class);
+		$iuserMock->method('getUID')->willReturn($this->uid);
+		$this->eventDispatcher->dispatchTyped(new UserLoggedInEvent($iuserMock, $this->uid, null, true));
 	}
 }