diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2225101ec..0dd691cfd 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -26,7 +26,6 @@ While theoretically any other authentication provider implementing either one of
User_SAML
-
https://portal.nextcloud.com/article/configuring-single-sign-on-10.html
@@ -61,9 +60,4 @@ While theoretically any other authentication provider implementing either one of
OCA\User_SAML\Settings\Admin
OCA\User_SAML\Settings\Section
-
-
- OCA\User_SAML\DavPlugin
-
-
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 150f395a2..491e9e104 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -12,10 +12,12 @@
use OC\Security\CSRF\CsrfTokenManager;
use OC\User\LoginException;
use OC_User;
+use OCA\DAV\Events\SabrePluginAddEvent;
use OCA\User_SAML\DavPlugin;
use OCA\User_SAML\GroupBackend;
use OCA\User_SAML\GroupManager;
use OCA\User_SAML\Listener\LoadAdditionalScriptsListener;
+use OCA\User_SAML\Listener\SabrePluginEventListener;
use OCA\User_SAML\Middleware\OnlyLoggedInMiddleware;
use OCA\User_SAML\SAMLSettings;
use OCA\User_SAML\UserBackend;
@@ -50,6 +52,7 @@ public function __construct(array $urlParams = []) {
public function register(IRegistrationContext $context): void {
$context->registerMiddleware(OnlyLoggedInMiddleware::class);
$context->registerEventListener(BeforeTemplateRenderedEvent::class, LoadAdditionalScriptsListener::class);
+ $context->registerEventListener(SabrePluginAddEvent::class, SabrePluginEventListener::class);
$context->registerService(DavPlugin::class, function (ContainerInterface $c) {
return new DavPlugin(
$c->get(ISession::class),
diff --git a/lib/Listener/SabrePluginEventListener.php b/lib/Listener/SabrePluginEventListener.php
new file mode 100644
index 000000000..c30724ecd
--- /dev/null
+++ b/lib/Listener/SabrePluginEventListener.php
@@ -0,0 +1,26 @@
+ */
+class SabrePluginEventListener implements IEventListener {
+ public function handle(Event $event): void {
+ if (!$event instanceof SabrePluginAddEvent) {
+ return;
+ }
+ $event->getServer()->addPlugin(Server::get(DavPlugin::class));
+ }
+}
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index dd0a1ef0d..a1e48ba4b 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -4,12 +4,6 @@
- SPDX-License-Identifier: AGPL-3.0-or-later
-->
-
-
-