Add dispatcher events to User and Group objects

Signed-off-by: Joas Schilling <[email protected]>

apps/files/tests/Service/TagServiceTest.php

@@ -27,6 +27,7 @@
 use OC\Tags;
 use OCA\Files\Service\TagService;
 use OCP\Activity\IManager;
+use OCP\IUser;
 use OCP\IUserSession;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
@@ -75,8 +76,7 @@ protected function setUp() {
 		\OC::$server->getUserManager()->createUser($this->user, 'test');
 		\OC_User::setUserId($this->user);
 		\OC_Util::setupFS($this->user);
-		/** @var \OCP\IUser */
-		$user = new \OC\User\User($this->user, null);
+		$user = $this->createMock(IUser::class);
 		/**
 		 * @var \OCP\IUserSession
 		 */

apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php

@@ -64,7 +64,7 @@ public function setUp() {
 
 		$this->globalStoragesService = $this->service;
 
-		$this->user = new \OC\User\User(self::USER_ID, null);
+		$this->user = $this->createMock(IUser::class);
 		/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject $userSession */
 		$userSession = $this->createMock(IUserSession::class);
 		$userSession

lib/private/Files/View.php

@@ -1299,7 +1299,7 @@ private function getUserObjectForOwner($ownerId) {
 		if ($owner instanceof IUser) {
 			return $owner;
 		} else {
-			return new User($ownerId, null);
+			return new User($ownerId, null, \OC::$server->getEventDispatcher());
 		}
 	}
 

lib/private/Group/Group.php

@@ -31,55 +31,50 @@
 namespace OC\Group;
 
 use OCP\Group\Backend\IHideFromCollaborationBackend;
+use OC\Hooks\PublicEmitter;
 use OCP\GroupInterface;
 use OCP\IGroup;
 use OCP\IUser;
 use OCP\Group\Backend\ICountDisabledInGroup;
+use OCP\IUserManager;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Group implements IGroup {
 	/** @var null|string  */
 	protected $displayName;
 
-	/**
-	 * @var string $id
-	 */
+	/** @var string */
 	private $gid;
 
-	/**
-	 * @var \OC\User\User[] $users
-	 */
+	/** @var \OC\User\User[] */
 	private $users = array();
 
-	/**
-	 * @var bool $usersLoaded
-	 */
+	/** @var bool */
 	private $usersLoaded;
 
-	/**
-	 * @var \OC\Group\Backend[]|\OC\Group\Database[] $backend
-	 */
+	/** @var Backend[] */
 	private $backends;
-
-	/**
-	 * @var \OC\Hooks\PublicEmitter $emitter
-	 */
+	/** @var EventDispatcherInterface */
+	private $dispatcher;
+	/** @var \OC\User\Manager|IUserManager  */
+	private $userManager;
+	/** @var PublicEmitter */
 	private $emitter;
 
-	/**
-	 * @var \OC\User\Manager $userManager
-	 */
-	private $userManager;
 
 	/**
 	 * @param string $gid
-	 * @param \OC\Group\Backend[] $backends
-	 * @param \OC\User\Manager $userManager
-	 * @param \OC\Hooks\PublicEmitter $emitter
+	 * @param Backend[] $backends
+	 * @param EventDispatcherInterface $dispatcher
+	 * @param IUserManager $userManager
+	 * @param PublicEmitter $emitter
 	 * @param string $displayName
 	 */
-	public function __construct($gid, $backends, $userManager, $emitter = null, $displayName = null) {
+	public function __construct(string $gid, array $backends, EventDispatcherInterface $dispatcher, IUserManager $userManager, PublicEmitter $emitter = null, ?string $displayName = null) {
 		$this->gid = $gid;
 		$this->backends = $backends;
+		$this->dispatcher = $dispatcher;
 		$this->userManager = $userManager;
 		$this->emitter = $emitter;
 		$this->displayName = $displayName;
@@ -151,6 +146,10 @@ public function addUser(IUser $user) {
 			return;
 		}
 
+		$this->dispatcher->dispatch(IGroup::class . '::preAddUser', new GenericEvent($this, [
+			'user' => $user,
+		]));
+
 		if ($this->emitter) {
 			$this->emitter->emit('\OC\Group', 'preAddUser', array($this, $user));
 		}
@@ -160,6 +159,11 @@ public function addUser(IUser $user) {
 				if ($this->users) {
 					$this->users[$user->getUID()] = $user;
 				}
+
+				$this->dispatcher->dispatch(IGroup::class . '::postAddUser', new GenericEvent($this, [
+					'user' => $user,
+				]));
+
 				if ($this->emitter) {
 					$this->emitter->emit('\OC\Group', 'postAddUser', array($this, $user));
 				}
@@ -175,6 +179,9 @@ public function addUser(IUser $user) {
 	 */
 	public function removeUser($user) {
 		$result = false;
+		$this->dispatcher->dispatch(IGroup::class . '::preRemoveUser', new GenericEvent($this, [
+			'user' => $user,
+		]));
 		if ($this->emitter) {
 			$this->emitter->emit('\OC\Group', 'preRemoveUser', array($this, $user));
 		}
@@ -185,6 +192,9 @@ public function removeUser($user) {
 			}
 		}
 		if ($result) {
+			$this->dispatcher->dispatch(IGroup::class . '::postRemoveUser', new GenericEvent($this, [
+				'user' => $user,
+			]));
 			if ($this->emitter) {
 				$this->emitter->emit('\OC\Group', 'postRemoveUser', array($this, $user));
 			}
@@ -292,6 +302,7 @@ public function delete() {
 		}
 
 		$result = false;
+		$this->dispatcher->dispatch(IGroup::class . '::preDelete', new GenericEvent($this));
 		if ($this->emitter) {
 			$this->emitter->emit('\OC\Group', 'preDelete', array($this));
 		}
@@ -301,8 +312,11 @@ public function delete() {
 				$backend->deleteGroup($this->gid);
 			}
 		}
-		if ($result and $this->emitter) {
-			$this->emitter->emit('\OC\Group', 'postDelete', array($this));
+		if ($result) {
+			$this->dispatcher->dispatch(IGroup::class . '::postDelete', new GenericEvent($this));
+			if ($this->emitter) {
+				$this->emitter->emit('\OC\Group', 'postDelete', array($this));
+			}
 		}
 		return $result;
 	}

lib/private/Group/Manager.php

@@ -44,6 +44,7 @@
 use OCP\IGroupManager;
 use OCP\ILogger;
 use OCP\IUser;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Class Manager
@@ -61,59 +62,57 @@
  * @package OC\Group
  */
 class Manager extends PublicEmitter implements IGroupManager {
-	/**
-	 * @var GroupInterface[] $backends
-	 */
-	private $backends = array();
+	/** @var GroupInterface[] */
+	private $backends = [];
 
-	/**
-	 * @var \OC\User\Manager $userManager
-	 */
+	/** @var \OC\User\Manager */
 	private $userManager;
+	/** @var EventDispatcherInterface */
+	private $dispatcher;
+	/** @var ILogger */
+	private $logger;
 
-	/**
-	 * @var \OC\Group\Group[]
-	 */
-	private $cachedGroups = array();
+	/** @var \OC\Group\Group[] */
+	private $cachedGroups = [];
 
-	/**
-	 * @var \OC\Group\Group[]
-	 */
-	private $cachedUserGroups = array();
+	/** @var \OC\Group\Group[] */
+	private $cachedUserGroups = [];
 
 	/** @var \OC\SubAdmin */
 	private $subAdmin = null;
 
-	/** @var ILogger */
-	private $logger;
-
 	/**
 	 * @param \OC\User\Manager $userManager
+	 * @param EventDispatcherInterface $dispatcher
 	 * @param ILogger $logger
 	 */
-	public function __construct(\OC\User\Manager $userManager, ILogger $logger) {
+	public function __construct(\OC\User\Manager $userManager,
+								EventDispatcherInterface $dispatcher,
+								ILogger $logger) {
 		$this->userManager = $userManager;
+		$this->dispatcher = $dispatcher;
 		$this->logger = $logger;
+
 		$cachedGroups = & $this->cachedGroups;
 		$cachedUserGroups = & $this->cachedUserGroups;
 		$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
 			unset($cachedGroups[$group->getGID()]);
-			$cachedUserGroups = array();
+			$cachedUserGroups = [];
 		});
 		$this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
-			$cachedUserGroups = array();
+			$cachedUserGroups = [];
 		});
 		$this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
-			$cachedUserGroups = array();
+			$cachedUserGroups = [];
 		});
 	}
 
@@ -144,7 +143,7 @@ public function addBackend($backend) {
 	}
 
 	public function clearBackends() {
-		$this->backends = array();
+		$this->backends = [];
 		$this->clearCaches();
 	}
 
@@ -158,8 +157,8 @@ public function getBackends() {
 
 
 	protected function clearCaches() {
-		$this->cachedGroups = array();
-		$this->cachedUserGroups = array();
+		$this->cachedGroups = [];
+		$this->cachedUserGroups = [];
 	}
 
 	/**
@@ -179,7 +178,7 @@ public function get($gid) {
 	 * @return \OCP\IGroup
 	 */
 	protected function getGroupObject($gid, $displayName = null) {
-		$backends = array();
+		$backends = [];
 		foreach ($this->backends as $backend) {
 			if ($backend->implementsActions(\OC\Group\Backend::GROUP_DETAILS)) {
 				$groupData = $backend->getGroupDetails($gid);
@@ -197,7 +196,7 @@ protected function getGroupObject($gid, $displayName = null) {
 		if (count($backends) === 0) {
 			return null;
 		}
-		$this->cachedGroups[$gid] = new Group($gid, $backends, $this->userManager, $this, $displayName);
+		$this->cachedGroups[$gid] = new Group($gid, $backends, $this->dispatcher, $this->userManager, $this, $displayName);
 		return $this->cachedGroups[$gid];
 	}
 
@@ -239,7 +238,7 @@ public function createGroup($gid) {
 	 * @return \OC\Group\Group[]
 	 */
 	public function search($search, $limit = null, $offset = null) {
-		$groups = array();
+		$groups = [];
 		foreach ($this->backends as $backend) {
 			$groupIds = $backend->getGroups($search, $limit, $offset);
 			foreach ($groupIds as $groupId) {
@@ -276,7 +275,7 @@ public function getUserIdGroups($uid) {
 		if (isset($this->cachedUserGroups[$uid])) {
 			return $this->cachedUserGroups[$uid];
 		}
-		$groups = array();
+		$groups = [];
 		foreach ($this->backends as $backend) {
 			$groupIds = $backend->getUserGroups($uid);
 			if (is_array($groupIds)) {
@@ -351,11 +350,11 @@ public function getUserGroupNames(IUser $user) {
 	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		$group = $this->get($gid);
 		if(is_null($group)) {
-			return array();
+			return [];
 		}
 
 		$search = trim($search);
-		$groupUsers = array();
+		$groupUsers = [];
 
 		if(!empty($search)) {
 			// only user backends have the capability to do a complex search for users
@@ -384,7 +383,7 @@ public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0
 			$groupUsers = $group->searchUsers('', $limit, $offset);
 		}
 
-		$matchingUsers = array();
+		$matchingUsers = [];
 		foreach($groupUsers as $groupUser) {
 			$matchingUsers[$groupUser->getUID()] = $groupUser->getDisplayName();
 		}

lib/private/Server.php

@@ -316,14 +316,13 @@ public function __construct($webRoot, \OC\Config $config) {
 		$this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
 
 		$this->registerService(\OC\User\Manager::class, function (Server $c) {
-			$config = $c->getConfig();
-			return new \OC\User\Manager($config);
+			return new \OC\User\Manager($c->getConfig(), $c->getEventDispatcher());
 		});
 		$this->registerAlias('UserManager', \OC\User\Manager::class);
 		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
 
 		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
-			$groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
+			$groupManager = new \OC\Group\Manager($this->getUserManager(), $c->getEventDispatcher(), $this->getLogger());
 			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
 				\OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
 			});
@@ -1095,6 +1094,8 @@ public function __construct($webRoot, \OC\Config $config) {
 
 		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
 
+		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
+
 		$this->registerService('SettingsManager', function (Server $c) {
 			$manager = new \OC\Settings\Manager(
 				$c->getLogger(),