fixup! fixup! fix: use current user principal instead of the user sessionfix/current-user-principal

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php
index 3d650a4a059..cf8437292e7 100644
--- a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php
+++ b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php
@@ -40,7 +40,12 @@ class InvitationResponseServer {
 		$logger = Server::get(LoggerInterface::class);
 		$dispatcher = Server::get(IEventDispatcher::class);
 
-		$root = new RootCollection();
+		// allow custom principal uri option
+		if ($public) {
+			$root = new RootCollection(new PublicPrincipalPlugin());
+		} else {
+			$root = new RootCollection(new CustomPrincipalPlugin());
+		}
 		$this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
 
 		// Add maintenance plugin
@@ -56,13 +61,6 @@ class InvitationResponseServer {
 		));
 		$this->server->addPlugin(new AnonymousOptionsPlugin());
 
-		// allow custom principal uri option
-		if ($public) {
-			$this->server->addPlugin(new PublicPrincipalPlugin());
-		} else {
-			$this->server->addPlugin(new CustomPrincipalPlugin());
-		}
-
 		// allow setup of additional auth backends
 		$event = new SabrePluginAuthInitEvent($this->server);
 		$dispatcher->dispatchTyped($event);