Move properties into separate files

2025-12-14 07:02:24 +00:00 · 2025-06-09 21:09:46 +02:00
parent 0595920809
commit 71c2f8c019
35 changed files with 1023 additions and 948 deletions
--- a/crates/caldav/src/principal/mod.rs
+++ b/crates/caldav/src/principal/mod.rs
@@ -1,16 +1,14 @@
-use crate::calendar_set::{CalendarSetResource, CalendarSetResourceService};
-use crate::{CalDavPrincipalUri, Error};
-use async_trait::async_trait;
-use axum::Router;
-use rustical_dav::extensions::{CommonPropertiesExtension, CommonPropertiesProp};
+use crate::Error;
+use rustical_dav::extensions::CommonPropertiesExtension;
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService};
+use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
-use rustical_store::auth::user::PrincipalType;
-use rustical_store::auth::{AuthenticationProvider, User};
-use rustical_store::{CalendarStore, SubscriptionStore};
-use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
-use std::sync::Arc;
+use rustical_store::auth::User;
+
+mod service;
+pub use service::*;
+mod prop;
+pub use prop::*;

 #[derive(Clone)]
 pub struct PrincipalResource {
@@ -24,37 +22,6 @@ impl ResourceName for PrincipalResource {
    }
 }

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
-pub struct CalendarHomeSet(#[xml(ty = "untagged", flatten)] Vec<HrefElement>);
-
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
-#[xml(unit_variants_ident = "PrincipalPropName")]
-pub enum PrincipalProp {
-    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
-    Displayname(String),
-
-    // Scheduling Extensions to CalDAV (RFC 6638)
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
-    CalendarUserType(PrincipalType),
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    CalendarUserAddressSet(HrefElement),
-
-    // WebDAV Access Control (RFC 3744)
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"principal-URL")]
-    PrincipalUrl(HrefElement),
-
-    // CalDAV (RFC 4791)
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    CalendarHomeSet(CalendarHomeSet),
-}
-
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
-#[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
-pub enum PrincipalPropWrapper {
-    Principal(PrincipalProp),
-    Common(CommonPropertiesProp),
-}
-
 impl Resource for PrincipalResource {
    type Prop = PrincipalPropWrapper;
    type Error = Error;
@@ -124,104 +91,3 @@ impl Resource for PrincipalResource {
        ))
    }
 }
