frontend and ACL

.gitignore

@@ -4,3 +4,4 @@ node_modules/
 build
 vendor
 js/
+.idea/

lib/Command/Group.php

@@ -25,6 +25,7 @@
 use OCA\Circles\CirclesManager;
 use OCA\Circles\Model\Probes\CircleProbe;
 use OCA\GroupFolders\Folder\FolderManager;
+use OCP\Circles\ICirclesManager;
 use OCP\Constants;
 use OCP\Files\IRootFolder;
 use OCP\IGroupManager;
@@ -46,11 +47,20 @@ class Group extends Base {
 	private $rootFolder;
 	private $groupManager;
 
-	public function __construct(FolderManager $folderManager, IRootFolder $rootFolder, IGroupManager $groupManager) {
+	/** @var ICirclesManager */
+	private $circlesManager;
+
+	public function __construct(
+		FolderManager $folderManager,
+		IRootFolder $rootFolder,
+		IGroupManager $groupManager,
+		ICirclesManager $circlesManager
+	) {
 		parent::__construct();
 		$this->folderManager = $folderManager;
 		$this->rootFolder = $rootFolder;
 		$this->groupManager = $groupManager;
+		$this->circlesManager = $circlesManager;
 	}
 
 	protected function configure() {
@@ -72,13 +82,11 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			$groupString = $input->getArgument('group');
 
 			// confirmation that $groupString is a valid CircleId
-			/** @var CirclesManager $circlesManager */
-			$circlesManager = \OC::$server->get(CirclesManager::class);
-			$circlesManager->startSuperSession();
+			$this->circlesManager->startSuperSession();
 
 			$probe = new CircleProbe();
 			$probe->includeSystemCircles();
-			$circlesManager->getCircle($groupString);
+			$this->circlesManager->getCircle($groupString);
 
 //			$group = $this->groupManager->get($groupString);
 			if ($input->getOption('delete')) {

lib/Command/ListCommand.php

@@ -23,6 +23,7 @@
 
 use OC\Core\Command\Base;
 use OCA\GroupFolders\Folder\FolderManager;
+use OCP\Circles\ICirclesManager;
 use OCP\Constants;
 use OCP\Files\IRootFolder;
 use Symfony\Component\Console\Helper\Table;
@@ -38,11 +39,13 @@ class ListCommand extends Base {
 	];
 
 	private $folderManager;
+	private $circlesManager;
 	private $rootFolder;
 
-	public function __construct(FolderManager $folderManager, IRootFolder $rootFolder) {
+	public function __construct(FolderManager $folderManager, ICirclesManager $circlesManager, IRootFolder $rootFolder) {
 		parent::__construct();
 		$this->folderManager = $folderManager;
+		$this->circlesManager = $circlesManager;
 		$this->rootFolder = $rootFolder;
 	}
 
@@ -54,6 +57,7 @@ protected function configure() {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
+		$this->circlesManager->startSuperSession();
 		$folders = $this->folderManager->getAllFoldersWithSize($this->rootFolder->getMountPoint()->getNumericStorageId());
 		usort($folders, function ($a, $b) {
 			return $a['id'] - $b['id'];
@@ -73,19 +77,21 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			$this->writeArrayInOutputFormat($input, $output, $folders);
 		} else {
 			$table = new Table($output);
-			$table->setHeaders(['Folder Id', 'Name', 'Groups', 'Quota', 'Size', 'Advanced Permissions', 'Manage advanced permissions']);
+			$table->setHeaders(['Folder Id', 'Name', 'Groups', 'Display Name', 'Quota', 'Size', 'Advanced Permissions', 'Manage advanced permissions']);
 			$table->setRows(array_map(function ($folder) {
 				$folder['size'] = \OCP\Util::humanFileSize($folder['size']);
 				$folder['quota'] = ($folder['quota'] > 0) ? \OCP\Util::humanFileSize($folder['quota']) : 'Unlimited';
 				$groupStrings = array_map(function (string $groupId, int $permissions) {
-					return $groupId . ': ' . $this->permissionsToString($permissions);
+					$circle = $this->circlesManager->getCircle($groupId);
+					return $circle->getDisplayName(). ' (' . $groupId . ') : ' . $this->permissionsToString($permissions);
 				}, array_keys($folder['groups']), array_values($folder['groups']));
 				$folder['groups'] = implode("\n", $groupStrings);
 				$folder['acl'] = $folder['acl'] ? 'Enabled' : 'Disabled';
 				$manageStrings = array_map(function ($manage) {
 					return $manage['id'] . ' (' . $manage['type'] . ')';
 				}, $folder['manage']);
 				$folder['manage'] = implode("\n", $manageStrings);
+
 				return $folder;
 			}, $folders));
 			$table->render();

lib/Controller/FolderController.php

@@ -26,11 +26,14 @@
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\Files\IRootFolder;
+use OCP\IGroupManager;
 use OCP\IRequest;
 
 class FolderController extends OCSController {
 	/** @var FolderManager */
 	private $manager;
+	/** @var IGroupManager */
+	private $groupManager;
 	/** @var MountProvider */
 	private $mountProvider;
 	/** @var IRootFolder */
@@ -42,12 +45,14 @@ public function __construct(
 		$AppName,
 		IRequest $request,
 		FolderManager $manager,
+		IGroupManager $groupManager,
 		MountProvider $mountProvider,
 		IRootFolder $rootFolder,
 		$userId
 	) {
 		parent::__construct($AppName, $request);
 		$this->manager = $manager;
+		$this->groupManager = $groupManager;
 		$this->mountProvider = $mountProvider;
 		$this->rootFolder = $rootFolder;
 		$this->userId = $userId;
@@ -209,22 +214,25 @@ private function folderDataForXML($data) {
 
 	/**
 	 * @NoAdminRequired
-	 * @param $id
+	 *
+	 * @param int $id
 	 * @param $fileId
+	 * @param string $source
 	 * @param string $search
+	 *
 	 * @return DataResponse
 	 */
-	public function aclMappingSearch($id, $fileId, $search = ''): DataResponse {
-		$users = [];
-		$groups = [];
-
+	public function aclMappingSearch(int $id, $fileId, string $source = '', string $search = ''): DataResponse {
+		$entities = [];
 		if ($this->manager->canManageACL($id, $this->userId) === true) {
-			$groups = $this->manager->searchGroups($id, $search);
-			$users = $this->manager->searchUsers($id, $search);
+			$entities = $this->manager->searchEntities(
+				$id,
+				$search,
+				($this->groupManager->isAdmin($this->userId) && $source === 'settings')
+			);
 		}
 		return new DataResponse([
-			'users' => $users,
-			'groups' => $groups,
+			'entities' => $entities
 		]);
 	}
 }