Remove all that extension business and replace with internal properties

crates/carddav/src/address_object/resource.rs

@@ -3,7 +3,6 @@ use actix_web::{dev::ResourceMap, web::Data, HttpRequest};
 use async_trait::async_trait;
 use derive_more::derive::{From, Into};
 use rustical_dav::{
-    extensions::CommonPropertiesProp,
     privileges::UserPrivilegeSet,
     resource::{Resource, ResourceService},
 };
@@ -29,7 +28,7 @@ pub enum AddressObjectPropName {
     Getcontenttype,
 }
 
-#[derive(Default, Deserialize, Serialize, From, PartialEq)]
+#[derive(Default, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub enum AddressObjectProp {
     // WebDAV (RFC 2518)
@@ -40,10 +39,6 @@ pub enum AddressObjectProp {
     #[serde(rename = "CARD:address-data")]
     AddressData(String),
 
-    #[serde(skip_deserializing, rename = "$value")]
-    #[from]
-    ExtCommonProperties(CommonPropertiesProp),
-
     #[serde(other)]
     #[default]
     Invalid,

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

@@ -10,7 +10,7 @@ use actix_web::{
 };
 use rustical_dav::{
     methods::propfind::{PropElement, PropfindType},
-    resource::Resource,
+    resource::{CommonPropertiesProp, EitherProp, Resource},
     xml::{
         multistatus::{PropstatWrapper, ResponseElement},
         MultistatusElement,
@@ -68,7 +68,13 @@ pub async fn handle_addressbook_multiget<AS: AddressbookStore + ?Sized>(
     principal: &str,
     cal_id: &str,
     addr_store: &AS,
-) -> Result<MultistatusElement<PropstatWrapper<AddressObjectProp>, String>, Error> {
+) -> Result<
+    MultistatusElement<
+        PropstatWrapper<EitherProp<AddressObjectProp, CommonPropertiesProp>>,
+        String,
+    >,
+    Error,
+> {
     let principal_url = PrincipalResource::get_url(req.resource_map(), vec![principal]).unwrap();
     let (objects, not_found) = get_objects_addressbook_multiget(
         &addr_multiget,

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

@@ -5,7 +5,7 @@ use crate::{
 use actix_web::{http::StatusCode, HttpRequest};
 use rustical_dav::{
     methods::propfind::{PropElement, PropfindType},
-    resource::Resource,
+    resource::{CommonPropertiesProp, EitherProp, Resource},
     xml::{
         multistatus::{PropstatWrapper, ResponseElement},
         MultistatusElement,
@@ -47,7 +47,13 @@ pub async fn handle_sync_collection<AS: AddressbookStore + ?Sized>(
     principal: &str,
     addressbook_id: &str,
     addr_store: &AS,
-) -> Result<MultistatusElement<PropstatWrapper<AddressObjectProp>, String>, Error> {
+) -> Result<
+    MultistatusElement<
+        PropstatWrapper<EitherProp<AddressObjectProp, CommonPropertiesProp>>,
+        String,
+    >,
+    Error,
+> {
     let props = match sync_collection.prop {
         PropfindType::Allprop => {
             vec!["allprop".to_owned()]

crates/carddav/src/addressbook/resource.rs

@@ -10,7 +10,6 @@ use actix_web::web;
 use actix_web::{web::Data, HttpRequest};
 use async_trait::async_trait;
 use derive_more::derive::{From, Into};
-use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{Resource, ResourceService};
 use rustical_store::auth::User;
@@ -39,7 +38,7 @@ pub enum AddressbookPropName {
     Getctag,
 }
 
-#[derive(Default, Deserialize, Serialize, From, PartialEq)]
+#[derive(Default, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub enum AddressbookProp {
     // WebDAV (RFC 2518)
@@ -68,10 +67,6 @@ pub enum AddressbookProp {
     // Didn't find the spec
     Getctag(String),
 
-    #[serde(skip_deserializing, rename = "$value")]
-    #[from]
-    ExtCommonProperties(CommonPropertiesProp),
-
     #[serde(other)]
     #[default]
     Invalid,
@@ -135,7 +130,6 @@ impl Resource for AddressbookResource {
             AddressbookProp::SyncToken(_) => Err(rustical_dav::Error::PropReadOnly),
             AddressbookProp::Getctag(_) => Err(rustical_dav::Error::PropReadOnly),
             AddressbookProp::Invalid => Err(rustical_dav::Error::PropReadOnly),
-            _ => panic!("we shouldn't end up here"),
         }
     }
 

crates/carddav/src/error.rs

@@ -1,4 +1,5 @@
 use actix_web::{http::StatusCode, HttpResponse};
+use tracing::error;
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
@@ -41,6 +42,7 @@ impl actix_web::ResponseError for Error {
         }
     }
     fn error_response(&self) -> actix_web::HttpResponse<actix_web::body::BoxBody> {
+        error!("Error: {self}");
         match self {
             Error::DavError(err) => err.error_response(),
             _ => HttpResponse::build(self.status_code()).body(self.to_string()),

crates/carddav/src/principal/mod.rs

@@ -4,8 +4,6 @@ use actix_web::dev::ResourceMap;
 use actix_web::web::Data;
 use actix_web::HttpRequest;
 use async_trait::async_trait;
-use derive_more::derive::From;
-use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{Resource, ResourceService};
 use rustical_dav::xml::HrefElement;
@@ -25,7 +23,7 @@ pub struct PrincipalResource {
     principal: String,
 }
 
-#[derive(Default, Deserialize, Serialize, From, PartialEq)]
+#[derive(Default, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub enum PrincipalProp {
     // WebDAV Access Control (RFC 3744)
@@ -38,10 +36,6 @@ pub enum PrincipalProp {
     #[serde(rename = "CARD:principal-address")]
     PrincipalAddress(Option<HrefElement>),
 
-    #[serde(skip_deserializing, rename = "$value")]
-    #[from]
-    ExtCommonProperties(CommonPropertiesProp),
-
     #[serde(other)]
     #[default]
     Invalid,