From 9e5eaa5e1ce771c4980cd0e6fc87a35db4d2e246 Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Thu, 12 Jun 2025 15:23:02 +0200
Subject: [PATCH] Fix bug where principal collections would return information
 about the requesting user instead of the principal resource

---
 crates/caldav/src/principal/mod.rs  | 6 ++++--
 crates/carddav/src/principal/mod.rs | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/crates/caldav/src/principal/mod.rs b/crates/caldav/src/principal/mod.rs
index 11a5e9c..69bf843 100644
--- a/crates/caldav/src/principal/mod.rs
+++ b/crates/caldav/src/principal/mod.rs
@@ -44,7 +44,8 @@ impl Resource for PrincipalResource {
         let principal_url = puri.principal_uri(&self.principal.id);
 
         let home_set = CalendarHomeSet(
-            user.memberships()
+            self.principal
+                .memberships()
                 .into_iter()
                 .map(|principal| puri.principal_uri(principal).into())
                 .collect(),
@@ -65,7 +66,8 @@ impl Resource for PrincipalResource {
                     }
                     PrincipalPropName::GroupMembership => {
                         PrincipalProp::GroupMembership(GroupMembership(
-                            user.memberships_without_self()
+                            self.principal
+                                .memberships_without_self()
                                 .iter()
                                 .map(|principal| puri.principal_uri(principal).into())
                                 .collect(),
diff --git a/crates/carddav/src/principal/mod.rs b/crates/carddav/src/principal/mod.rs
index a7186ff..c12f319 100644
--- a/crates/carddav/src/principal/mod.rs
+++ b/crates/carddav/src/principal/mod.rs
@@ -44,7 +44,8 @@ impl Resource for PrincipalResource {
         let principal_href = HrefElement::new(puri.principal_uri(&user.id));
 
         let home_set = AddressbookHomeSet(
-            user.memberships()
+            self.principal
+                .memberships()
                 .into_iter()
                 .map(|principal| puri.principal_uri(principal))
                 .map(HrefElement::new)
@@ -61,7 +62,8 @@ impl Resource for PrincipalResource {
                     PrincipalPropName::PrincipalAddress => PrincipalProp::PrincipalAddress(None),
                     PrincipalPropName::GroupMembership => {
                         PrincipalProp::GroupMembership(GroupMembership(
-                            user.memberships_without_self()
+                            self.principal
+                                .memberships_without_self()
                                 .iter()
                                 .map(|principal| puri.principal_uri(principal).into())
                                 .collect(),