Migrate OC_Group post_removeFromGroup hook to actual event object

Ref #14552 This adds a BeforeUserRemovedEvent to the LDAP backend because it was missing. It's not really before, but we don't have the before state. Signed-off-by: Morris Jobke <[email protected]>
nextcloud · Jul 7, 2020 · 75def24 · 75def24
1 parent 09b9f94
commit 75def24
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/apps/user_ldap/lib/Jobs/UpdateGroups.php b/apps/user_ldap/lib/Jobs/UpdateGroups.php
@@ -43,6 +43,9 @@
 use OCA\User_LDAP\Mapping\GroupMapping;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User\Manager;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Group\Events\BeforeUserRemovedEvent;
+use OCP\Group\Events\UserRemovedEvent;
 use OCP\ILogger;
 
 class UpdateGroups extends \OC\BackgroundJob\TimedJob {
@@ -93,6 +96,10 @@ private static function getRefreshInterval() {
 	 * @param string[] $groups
 	 */
 	private static function handleKnownGroups($groups) {
+		$dispatcher = \OC::$server->query(IEventDispatcher::class);
+		$groupManager = \OC::$server->getGroupManager();
+		$userManager = \OC::$server->getUserManager();
+
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Dealing with known Groups.', ILogger::DEBUG);
 		$query = \OC_DB::prepare('
 			UPDATE `*PREFIX*ldap_group_members`
@@ -104,8 +111,12 @@ private static function handleKnownGroups($groups) {
 			$knownUsers = unserialize(self::$groupsFromDB[$group]['owncloudusers']);
 			$actualUsers = self::getGroupBE()->usersInGroup($group);
 			$hasChanged = false;
+
+			$groupObject = $groupManager->get($group);
 			foreach (array_diff($knownUsers, $actualUsers) as $removedUser) {
-				\OCP\Util::emitHook('OC_User', 'post_removeFromGroup', ['uid' => $removedUser, 'gid' => $group]);
+				$userObject = $userManager->get($removedUser);
+				$dispatcher->dispatchTyped(new BeforeUserRemovedEvent($groupObject, $userObject)); // fake the before event
+				$dispatcher->dispatchTyped(new UserRemovedEvent($groupObject, $userObject));
 				\OCP\Util::writeLog('user_ldap',
 				'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".',
 					ILogger::INFO);

diff --git a/lib/base.php b/lib/base.php
@@ -61,6 +61,8 @@
  *
  */
 
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Group\Events\UserRemovedEvent;
 use OCP\ILogger;
 use OCP\Share;
 use OC\Encryption\HookManager;
@@ -902,8 +904,13 @@ public static function registerFilesystemHooks() {
 	 */
 	public static function registerShareHooks() {
 		if (\OC::$server->getSystemConfig()->getValue('installed')) {
+			/* @var IEventDispatcher $eventDispatcher */
+			$dispatcher = \OC::$server->query(IEventDispatcher::class);
+
 			OC_Hook::connect('OC_User', 'post_deleteUser', Hooks::class, 'post_deleteUser');
-			OC_Hook::connect('OC_User', 'post_removeFromGroup', Hooks::class, 'post_removeFromGroup');
+			$dispatcher->addListener(UserRemovedEvent::class, function(UserRemovedEvent $event) {
+				\OC::$server->getShareManager()->userDeletedFromGroup($event->getUser()->getUID(), $event->getGroup()->getGID());
+			});
 			OC_Hook::connect('OC_User', 'post_deleteGroup', Hooks::class, 'post_deleteGroup');
 		}
 	}

diff --git a/lib/private/Share20/Hooks.php b/lib/private/Share20/Hooks.php
@@ -30,8 +30,4 @@ public static function post_deleteUser($arguments) {
 	public static function post_deleteGroup($arguments) {
 		\OC::$server->getShareManager()->groupDeleted($arguments['gid']);
 	}
-
-	public static function post_removeFromGroup($arguments) {
-		\OC::$server->getShareManager()->userDeletedFromGroup($arguments['uid'], $arguments['gid']);
-	}
 }
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
@@ -41,6 +41,9 @@
 use OC\Files\Cache\Storage;
 use OC\Hooks\Emitter;
 use OC_Helper;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Group\Events\BeforeUserRemovedEvent;
+use OCP\Group\Events\UserRemovedEvent;
 use OCP\IAvatarManager;
 use OCP\IConfig;
 use OCP\IImage;
@@ -63,6 +66,9 @@ class User implements IUser {
 	/** @var EventDispatcherInterface */
 	private $dispatcher;
 
+	/** @var IEventDispatcher */
+	private $newDispatcher;
+
 	/** @var bool */
 	private $enabled;
 
@@ -100,6 +106,8 @@ public function __construct(string $uid, ?UserInterface $backend, EventDispatche
 		if (is_null($this->urlGenerator)) {
 			$this->urlGenerator = \OC::$server->getURLGenerator();
 		}
+		// TODO: inject
+		$this->newDispatcher = \OC::$server->query(IEventDispatcher::class);
 	}
 
 	/**
@@ -219,9 +227,9 @@ public function delete() {
 			foreach ($groupManager->getUserGroupIds($this) as $groupId) {
 				$group = $groupManager->get($groupId);
 				if ($group) {
-					\OC_Hook::emit("OC_Group", "pre_removeFromGroup", ["run" => true, "uid" => $this->uid, "gid" => $groupId]);
+					$this->newDispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $this));
 					$group->removeUser($this);
-					\OC_Hook::emit("OC_User", "post_removeFromGroup", ["uid" => $this->uid, "gid" => $groupId]);
+					$this->newDispatcher->dispatchTyped(new UserRemovedEvent($group, $this));
 				}
 			}
 			// Delete the user's keys in preferences