diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-10-28 09:08:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-28 09:08:03 +0100 |
| commit | 510b6533304b254e917d298fbe40a69c4a3f410d (patch) | |
| tree | 66d9ff62ed28fdb9b5a54fc61302be9002602e4e /apps | |
| parent | e4288529fa5864edf2a188fc22afa02fa96ca455 (diff) | |
| parent | 46ce7277c735bc91dc07908d84bbed796f64b229 (diff) | |
| download | nextcloud-server-510b6533304b254e917d298fbe40a69c4a3f410d.tar.gz nextcloud-server-510b6533304b254e917d298fbe40a69c4a3f410d.zip | |
Merge pull request #23723 from nextcloud/fix/dav_server_auth_init
Also run the SabreAuthInitEvent for the main server
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/Server.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 44ba036de87..3dd54bd2fc0 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -60,11 +60,13 @@ use OCA\DAV\Connector\Sabre\SharesPlugin; use OCA\DAV\Connector\Sabre\TagsPlugin; use OCA\DAV\DAV\CustomPropertiesBackend; use OCA\DAV\DAV\PublicAuth; +use OCA\DAV\Events\SabrePluginAuthInitEvent; use OCA\DAV\Files\BrowserErrorPagePlugin; use OCA\DAV\Files\LazySearchBackend; use OCA\DAV\Provisioning\Apple\AppleProvisioningPlugin; use OCA\DAV\SystemTag\SystemTagPlugin; use OCA\DAV\Upload\ChunkingPlugin; +use OCP\EventDispatcher\IEventDispatcher; use OCP\IRequest; use OCP\SabrePluginEvent; use Sabre\CardDAV\VCFExportPlugin; @@ -88,6 +90,8 @@ class Server { $this->baseUri = $baseUri; $logger = \OC::$server->getLogger(); $dispatcher = \OC::$server->getEventDispatcher(); + /** @var IEventDispatcher $newDispatcher */ + $newDispatcher = \OC::$server->query(IEventDispatcher::class); $root = new RootCollection(); $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root)); @@ -118,6 +122,9 @@ class Server { $event = new SabrePluginEvent($this->server); $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event); + $event = new SabrePluginAuthInitEvent($this->server); + $newDispatcher->dispatchTyped($event); + $bearerAuthBackend = new BearerAuth( \OC::$server->getUserSession(), \OC::$server->getSession(), |