Improve routing

crates/carddav/src/addressbook/resource.rs

@@ -1,9 +1,10 @@
 use super::methods::mkcol::route_mkcol;
 use super::methods::report::route_report_addressbook;
 use super::prop::{SupportedAddressData, SupportedReportSet};
-use crate::address_object::resource::AddressObjectResource;
+use crate::address_object::resource::{AddressObjectResource, AddressObjectResourceService};
 use crate::{CardDavPrincipalUri, Error};
 use async_trait::async_trait;
+use axum::Router;
 use axum::extract::Request;
 use axum::handler::Handler;
 use axum::response::Response;
@@ -266,6 +267,15 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
             .await?;
         Ok(())
     }
+
+    fn axum_router<State: Send + Sync + Clone + 'static>(self) -> Router<State> {
+        Router::new()
+            .nest(
+                "/{object_id}",
+                AddressObjectResourceService::new(self.addr_store.clone()).axum_router(),
+            )
+            .route_service("/", self.axum_service())
+    }
 }
 
 impl<AS: AddressbookStore, S: SubscriptionStore> AxumMethods for AddressbookResourceService<AS, S> {

crates/carddav/src/lib.rs

@@ -1,5 +1,3 @@
-use crate::address_object::resource::AddressObjectResourceService;
-use crate::addressbook::resource::AddressbookResourceService;
 use axum::{Extension, Router};
 use derive_more::Constructor;
 pub use error::Error;
@@ -38,22 +36,8 @@ pub fn carddav_router<AP: AuthenticationProvider, A: AddressbookStore, S: Subscr
         auth_provider.clone(),
         subscription_store.clone(),
     );
-    Router::new()
-        .route_service(
-            "/",
-            RootResourceService::<_, User, CardDavPrincipalUri>::new(principal_service.clone())
-                .axum_service(),
-        )
-        .route_service("/principal/{principal}", principal_service.axum_service())
-        .route_service(
-            "/principal/{principal}/{addressbook_id}",
-            AddressbookResourceService::new(store.clone(), subscription_store.clone())
-                .axum_service(),
-        )
-        .route_service(
-            "/principal/{principal}/{addressbook_id}/{object_id}",
-            AddressObjectResourceService::new(store.clone()).axum_service(),
-        )
+    RootResourceService::<_, User, CardDavPrincipalUri>::new(principal_service.clone())
+        .axum_router()
         .layer(AuthenticationLayer::new(auth_provider))
         .layer(Extension(CardDavPrincipalUri(prefix)))
 }

crates/carddav/src/principal/mod.rs

@@ -1,6 +1,7 @@
-use crate::addressbook::resource::AddressbookResource;
+use crate::addressbook::resource::{AddressbookResource, AddressbookResourceService};
 use crate::{CardDavPrincipalUri, Error};
 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};
@@ -174,6 +175,16 @@ impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> Reso
             .map(|addressbook| (addressbook.id.to_owned(), addressbook.into()))
             .collect())
     }
+
+    fn axum_router<State: Send + Sync + Clone + 'static>(self) -> Router<State> {
+        Router::new()
+            .nest(
+                "/{addressbook_id}",
+                AddressbookResourceService::new(self.addr_store.clone(), self.sub_store.clone())
+                    .axum_router(),
+            )
+            .route_service("/", self.axum_service())
+    }
 }
 
 impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> AxumMethods