Add .ics and .vcf suffix to object resources

This fixes #61

crates/carddav/src/address_object/resource.rs

@@ -101,31 +101,13 @@ impl Resource for AddressObjectResource {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Deserialize)]
 pub struct AddressObjectPathComponents {
     pub principal: String,
     pub addressbook_id: String,
     pub object_id: String,
 }
 
-impl<'de> Deserialize<'de> for AddressObjectPathComponents {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        type Inner = (String, String, String);
-        let (principal, addressbook_id, mut object) = Inner::deserialize(deserializer)?;
-        if object.ends_with(".vcf") {
-            object.truncate(object.len() - 4);
-        }
-        Ok(Self {
-            principal,
-            addressbook_id,
-            object_id: object,
-        })
-    }
-}
-
 #[async_trait(?Send)]
 impl<AS: AddressbookStore> ResourceService for AddressObjectResourceService<AS> {
     type PathComponents = AddressObjectPathComponents;

crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs

@@ -31,7 +31,7 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
     addressbook_id: &str,
     store: &AS,
 ) -> Result<(Vec<AddressObject>, Vec<String>), Error> {
-    let resource_def = ResourceDef::prefix(path).join(&ResourceDef::new("/{object_id}"));
+    let resource_def = ResourceDef::prefix(path).join(&ResourceDef::new("/{object_id}.vcf"));
 
     let mut result = vec![];
     let mut not_found = vec![];
@@ -83,7 +83,7 @@ pub async fn handle_addressbook_multiget<AS: AddressbookStore>(
 
     let mut responses = Vec::new();
     for object in objects {
-        let path = format!("{}/{}", req.path(), object.get_id());
+        let path = format!("{}/{}.vcf", req.path(), object.get_id());
         responses.push(
             AddressObjectResource {
                 object,

crates/carddav/src/addressbook/methods/report/sync_collection.rs

@@ -1,19 +1,19 @@
 use crate::{
-    address_object::resource::{AddressObjectPropWrapper, AddressObjectResource},
     Error,
+    address_object::resource::{AddressObjectPropWrapper, AddressObjectResource},
 };
-use actix_web::{http::StatusCode, HttpRequest};
+use actix_web::{HttpRequest, http::StatusCode};
 use rustical_dav::{
     resource::Resource,
     xml::{
-        multistatus::ResponseElement, sync_collection::SyncCollectionRequest, MultistatusElement,
-        PropElement, PropfindType,
+        MultistatusElement, PropElement, PropfindType, multistatus::ResponseElement,
+        sync_collection::SyncCollectionRequest,
     },
 };
 use rustical_store::{
+    AddressbookStore,
     auth::User,
     synctoken::{format_synctoken, parse_synctoken},
-    AddressbookStore,
 };
 
 pub async fn handle_sync_collection<AS: AddressbookStore>(
@@ -44,7 +44,11 @@ pub async fn handle_sync_collection<AS: AddressbookStore>(
 
     let mut responses = Vec::new();
     for object in new_objects {
-        let path = format!("{}/{}", req.path().trim_end_matches('/'), object.get_id());
+        let path = format!(
+            "{}/{}.vcf",
+            req.path().trim_end_matches('/'),
+            object.get_id()
+        );
         responses.push(
             AddressObjectResource {
                 object,
@@ -55,7 +59,7 @@ pub async fn handle_sync_collection<AS: AddressbookStore>(
     }
 
     for object_id in deleted_objects {
-        let path = format!("{}/{}", req.path().trim_end_matches('/'), object_id);
+        let path = format!("{}/{}.vcf", req.path().trim_end_matches('/'), object_id);
         responses.push(ResponseElement {
             href: path,
             status: Some(StatusCode::NOT_FOUND),

crates/carddav/src/lib.rs

@@ -68,13 +68,13 @@ pub fn carddav_service<AP: AuthenticationProvider, A: AddressbookStore, S: Subsc
                             .name(PrincipalResource::route_name()),
                     )
                     .service(
-                        web::scope("/{addressbook}")
+                        web::scope("/{addressbook_id}")
                             .service(
                                 AddressbookResourceService::<A, S>::new(store.clone())
                                     .actix_resource(),
                             )
                             .service(
-                                web::scope("/{object}").service(
+                                web::scope("/{object_id}.vcf").service(
                                     AddressObjectResourceService::<A>::new(store.clone())
                                         .actix_resource(),
                                 ),