Make sure collections have trailing slashes (py-caldav is very pedantic about that)

crates/caldav/src/calendar/service.rs

@@ -50,6 +50,7 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
     type PrincipalUri = CalDavPrincipalUri;
 
     const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
+    const IS_COLLECTION: bool = true;
 
     async fn get_resource(
         &self,

crates/caldav/src/calendar_object/service.rs

@@ -50,6 +50,7 @@ impl<C: CalendarStore> ResourceService for CalendarObjectResourceService<C> {
     type PrincipalUri = CalDavPrincipalUri;
 
     const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
+    const IS_COLLECTION: bool = false;
 
     async fn get_resource(
         &self,

crates/caldav/src/calendar_set/service.rs

@@ -45,6 +45,7 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarSetReso
     type PrincipalUri = CalDavPrincipalUri;
 
     const DAV_HEADER: &str = "1, 3, access-control, extended-mkcol, calendar-access";
+    const IS_COLLECTION: bool = true;
 
     async fn get_resource(
         &self,

crates/caldav/src/lib.rs

@@ -24,7 +24,7 @@ pub struct CalDavPrincipalUri(&'static str);
 
 impl PrincipalUri for CalDavPrincipalUri {
     fn principal_uri(&self, principal: &str) -> String {
-        format!("{}/principal/{}", self.0, principal)
+        format!("{}/principal/{}/", self.0, principal)
     }
 }
 

crates/caldav/src/principal/mod.rs

@@ -48,7 +48,7 @@ impl Resource for PrincipalResource {
                 .map(|principal| puri.principal_uri(principal))
                 .flat_map(|principal_url| {
                     self.home_set.iter().map(move |&home_name| {
-                        HrefElement::new(format!("{}/{}", &principal_url, home_name))
+                        HrefElement::new(format!("{}{}/", &principal_url, home_name))
                     })
                 })
                 .collect(),

crates/caldav/src/principal/service.rs

@@ -46,6 +46,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore, BS: Ca
     type PrincipalUri = CalDavPrincipalUri;
 
     const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
+    const IS_COLLECTION: bool = true;
 
     async fn get_resource(
         &self,

crates/carddav/src/address_object/service.rs

@@ -41,6 +41,7 @@ impl<AS: AddressbookStore> ResourceService for AddressObjectResourceService<AS>
     type PrincipalUri = CardDavPrincipalUri;
 
     const DAV_HEADER: &str = "1, 3, access-control, addressbook";
+    const IS_COLLECTION: bool = false;
 
     async fn get_resource(
         &self,

crates/carddav/src/addressbook/service.rs

@@ -52,6 +52,7 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
     type PrincipalUri = CardDavPrincipalUri;
 
     const DAV_HEADER: &str = "1, 3, access-control, addressbook";
+    const IS_COLLECTION: bool = true;
 
     async fn get_resource(
         &self,

crates/carddav/src/lib.rs

@@ -23,7 +23,7 @@ pub struct CardDavPrincipalUri(&'static str);
 
 impl PrincipalUri for CardDavPrincipalUri {
     fn principal_uri(&self, principal: &str) -> String {
-        format!("{}/principal/{}", self.0, principal)
+        format!("{}/principal/{}/", self.0, principal)
     }
 }
 

crates/carddav/src/principal/service.rs

@@ -55,6 +55,7 @@ impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> Reso
     type PrincipalUri = CardDavPrincipalUri;
 
     const DAV_HEADER: &str = "1, 3, access-control, addressbook";
+    const IS_COLLECTION: bool = true;
 
     async fn get_resource(
         &self,

crates/dav/src/resource/methods/propfind.rs

@@ -76,8 +76,13 @@ pub(crate) async fn route_propfind<R: ResourceService>(
     let mut member_responses = Vec::new();
     if depth != &Depth::Zero {
         for member in resource_service.get_members(path_components).await? {
+            // Collections should have a trailing slash
+            let mut name = member.get_name();
+            if R::IS_COLLECTION {
+                name.push('/')
+            }
             member_responses.push(member.propfind_typed(
-                &format!("{}/{}", path.trim_end_matches('/'), member.get_name()),
+                &format!("{}/{}", path.trim_end_matches('/'), name),
                 &propfind_member.prop,
                 puri,
                 principal,

crates/dav/src/resource/resource_service.rs

@@ -18,6 +18,7 @@ pub trait ResourceService: Clone + Sized + Send + Sync + AxumMethods + 'static {
     type PrincipalUri: PrincipalUri;
 
     const DAV_HEADER: &'static str;
+    const IS_COLLECTION: bool;
 
     async fn get_members(
         &self,

crates/dav/src/resources/root.rs

@@ -77,6 +77,7 @@ where
     type PrincipalUri = PURI;
 
     const DAV_HEADER: &str = "1, 3, access-control";
+    const IS_COLLECTION: bool = true;
 
     async fn get_resource(&self, _: &()) -> Result<Self::Resource, Self::Error> {
         Ok(RootResource::<PRS::Resource, P>::default())