-
-#[derive(Debug)]
-pub struct PrincipalResourceService<
-    AP: AuthenticationProvider,
-    S: SubscriptionStore,
-    CS: CalendarStore,
-    BS: CalendarStore,
-> {
-    pub(crate) auth_provider: Arc<AP>,
-    pub(crate) sub_store: Arc<S>,
-    pub(crate) cal_store: Arc<CS>,
-    pub(crate) birthday_store: Arc<BS>,
-}
-
-impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore, BS: CalendarStore> Clone
-    for PrincipalResourceService<AP, S, CS, BS>
-{
-    fn clone(&self) -> Self {
-        Self {
-            auth_provider: self.auth_provider.clone(),
-            sub_store: self.sub_store.clone(),
-            cal_store: self.cal_store.clone(),
-            birthday_store: self.birthday_store.clone(),
-        }
-    }
-}
-
-#[async_trait]
-impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore, BS: CalendarStore>
-    ResourceService for PrincipalResourceService<AP, S, CS, BS>
-{
-    type PathComponents = (String,);
-    type MemberType = CalendarSetResource;
-    type Resource = PrincipalResource;
-    type Error = Error;
-    type Principal = User;
-    type PrincipalUri = CalDavPrincipalUri;
-
-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
-
-    async fn get_resource(
-        &self,
-        (principal,): &Self::PathComponents,
-    ) -> Result<Self::Resource, Self::Error> {
-        let user = self
-            .auth_provider
-            .get_principal(principal)
-            .await?
-            .ok_or(crate::Error::NotFound)?;
-        Ok(PrincipalResource {
-            principal: user,
-            home_set: &["calendar", "birthdays"],
-        })
-    }
-
-    async fn get_members(
-        &self,
-        (principal,): &Self::PathComponents,
-    ) -> Result<Vec<Self::MemberType>, Self::Error> {
-        Ok(vec![
-            CalendarSetResource {
-                name: "calendar",
-                principal: principal.to_owned(),
-                read_only: false,
-            },
-            CalendarSetResource {
-                name: "birthdays",
-                principal: principal.to_owned(),
-                read_only: true,
-            },
-        ])
-    }
-
-    fn axum_router<State: Send + Sync + Clone + 'static>(self) -> axum::Router<State> {
-        Router::new()
-            .nest(
-                "/calendar",
-                CalendarSetResourceService::new(
-                    "calendar",
-                    self.cal_store.clone(),
-                    self.sub_store.clone(),
-                )
-                .axum_router(),
-            )
-            .nest(
-                "/birthdays",
-                CalendarSetResourceService::new(
-                    "birthdays",
-                    self.birthday_store.clone(),
-                    self.sub_store.clone(),
-                )
-                .axum_router(),
-            )
-            .route_service("/", self.axum_service())
-    }
-}
-
-impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore, BS: CalendarStore>
-    AxumMethods for PrincipalResourceService<AP, S, CS, BS>
-{
-}
--- a/crates/caldav/src/principal/prop.rs
+++ b/crates/caldav/src/principal/prop.rs
@@ -0,0 +1,34 @@
+use rustical_dav::{extensions::CommonPropertiesProp, xml::HrefElement};
+use rustical_store::auth::user::PrincipalType;
+use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
+
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[xml(unit_variants_ident = "PrincipalPropName")]
+pub enum PrincipalProp {
+    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
+    Displayname(String),
+
+    // Scheduling Extensions to CalDAV (RFC 6638)
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
+    CalendarUserType(PrincipalType),
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    CalendarUserAddressSet(HrefElement),
+
+    // WebDAV Access Control (RFC 3744)
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"principal-URL")]
+    PrincipalUrl(HrefElement),
+
+    // CalDAV (RFC 4791)
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    CalendarHomeSet(CalendarHomeSet),
+}
+
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
+#[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
+pub enum PrincipalPropWrapper {
+    Principal(PrincipalProp),
+    Common(CommonPropertiesProp),
+}
+
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
+pub struct CalendarHomeSet(#[xml(ty = "untagged", flatten)] pub(super) Vec<HrefElement>);
--- a/crates/caldav/src/principal/service.rs
+++ b/crates/caldav/src/principal/service.rs
@@ -0,0 +1,110 @@
+use crate::calendar_set::{CalendarSetResource, CalendarSetResourceService};
+use crate::principal::PrincipalResource;
+use crate::{CalDavPrincipalUri, Error};
+use async_trait::async_trait;
+use axum::Router;
+use rustical_dav::resource::{AxumMethods, ResourceService};
+use rustical_store::auth::{AuthenticationProvider, User};
+use rustical_store::{CalendarStore, SubscriptionStore};
+use std::sync::Arc;
+
+#[derive(Debug)]
+pub struct PrincipalResourceService<
+    AP: AuthenticationProvider,
+    S: SubscriptionStore,
+    CS: CalendarStore,
+    BS: CalendarStore,
+> {
+    pub(crate) auth_provider: Arc<AP>,
+    pub(crate) sub_store: Arc<S>,
+    pub(crate) cal_store: Arc<CS>,
+    pub(crate) birthday_store: Arc<BS>,
+}
+
+impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore, BS: CalendarStore> Clone
+    for PrincipalResourceService<AP, S, CS, BS>
+{
+    fn clone(&self) -> Self {
+        Self {
+            auth_provider: self.auth_provider.clone(),
+            sub_store: self.sub_store.clone(),
+            cal_store: self.cal_store.clone(),
+            birthday_store: self.birthday_store.clone(),
+        }
+    }
+}
+
+#[async_trait]
+impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore, BS: CalendarStore>
+    ResourceService for PrincipalResourceService<AP, S, CS, BS>
+{
+    type PathComponents = (String,);
+    type MemberType = CalendarSetResource;
+    type Resource = PrincipalResource;
+    type Error = Error;
+    type Principal = User;
+    type PrincipalUri = CalDavPrincipalUri;
+
+    const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
+
+    async fn get_resource(
+        &self,
+        (principal,): &Self::PathComponents,
+    ) -> Result<Self::Resource, Self::Error> {
+        let user = self
+            .auth_provider
+            .get_principal(principal)
+            .await?
+            .ok_or(crate::Error::NotFound)?;
+        Ok(PrincipalResource {
+            principal: user,
+            home_set: &["calendar", "birthdays"],
+        })
+    }
+
+    async fn get_members(
+        &self,
+        (principal,): &Self::PathComponents,
+    ) -> Result<Vec<Self::MemberType>, Self::Error> {
+        Ok(vec![
+            CalendarSetResource {
+                name: "calendar",
+                principal: principal.to_owned(),
+                read_only: false,
+            },
+            CalendarSetResource {
+                name: "birthdays",
+                principal: principal.to_owned(),
+                read_only: true,
+            },
+        ])
+    }
+
+    fn axum_router<State: Send + Sync + Clone + 'static>(self) -> axum::Router<State> {
+        Router::new()
+            .nest(
+                "/calendar",
+                CalendarSetResourceService::new(
+                    "calendar",
+                    self.cal_store.clone(),
+                    self.sub_store.clone(),
+                )
+                .axum_router(),
+            )
+            .nest(
+                "/birthdays",
+                CalendarSetResourceService::new(
+                    "birthdays",
+                    self.birthday_store.clone(),
+                    self.sub_store.clone(),
+                )
+                .axum_router(),
+            )
+            .route_service("/", self.axum_service())
+    }
+}
+
+impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore, BS: CalendarStore>
+    AxumMethods for PrincipalResourceService<AP, S, CS, BS>
+{
+}