Collaboration resources

apps/files/composer/composer/autoload_classmap.php

@@ -23,6 +23,8 @@
     'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
     'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir . '/../lib/BackgroundJob/ScanFiles.php',
     'OCA\\Files\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
+    'OCA\\Files\\Collaboration\\Resources\\Listener' => $baseDir . '/../lib/Collaboration/Resources/Listener.php',
+    'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => $baseDir . '/../lib/Collaboration/Resources/ResourceProvider.php',
     'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir . '/../lib/Command/DeleteOrphanedFiles.php',
     'OCA\\Files\\Command\\Scan' => $baseDir . '/../lib/Command/Scan.php',
     'OCA\\Files\\Command\\ScanAppData' => $baseDir . '/../lib/Command/ScanAppData.php',

apps/files/composer/composer/autoload_static.php

@@ -38,6 +38,8 @@ class ComposerStaticInitFiles
         'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
         'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__ . '/..' . '/../lib/BackgroundJob/ScanFiles.php',
         'OCA\\Files\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
+        'OCA\\Files\\Collaboration\\Resources\\Listener' => __DIR__ . '/..' . '/../lib/Collaboration/Resources/Listener.php',
+        'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => __DIR__ . '/..' . '/../lib/Collaboration/Resources/ResourceProvider.php',
         'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__ . '/..' . '/../lib/Command/DeleteOrphanedFiles.php',
         'OCA\\Files\\Command\\Scan' => __DIR__ . '/..' . '/../lib/Command/Scan.php',
         'OCA\\Files\\Command\\ScanAppData' => __DIR__ . '/..' . '/../lib/Command/ScanAppData.php',

apps/files/lib/AppInfo/Application.php

@@ -27,9 +27,12 @@
 namespace OCA\Files\AppInfo;
 
 use OCA\Files\Activity\Helper;
+use OCA\Files\Collaboration\Resources\Listener;
+use OCA\Files\Collaboration\Resources\ResourceProvider;
 use OCA\Files\Controller\ApiController;
 use OCP\AppFramework\App;
 use \OCA\Files\Service\TagService;
+use OCP\Collaboration\Resources\IManager;
 use \OCP\IContainer;
 use OCA\Files\Controller\ViewController;
 use OCA\Files\Capabilities;
@@ -99,5 +102,13 @@ public function __construct(array $urlParams=array()) {
 		 * Register capabilities
 		 */
 		$container->registerCapability(Capabilities::class);
+
+		/**
+		 * Register Collaboration ResourceProvider
+		 */
+		/** @var IManager $resourceManager */
+		$resourceManager = $container->query(IManager::class);
+		$resourceManager->registerResourceProvider(ResourceProvider::class);
+		Listener::register($server->getEventDispatcher());
 	}
 }

apps/files/lib/Collaboration/Resources/Listener.php

@@ -0,0 +1,44 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2019 Joas Schilling <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files\Collaboration\Resources;
+
+
+use OCP\Collaboration\Resources\IManager;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+class Listener {
+	public static function register(EventDispatcherInterface $dispatcher): void {
+		$dispatcher->addListener('OCP\Share::postShare', [self::class, 'shareModification']);
+		$dispatcher->addListener('OCP\Share::postUnshare', [self::class, 'shareModification']);
+		$dispatcher->addListener('OCP\Share::postUnshareFromSelf', [self::class, 'shareModification']);
+	}
+
+	public static function shareModification(): void {
+		/** @var IManager $resourceManager */
+		$resourceManager = \OC::$server->query(IManager::class);
+		/** @var ResourceProvider $resourceProvider */
+		$resourceProvider = \OC::$server->query(ResourceProvider::class);
+
+		$resourceManager->invalidateAccessCacheForProvider($resourceProvider);
+	}
+}

apps/files/lib/Collaboration/Resources/ResourceProvider.php

