mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18061 from nextcloud/bugfix/noid/dav-plugin-old 

Load apps dav plugins on the old webdav route
This commit is contained in:
Roeland Jago Douma 2019-12-16 13:38:38 +01:00 committed by GitHub
parent faf58e4cac 1593322397
commit 8d7baaff74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/dav/appinfo/v1/publicwebdav.php
View File

@ -52,7 +52,8 @@ $serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory(
\OC::$server->getMountManager(), \OC::$server->getMountManager(),
\OC::$server->getTagManager(), \OC::$server->getTagManager(),
\OC::$server->getRequest(), \OC::$server->getRequest(),
\OC::$server->getPreviewManager() \OC::$server->getPreviewManager(),
\OC::$server->getEventDispatcher()
); );
$requestUri = \OC::$server->getRequest()->getRequestUri(); $requestUri = \OC::$server->getRequest()->getRequestUri();

3
apps/dav/appinfo/v1/webdav.php
View File

@ -44,7 +44,8 @@ $serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
\OC::$server->getMountManager(), \OC::$server->getMountManager(),
\OC::$server->getTagManager(), \OC::$server->getTagManager(),
\OC::$server->getRequest(), \OC::$server->getRequest(),
\OC::$server->getPreviewManager() \OC::$server->getPreviewManager(),
\OC::$server->getEventDispatcher()
); );
// Backends // Backends

21
apps/dav/lib/Connector/Sabre/ServerFactory.php
View File

@ -31,6 +31,7 @@
namespace OCA\DAV\Connector\Sabre; namespace OCA\DAV\Connector\Sabre;
use OC\Files\Node\Folder; use OC\Files\Node\Folder;
use OCA\DAV\AppInfo\PluginManager;
use OCA\DAV\Files\BrowserErrorPagePlugin; use OCA\DAV\Files\BrowserErrorPagePlugin;
use OCP\Files\Mount\IMountManager; use OCP\Files\Mount\IMountManager;
use OCP\IConfig; use OCP\IConfig;
@ -40,7 +41,9 @@ use OCP\IPreview;
use OCP\IRequest; use OCP\IRequest;
use OCP\ITagManager; use OCP\ITagManager;
use OCP\IUserSession; use OCP\IUserSession;
use OCP\SabrePluginEvent;
use Sabre\DAV\Auth\Plugin; use Sabre\DAV\Auth\Plugin;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
class ServerFactory { class ServerFactory {
/** @var IConfig */ /** @var IConfig */
@ -59,6 +62,8 @@ class ServerFactory {
private $request; private $request;
/** @var IPreview */ /** @var IPreview */
private $previewManager; private $previewManager;
/** @var EventDispatcherInterface */
private $eventDispatcher;
/** /**
* @param IConfig $config * @param IConfig $config
@ -78,7 +83,8 @@ class ServerFactory {
IMountManager $mountManager, IMountManager $mountManager,
ITagManager $tagManager, ITagManager $tagManager,
IRequest $request, IRequest $request,
IPreview $previewManager IPreview $previewManager,
EventDispatcherInterface $eventDispatcher
) { ) {
$this->config = $config; $this->config = $config;
$this->logger = $logger; $this->logger = $logger;
@ -88,6 +94,7 @@ class ServerFactory {
$this->tagManager = $tagManager; $this->tagManager = $tagManager;
$this->request = $request; $this->request = $request;
$this->previewManager = $previewManager; $this->previewManager = $previewManager;
$this->eventDispatcher = $eventDispatcher;
} }
/** /**
@ -196,6 +203,18 @@ class ServerFactory {
); );
} }
$server->addPlugin(new \OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin()); $server->addPlugin(new \OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin());
// Load dav plugins from apps
$event = new SabrePluginEvent($server);
$this->eventDispatcher->dispatch($event);
$pluginManager = new PluginManager(
\OC::$server,
\OC::$server->getAppManager()
);
foreach ($pluginManager->getAppPlugins() as $appPlugin) {
$server->addPlugin($appPlugin);
}
}, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request }, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request
return $server; return $server;
} }

3
apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTestCase.php
View File

@ -67,7 +67,8 @@ abstract class RequestTestCase extends TestCase {
$this->getMockBuilder(IRequest::class) $this->getMockBuilder(IRequest::class)
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(), ->getMock(),
\OC::$server->getPreviewManager() \OC::$server->getPreviewManager(),
\OC::$server->getEventDispatcher()
); );
} }