From 020e836c42e190312fa67ea868cc3fcebb2f64cd Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Sat, 18 Jan 2025 23:09:42 +0100 Subject: [PATCH] Remove wrong principal-URL property --- crates/caldav/src/calendar_set/mod.rs | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/crates/caldav/src/calendar_set/mod.rs b/crates/caldav/src/calendar_set/mod.rs index cb8049b..33edf19 100644 --- a/crates/caldav/src/calendar_set/mod.rs +++ b/crates/caldav/src/calendar_set/mod.rs @@ -5,8 +5,8 @@ use actix_web::dev::ResourceMap; use async_trait::async_trait; use rustical_dav::extensions::{CommonPropertiesExtension, CommonPropertiesProp}; use rustical_dav::privileges::UserPrivilegeSet; -use rustical_dav::resource::{NamedRoute, Resource, ResourceService}; -use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner}; +use rustical_dav::resource::{Resource, ResourceService}; +use rustical_dav::xml::{Resourcetype, ResourcetypeInner}; use rustical_store::auth::User; use rustical_store::CalendarStore; use rustical_xml::{EnumUnitVariants, EnumVariants, XmlDeserialize, XmlSerialize}; @@ -17,18 +17,9 @@ pub struct CalendarSetResource { pub(crate) principal: String, } -#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, EnumUnitVariants)] -#[xml(unit_variants_ident = "PrincipalPropName")] -pub enum PrincipalProp { - // WebDAV Access Control (RFC 3744) - #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"principal-URL")] - PrincipalUrl(HrefElement), -} - #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, EnumUnitVariants)] #[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)] pub enum PrincipalPropWrapper { - Principal(PrincipalProp), Common(CommonPropertiesProp), } @@ -51,17 +42,7 @@ impl Resource for CalendarSetResource { user: &User, prop: &Self::PropName, ) -> Result { - let principal_href = HrefElement::new( - Self::PrincipalResource::get_url(rmap, vec![&self.principal]).unwrap(), - ); - Ok(match prop { - PrincipalPropWrapperName::Principal(prop) => { - PrincipalPropWrapper::Principal(match prop { - PrincipalPropName::PrincipalUrl => PrincipalProp::PrincipalUrl(principal_href), - }) - } - PrincipalPropWrapperName::Common(prop) => PrincipalPropWrapper::Common( ::get_prop(self, rmap, user, prop)?, ),