From 61056587c91f676b55dfd3a86e9d972455c7d448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 3 Jun 2022 07:15:17 +0200 Subject: Only load direct editing capabilities when required MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files/composer/composer/autoload_classmap.php | 1 + apps/files/composer/composer/autoload_static.php | 1 + apps/files/lib/AppInfo/Application.php | 2 + apps/files/lib/Capabilities.php | 31 ++----------- apps/files/lib/DirectEditingCapabilities.php | 51 ++++++++++++++++++++++ 5 files changed, 58 insertions(+), 28 deletions(-) create mode 100644 apps/files/lib/DirectEditingCapabilities.php (limited to 'apps') diff --git a/apps/files/composer/composer/autoload_classmap.php b/apps/files/composer/composer/autoload_classmap.php index 05ea0a46ca1..46da43165b9 100644 --- a/apps/files/composer/composer/autoload_classmap.php +++ b/apps/files/composer/composer/autoload_classmap.php @@ -40,6 +40,7 @@ return array( 'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php', 'OCA\\Files\\Db\\TransferOwnership' => $baseDir . '/../lib/Db/TransferOwnership.php', 'OCA\\Files\\Db\\TransferOwnershipMapper' => $baseDir . '/../lib/Db/TransferOwnershipMapper.php', + 'OCA\\Files\\DirectEditingCapabilities' => $baseDir . '/../lib/DirectEditingCapabilities.php', 'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => $baseDir . '/../lib/Event/LoadAdditionalScriptsEvent.php', 'OCA\\Files\\Event\\LoadSidebar' => $baseDir . '/../lib/Event/LoadSidebar.php', 'OCA\\Files\\Exception\\TransferOwnershipException' => $baseDir . '/../lib/Exception/TransferOwnershipException.php', diff --git a/apps/files/composer/composer/autoload_static.php b/apps/files/composer/composer/autoload_static.php index ba39b2c5707..ea9d9715fd3 100644 --- a/apps/files/composer/composer/autoload_static.php +++ b/apps/files/composer/composer/autoload_static.php @@ -55,6 +55,7 @@ class ComposerStaticInitFiles 'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php', 'OCA\\Files\\Db\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Db/TransferOwnership.php', 'OCA\\Files\\Db\\TransferOwnershipMapper' => __DIR__ . '/..' . '/../lib/Db/TransferOwnershipMapper.php', + 'OCA\\Files\\DirectEditingCapabilities' => __DIR__ . '/..' . '/../lib/DirectEditingCapabilities.php', 'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => __DIR__ . '/..' . '/../lib/Event/LoadAdditionalScriptsEvent.php', 'OCA\\Files\\Event\\LoadSidebar' => __DIR__ . '/..' . '/../lib/Event/LoadSidebar.php', 'OCA\\Files\\Exception\\TransferOwnershipException' => __DIR__ . '/..' . '/../lib/Exception/TransferOwnershipException.php', diff --git a/apps/files/lib/AppInfo/Application.php b/apps/files/lib/AppInfo/Application.php index 26d541f57e8..2662f2d6e9b 100644 --- a/apps/files/lib/AppInfo/Application.php +++ b/apps/files/lib/AppInfo/Application.php @@ -39,6 +39,7 @@ use OCA\Files\Capabilities; use OCA\Files\Collaboration\Resources\Listener; use OCA\Files\Collaboration\Resources\ResourceProvider; use OCA\Files\Controller\ApiController; +use OCA\Files\DirectEditingCapabilities; use OCA\Files\Event\LoadAdditionalScriptsEvent; use OCA\Files\Event\LoadSidebar; use OCA\Files\Listener\LegacyLoadAdditionalScriptsAdapter; @@ -111,6 +112,7 @@ class Application extends App implements IBootstrap { * Register capabilities */ $context->registerCapability(Capabilities::class); + $context->registerCapability(DirectEditingCapabilities::class); $context->registerEventListener(LoadAdditionalScriptsEvent::class, LegacyLoadAdditionalScriptsAdapter::class); $context->registerEventListener(LoadSidebar::class, LoadSidebarListener::class); diff --git a/apps/files/lib/Capabilities.php b/apps/files/lib/Capabilities.php index 29abfb5b253..3eb43578351 100644 --- a/apps/files/lib/Capabilities.php +++ b/apps/files/lib/Capabilities.php @@ -25,36 +25,15 @@ */ namespace OCA\Files; -use OCA\Files\Service\DirectEditingService; use OCP\Capabilities\ICapability; use OCP\IConfig; -use OCP\IURLGenerator; -/** - * Class Capabilities - * - * @package OCA\Files - */ class Capabilities implements ICapability { - /** @var IConfig */ - protected $config; - - /** @var DirectEditingService */ - protected $directEditingService; + protected IConfig $config; - /** @var IURLGenerator */ - private $urlGenerator; - - /** - * Capabilities constructor. - * - * @param IConfig $config - */ - public function __construct(IConfig $config, DirectEditingService $directEditingService, IURLGenerator $urlGenerator) { + public function __construct(IConfig $config) { $this->config = $config; - $this->directEditingService = $directEditingService; - $this->urlGenerator = $urlGenerator; } /** @@ -66,11 +45,7 @@ class Capabilities implements ICapability { return [ 'files' => [ 'bigfilechunking' => true, - 'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']), - 'directEditing' => [ - 'url' => $this->urlGenerator->linkToOCSRouteAbsolute('files.DirectEditing.info'), - 'etag' => $this->directEditingService->getDirectEditingETag() - ] + 'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']) ], ]; } diff --git a/apps/files/lib/DirectEditingCapabilities.php b/apps/files/lib/DirectEditingCapabilities.php new file mode 100644 index 00000000000..782f7019ac7 --- /dev/null +++ b/apps/files/lib/DirectEditingCapabilities.php @@ -0,0 +1,51 @@ + + * + * @author Julius Härtl + * + * @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 . + * + */ +namespace OCA\Files; + +use OCA\Files\Service\DirectEditingService; +use OCP\Capabilities\ICapability; +use OCP\Capabilities\IInitialStateExcludedCapability; +use OCP\IURLGenerator; + +class DirectEditingCapabilities implements ICapability, IInitialStateExcludedCapability { + + protected DirectEditingService $directEditingService; + protected IURLGenerator $urlGenerator; + + public function __construct(DirectEditingService $directEditingService, IURLGenerator $urlGenerator) { + $this->directEditingService = $directEditingService; + $this->urlGenerator = $urlGenerator; + } + + public function getCapabilities() { + return [ + 'files' => [ + 'directEditing' => [ + 'url' => $this->urlGenerator->linkToOCSRouteAbsolute('files.DirectEditing.info'), + 'etag' => $this->directEditingService->getDirectEditingETag() + ] + ], + ]; + } +} -- cgit v1.2.3