dav: Make the get_members function more ergonomic

crates/caldav/src/calendar/resource.rs

@@ -15,7 +15,7 @@ use rustical_dav::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceService};
+use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
 use rustical_dav_push::DavPushExtension;
 use rustical_ical::CalDateTime;
@@ -83,6 +83,12 @@ pub struct CalendarResource {
     pub read_only: bool,
 }
 
+impl ResourceName for CalendarResource {
+    fn get_name(&self) -> String {
+        self.cal.id.to_owned()
+    }
+}
+
 impl From<CalendarResource> for Calendar {
     fn from(value: CalendarResource) -> Self {
         value.cal
@@ -360,20 +366,15 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
     async fn get_members(
         &self,
         (principal, cal_id): &Self::PathComponents,
-    ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
+    ) -> Result<Vec<Self::MemberType>, Self::Error> {
         Ok(self
             .cal_store
             .get_objects(principal, cal_id)
             .await?
             .into_iter()
-            .map(|object| {
+            .map(|object| CalendarObjectResource {
-                (
+                object,
-                    format!("{}.ics", object.get_id()),
+                principal: principal.to_owned(),
-                    CalendarObjectResource {
-                        object,
-                        principal: principal.to_owned(),
-                    },
-                )
             })
             .collect())
     }

crates/caldav/src/calendar_object/resource.rs

@@ -10,7 +10,7 @@ use futures_util::future::BoxFuture;
 use rustical_dav::{
     extensions::{CommonPropertiesExtension, CommonPropertiesProp},
     privileges::UserPrivilegeSet,
-    resource::{AxumMethods, PrincipalUri, Resource, ResourceService},
+    resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService},
     xml::Resourcetype,
 };
 use rustical_ical::{CalendarObject, UtcDateTime};
@@ -20,24 +20,6 @@ use serde::{Deserialize, Deserializer};
 use std::{convert::Infallible, sync::Arc};
 use tower::Service;
 
-pub struct CalendarObjectResourceService<C: CalendarStore> {
-    pub(crate) cal_store: Arc<C>,
-}
-
-impl<C: CalendarStore> Clone for CalendarObjectResourceService<C> {
-    fn clone(&self) -> Self {
-        Self {
-            cal_store: self.cal_store.clone(),
-        }
-    }
-}
-
-impl<C: CalendarStore> CalendarObjectResourceService<C> {
-    pub fn new(cal_store: Arc<C>) -> Self {
-        Self { cal_store }
-    }
-}
-
 #[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq, Hash)]
 pub(crate) struct ExpandElement {
     #[xml(ty = "attr")]
@@ -86,6 +68,12 @@ pub struct CalendarObjectResource {
     pub principal: String,
 }
 
+impl ResourceName for CalendarObjectResource {
+    fn get_name(&self) -> String {
+        format!("{}.ics", self.object.get_id())
+    }
+}
+
 impl Resource for CalendarObjectResource {
     type Prop = CalendarObjectPropWrapper;
     type Error = Error;
@@ -163,6 +151,24 @@ pub struct CalendarObjectPathComponents {
     pub object_id: String,
 }
 
+pub struct CalendarObjectResourceService<C: CalendarStore> {
+    pub(crate) cal_store: Arc<C>,
+}
+
+impl<C: CalendarStore> Clone for CalendarObjectResourceService<C> {
+    fn clone(&self) -> Self {
+        Self {
+            cal_store: self.cal_store.clone(),
+        }
+    }
+}
+
+impl<C: CalendarStore> CalendarObjectResourceService<C> {
+    pub fn new(cal_store: Arc<C>) -> Self {
+        Self { cal_store }
+    }
+}
+
 #[async_trait]
 impl<C: CalendarStore> ResourceService for CalendarObjectResourceService<C> {
     type PathComponents = CalendarObjectPathComponents;

crates/caldav/src/calendar_set/mod.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use axum::Router;
 use rustical_dav::extensions::{CommonPropertiesExtension, CommonPropertiesProp};
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceService};
+use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService};
 use rustical_dav::xml::{Resourcetype, ResourcetypeInner};
 use rustical_store::auth::User;
 use rustical_store::{CalendarStore, SubscriptionStore};
@@ -15,6 +15,13 @@ use std::sync::Arc;
 pub struct CalendarSetResource {
     pub(crate) principal: String,
     pub(crate) read_only: bool,
+    pub(crate) name: &'static str,
+}
+
+impl ResourceName for CalendarSetResource {
+    fn get_name(&self) -> String {
+        self.name.to_owned()
+    }
 }
 
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
@@ -105,24 +112,20 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarSetReso
         Ok(CalendarSetResource {
             principal: principal.to_owned(),
             read_only: self.cal_store.is_read_only(),
+            name: self.name,
         })
     }
 
     async fn get_members(
         &self,
         (principal,): &Self::PathComponents,
-    ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
+    ) -> Result<Vec<Self::MemberType>, Self::Error> {
         let calendars = self.cal_store.get_calendars(principal).await?;
         Ok(calendars
             .into_iter()
-            .map(|cal| {
+            .map(|cal| CalendarResource {
-                (
+                cal,
-                    cal.id.to_owned(),
+                read_only: self.cal_store.is_read_only(),
-                    CalendarResource {
-                        cal,
-                        read_only: self.cal_store.is_read_only(),
-                    },
-                )
             })
             .collect())
     }

crates/caldav/src/principal/mod.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use axum::Router;
 use rustical_dav::extensions::{CommonPropertiesExtension, CommonPropertiesProp};
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceService};
+use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
 use rustical_store::auth::user::PrincipalType;
 use rustical_store::auth::{AuthenticationProvider, User};
@@ -18,6 +18,12 @@ pub struct PrincipalResource {
     home_set: &'static [&'static str],
 }
 
+impl ResourceName for PrincipalResource {
+    fn get_name(&self) -> String {
+        self.principal.id.to_owned()
+    }
+}
+
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
 pub struct CalendarHomeSet(#[xml(ty = "untagged", flatten)] Vec<HrefElement>);
 
@@ -176,22 +182,18 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore, BS: Ca
     async fn get_members(
         &self,
         (principal,): &Self::PathComponents,
-    ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
+    ) -> Result<Vec<Self::MemberType>, Self::Error> {
         Ok(vec![
-            (
+            CalendarSetResource {
-                "calendar".to_owned(),
+                name: "calendar",
-                CalendarSetResource {
+                principal: principal.to_owned(),
-                    principal: principal.to_owned(),
+                read_only: false,
-                    read_only: false,
+            },
-                },
+            CalendarSetResource {
-            ),
+                name: "birthdays",
-            (
+                principal: principal.to_owned(),
-                "birthdays".to_owned(),
+                read_only: true,
-                CalendarSetResource {
+            },
-                    principal: principal.to_owned(),
-                    read_only: true,
-                },
-            ),
         ])
     }
 

crates/carddav/src/address_object/resource.rs

@@ -6,7 +6,7 @@ use futures_util::future::BoxFuture;
 use rustical_dav::{
     extensions::{CommonPropertiesExtension, CommonPropertiesProp},
     privileges::UserPrivilegeSet,
-    resource::{AxumMethods, PrincipalUri, Resource, ResourceService},
+    resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService},
     xml::Resourcetype,
 };
 use rustical_ical::AddressObject;
@@ -58,6 +58,12 @@ pub struct AddressObjectResource {
     pub principal: String,
 }
 
+impl ResourceName for AddressObjectResource {
+    fn get_name(&self) -> String {
+        format!("{}.vcf", self.object.get_id())
+    }
+}
+
 impl Resource for AddressObjectResource {
     type Prop = AddressObjectPropWrapper;
     type Error = Error;

crates/carddav/src/addressbook/resource.rs

@@ -14,7 +14,7 @@ use rustical_dav::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceService};
+use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService};
 use rustical_dav::xml::{Resourcetype, ResourcetypeInner};
 use rustical_dav_push::{DavPushExtension, DavPushExtensionProp};
 use rustical_store::auth::User;
@@ -77,6 +77,12 @@ pub enum AddressbookPropWrapper {
 #[derive(Clone, Debug, From, Into)]
 pub struct AddressbookResource(pub(crate) Addressbook);
 
+impl ResourceName for AddressbookResource {
+    fn get_name(&self) -> String {
+        self.0.id.to_owned()
+    }
+}
+
 impl SyncTokenExtension for AddressbookResource {
     fn get_synctoken(&self) -> String {
         self.0.format_synctoken()
@@ -228,20 +234,15 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
     async fn get_members(
         &self,
         (principal, addressbook_id): &Self::PathComponents,
-    ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
+    ) -> Result<Vec<Self::MemberType>, Self::Error> {
         Ok(self
             .addr_store
             .get_objects(principal, addressbook_id)
             .await?
             .into_iter()
-            .map(|object| {
+            .map(|object| AddressObjectResource {
-                (
+                object,
-                    format!("{}.vcf", object.get_id()),
+                principal: principal.to_owned(),
-                    AddressObjectResource {
-                        object,
-                        principal: principal.to_owned(),
-                    },
-                )
             })
             .collect())
     }

crates/carddav/src/principal/mod.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use axum::Router;
 use rustical_dav::extensions::{CommonPropertiesExtension, CommonPropertiesProp};
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceService};
+use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
 use rustical_store::auth::{AuthenticationProvider, User};
 use rustical_store::{AddressbookStore, SubscriptionStore};
@@ -50,6 +50,12 @@ pub struct PrincipalResource {
     principal: User,
 }
 
+impl ResourceName for PrincipalResource {
+    fn get_name(&self) -> String {
+        self.principal.id.to_owned()
+    }
+}
+
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
 pub struct AddressbookHomeSet(#[xml(ty = "untagged", flatten)] Vec<HrefElement>);
 
@@ -168,11 +174,11 @@ impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> Reso
     async fn get_members(
         &self,
         (principal,): &Self::PathComponents,
-    ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
+    ) -> Result<Vec<Self::MemberType>, Self::Error> {
         let addressbooks = self.addr_store.get_addressbooks(principal).await?;
         Ok(addressbooks
             .into_iter()
-            .map(|addressbook| (addressbook.id.to_owned(), addressbook.into()))
+            .map(AddressbookResource::from)
             .collect())
     }
 

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

@@ -3,6 +3,7 @@ use crate::header::Depth;
 use crate::privileges::UserPrivilege;
 use crate::resource::PrincipalUri;
 use crate::resource::Resource;
+use crate::resource::ResourceName;
 use crate::resource::ResourceService;
 use crate::xml::MultistatusElement;
 use crate::xml::PropfindElement;
@@ -12,6 +13,11 @@ use rustical_xml::PropName;
 use rustical_xml::XmlDocument;
 use tracing::instrument;
 
+type RSMultistatus<R> = MultistatusElement<
+    <<R as ResourceService>::Resource as Resource>::Prop,
+    <<R as ResourceService>::MemberType as Resource>::Prop,
+>;
+
 #[instrument(skip(path, resource_service, puri))]
 pub(crate) async fn axum_route_propfind<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
@@ -21,10 +27,7 @@ pub(crate) async fn axum_route_propfind<R: ResourceService>(
     uri: OriginalUri,
     Extension(puri): Extension<R::PrincipalUri>,
     body: String,
-) -> Result<
+) -> Result<RSMultistatus<R>, R::Error> {
-    MultistatusElement<<R::Resource as Resource>::Prop, <R::MemberType as Resource>::Prop>,
-    R::Error,
-> {
     route_propfind::<R>(
         &path,
         uri.path(),
@@ -45,10 +48,7 @@ pub(crate) async fn route_propfind<R: ResourceService>(
     depth: &Depth,
     resource_service: &R,
     puri: &impl PrincipalUri,
-) -> Result<
+) -> Result<RSMultistatus<R>, R::Error> {
-    MultistatusElement<<R::Resource as Resource>::Prop, <R::MemberType as Resource>::Prop>,
-    R::Error,
-> {
     let resource = resource_service.get_resource(path_components).await?;
     let privileges = resource.get_user_privileges(principal)?;
     if !privileges.has(&UserPrivilege::Read) {
@@ -75,9 +75,9 @@ pub(crate) async fn route_propfind<R: ResourceService>(
 
     let mut member_responses = Vec::new();
     if depth != &Depth::Zero {
-        for (subpath, member) in resource_service.get_members(path_components).await? {
+        for member in resource_service.get_members(path_components).await? {
             member_responses.push(member.propfind_typed(
-                &format!("{}/{}", path.trim_end_matches('/'), subpath),
+                &format!("{}/{}", path.trim_end_matches('/'), member.get_name()),
                 &propfind_member.prop,
                 puri,
                 principal,

crates/dav/src/resource/mod.rs

@@ -28,6 +28,10 @@ impl<T: XmlSerialize + XmlDeserialize> ResourceProp for T {}
 pub trait ResourcePropName: FromStr {}
 impl<T: FromStr> ResourcePropName for T {}
 
+pub trait ResourceName {
+    fn get_name(&self) -> String;
+}
+
 pub trait Resource: Clone + Send + 'static {
     type Prop: ResourceProp + PartialEq + Clone + EnumVariants + PropName + Send;
     type Error: From<crate::Error>;

crates/dav/src/resource/resource_service.rs

@@ -10,7 +10,8 @@ use serde::Deserialize;
 #[async_trait]
 pub trait ResourceService: Clone + Sized + Send + Sync + AxumMethods + 'static {
     type PathComponents: for<'de> Deserialize<'de> + Sized + Send + Sync + Clone + 'static; // defines how the resource URI maps to parameters, i.e. /{principal}/{calendar} -> (String, String)
-    type MemberType: Resource<Error = Self::Error, Principal = Self::Principal>;
+    type MemberType: Resource<Error = Self::Error, Principal = Self::Principal>
+        + super::ResourceName;
     type Resource: Resource<Error = Self::Error, Principal = Self::Principal>;
     type Error: From<crate::Error> + Send + Sync + IntoResponse + 'static;
     type Principal: Principal + FromRequestParts<Self>;
@@ -21,7 +22,7 @@ pub trait ResourceService: Clone + Sized + Send + Sync + AxumMethods + 'static {
     async fn get_members(
         &self,
         _path: &Self::PathComponents,
-    ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
+    ) -> Result<Vec<Self::MemberType>, Self::Error> {
         Ok(vec![])
     }
 

crates/dav/src/resources/root.rs

@@ -3,7 +3,7 @@ use crate::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, CommonPropertiesPropName,
 };
 use crate::privileges::UserPrivilegeSet;
-use crate::resource::{AxumMethods, PrincipalUri, Resource, ResourceService};
+use crate::resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService};
 use crate::xml::{Resourcetype, ResourcetypeInner};
 use async_trait::async_trait;
 use axum::Router;
@@ -66,6 +66,8 @@ impl<
     P: Principal + FromRequestParts<Self>,
     PURI: PrincipalUri,
 > ResourceService for RootResourceService<PRS, P, PURI>
+where
+    PRS::Resource: ResourceName,
 {
     type PathComponents = ();
     type MemberType = PRS::Resource;

crates/frontend/src/nextcloud_login/mod.rs

@@ -46,10 +46,9 @@ pub struct NextcloudFlows {
     flows: RwLock<HashMap<String, NextcloudFlow>>,
 }
 
-pub fn nextcloud_login_router<AP: AuthenticationProvider>(
+pub fn nextcloud_login_router<AP: AuthenticationProvider>(auth_provider: Arc<AP>) -> Router {
-    nextcloud_flows_state: Arc<NextcloudFlows>,
+    let nextcloud_flows = Arc::new(NextcloudFlows::default());
-    auth_provider: Arc<AP>,
+
-) -> Router {
     Router::new()
         .route("/poll/{flow}", post(post_nextcloud_poll::<AP>))
         .route(
@@ -57,7 +56,7 @@ pub fn nextcloud_login_router<AP: AuthenticationProvider>(
             get(get_nextcloud_flow).post(post_nextcloud_flow),
         )
         .route("/", post(post_nextcloud_login))
-        .layer(Extension(nextcloud_flows_state))
+        .layer(Extension(nextcloud_flows))
         .layer(Extension(auth_provider.clone()))
         .layer(AuthenticationLayer::new(auth_provider.clone()))
         .layer(middleware::from_fn(unauthorized_handler))

src/app.rs

@@ -1,3 +1,4 @@
+use crate::config::NextcloudLoginConfig;
 use axum::Router;
 use axum::extract::Request;
 use axum::response::Response;
@@ -5,7 +6,7 @@ use headers::{HeaderMapExt, UserAgent};
 use http::StatusCode;
 use rustical_caldav::caldav_router;
 use rustical_carddav::carddav_router;
-use rustical_frontend::nextcloud_login::{NextcloudFlows, nextcloud_login_router};
+use rustical_frontend::nextcloud_login::nextcloud_login_router;
 use rustical_frontend::{FrontendConfig, frontend_router};
 use rustical_oidc::OidcConfig;
 use rustical_store::auth::AuthenticationProvider;
@@ -20,8 +21,6 @@ use tower_sessions::{Expiry, MemoryStore, SessionManagerLayer};
 use tracing::Span;
 use tracing::field::display;
 
-use crate::config::NextcloudLoginConfig;
-
 #[allow(clippy::too_many_arguments)]
 pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
     addr_store: Arc<AS>,
@@ -31,7 +30,6 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
     frontend_config: FrontendConfig,
     oidc_config: Option<OidcConfig>,
     nextcloud_login_config: NextcloudLoginConfig,
-    nextcloud_flows_state: Arc<NextcloudFlows>,
 ) -> Router<()> {
     let mut router = Router::new()
         .merge(caldav_router(
@@ -63,7 +61,7 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
     if nextcloud_login_config.enabled {
         router = router.nest(
             "/index.php/login/v2",
-            nextcloud_login_router(nextcloud_flows_state, auth_provider.clone()),
+            nextcloud_login_router(auth_provider.clone()),
         );
     }
     router

src/main.rs

@@ -10,7 +10,6 @@ use config::{DataStoreConfig, SqliteDataStoreConfig};
 use figment::Figment;
 use figment::providers::{Env, Format, Toml};
 use rustical_dav_push::DavPushController;
-use rustical_frontend::nextcloud_login::NextcloudFlows;
 use rustical_store::auth::AuthenticationProvider;
 use rustical_store::{AddressbookStore, CalendarStore, CollectionOperation, SubscriptionStore};
 use rustical_store_sqlite::addressbook_store::SqliteAddressbookStore;
@@ -110,8 +109,6 @@ async fn main() -> Result<()> {
                 }));
             }
 
-            let nextcloud_flows = Arc::new(NextcloudFlows::default());
-
             let app = make_app(
                 addr_store.clone(),
                 cal_store.clone(),
@@ -120,7 +117,6 @@ async fn main() -> Result<()> {
                 config.frontend.clone(),
                 config.oidc.clone(),
                 config.nextcloud_login.clone(),
-                nextcloud_flows.clone(),
             );
             let app = ServiceExt::<Request>::into_make_service(
                 NormalizePathLayer::trim_trailing_slash().layer(app),