@@ -0,0 +1,140 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 Joas Schilling <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files\Collaboration\Resources;
+
+
+use OCP\Collaboration\Resources\IProvider;
+use OCP\Collaboration\Resources\IResource;
+use OCP\Collaboration\Resources\ResourceException;
+use OCP\Files\IRootFolder;
+use OCP\Files\Node;
+use OCP\IURLGenerator;
+use OCP\IUser;
+
+class ResourceProvider implements IProvider {
+
+	const RESOURCE_TYPE = 'files';
+
+	/** @var IRootFolder */
+	protected $rootFolder;
+
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
+	/** @var array */
+	protected $nodes = [];
+
+	public function __construct(IRootFolder $rootFolder, IURLGenerator $urlGenerator) {
+		$this->rootFolder = $rootFolder;
+		$this->urlGenerator = $urlGenerator;
+	}
+
+	private function getNode(IResource $resource): ?Node {
+		if (isset($this->nodes[(int) $resource->getId()])) {
+			return $this->nodes[(int) $resource->getId()];
+		}
+		$nodes = $this->rootFolder->getById((int) $resource->getId());
+		if (!empty($nodes)) {
+			$this->nodes[(int) $resource->getId()] = array_shift($nodes);
+			return $this->nodes[(int) $resource->getId()];
+		}
+		return null;
+	}
+
+	/**
+	 * Get the display name of a resource
+	 *
+	 * @param IResource $resource
+	 * @return string
+	 * @since 15.0.0
+	 */
+	public function getName(IResource $resource): string {
+		if (isset($this->nodes[(int) $resource->getId()])) {
+			return $this->nodes[(int) $resource->getId()]->getPath();
+		}
+		$node = $this->getNode($resource);
+		if ($node) {
+			return $node->getName();
+		}
+		return '';
+	}
+
+	/**
+	 * Can a user/guest access the collection
+	 *
+	 * @param IResource $resource
+	 * @param IUser $user
+	 * @return bool
+	 * @since 15.0.0
+	 */
+	public function canAccessResource(IResource $resource, IUser $user = null): bool {
+		if (!$user instanceof IUser) {
+			return false;
+		}
+
+		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
+		$nodes = $userFolder->getById((int) $resource->getId());
+
+		if (!empty($nodes)) {
+			$this->nodes[(int) $resource->getId()] = array_shift($nodes);
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the icon class of a resource
+	 *
+	 * @param IResource $resource
+	 * @return string
+	 * @since 15.0.0
+	 */
+	public function getIconClass(IResource $resource): string {
+		$node = $this->getNode($resource);
+		if ($node && $node->getMimetype() === 'httpd/unix-directory') {
+			return 'icon-files-dark';
+		}
+		return 'icon-filetype-file';
+	}
+
+	/**
+	 * Get the resource type of the provider
+	 *
+	 * @return string
+	 * @since 15.0.0
+	 */
+	public function getType(): string {
+		return self::RESOURCE_TYPE;
+	}
+
+	/**
+	 * Get the link to a resource
+	 *
+	 * @param IResource $resource
+	 * @return string
+	 * @since 15.0.0
+	 */
+	public function getLink(IResource $resource): string {
+		return $this->urlGenerator->linkToRoute('files.viewcontroller.showFile', ['fileid' => $resource->getId()]);
+	}
+}

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 = new \OC\User\User(self::USER_ID, null, \OC::$server->getEventDispatcher());
 		/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject $userSession */
 		$userSession = $this->createMock(IUserSession::class);
 		$userSession

apps/files_sharing/.babelrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        targets: {
+          browsers: ['last 2 versions', 'ie >= 11']
+        }
+      }
+    ]
+  ],
+  plugins: ['@babel/plugin-syntax-dynamic-import']
+}

apps/files_sharing/.eslintrc.js

@@ -0,0 +1,22 @@
+module.exports = {
+	env: {
+		browser: true,
+		es6: true
+	},
+	globals: {
+		t: true,
+		n: true,
+		OC: true,
+		OCA: true
+	},
+	extends: 'eslint:recommended',
+	parserOptions: {
+		sourceType: 'module'
+	},
+	rules: {
+		indent: ['error', 'tab'],
+		'linebreak-style': ['error', 'unix'],
+		quotes: ['error', 'single'],
+		semi: ['error', 'always']
+	}
+};

apps/files_sharing/appinfo/app.php

@@ -42,7 +42,7 @@
 $eventDispatcher->addListener(
 	'OCA\Files::loadAdditionalScripts',
 	function() {
-		\OCP\Util::addScript('files_sharing', 'additionalScripts');
+		\OCP\Util::addScript('files_sharing', 'dist/additionalScripts');
 	}
 );