Change how CalDAV/CardDAV services are initialised

crates/caldav/src/lib.rs

@@ -1,4 +1,4 @@
-use actix_web::dev::ServiceResponse;
+use actix_web::dev::{HttpServiceFactory, ServiceResponse};
 use actix_web::http::header::{HeaderName, HeaderValue};
 use actix_web::http::{Method, StatusCode};
 use actix_web::middleware::{ErrorHandlerResponse, ErrorHandlers};
@@ -24,21 +24,20 @@ mod subscription;
 
 pub use error::Error;
 
-pub fn configure_dav<
+pub fn caldav_service<
     AP: AuthenticationProvider,
     AS: AddressbookStore,
     C: CalendarStore,
     S: SubscriptionStore,
 >(
-    cfg: &mut web::ServiceConfig,
     auth_provider: Arc<AP>,
     store: Arc<C>,
     addr_store: Arc<AS>,
     subscription_store: Arc<S>,
-) {
+) -> impl HttpServiceFactory {
     let birthday_store = Arc::new(ContactBirthdayStore::new(addr_store));
-    cfg.service(
+
-        web::scope("")
+    web::scope("")
             .wrap(AuthenticationMiddleware::new(auth_provider))
             .wrap(
                 ErrorHandlers::new().handler(StatusCode::METHOD_NOT_ALLOWED, |res| {
@@ -93,6 +92,5 @@ pub fn configure_dav<
                             )
                         )
                 ),
-            ).service(subscription_resource::<S>()),
+            ).service(subscription_resource::<S>())
-    );
 }

crates/carddav/src/lib.rs

@@ -1,5 +1,5 @@
 use actix_web::{
-    dev::ServiceResponse,
+    dev::{HttpServiceFactory, ServiceResponse},
     http::{
         header::{HeaderName, HeaderValue},
         Method, StatusCode,
@@ -25,60 +25,57 @@ pub mod addressbook;
 pub mod error;
 pub mod principal;
 
-pub fn configure_dav<AP: AuthenticationProvider, A: AddressbookStore, S: SubscriptionStore>(
+pub fn carddav_service<AP: AuthenticationProvider, A: AddressbookStore, S: SubscriptionStore>(
-    cfg: &mut web::ServiceConfig,
     auth_provider: Arc<AP>,
     store: Arc<A>,
     subscription_store: Arc<S>,
-) {
+) -> impl HttpServiceFactory {
-    cfg.service(
+    web::scope("")
-        web::scope("")
+        .wrap(AuthenticationMiddleware::new(auth_provider))
-            .wrap(AuthenticationMiddleware::new(auth_provider))
+        .wrap(
-            .wrap(
+            ErrorHandlers::new().handler(StatusCode::METHOD_NOT_ALLOWED, |res| {
-                ErrorHandlers::new().handler(StatusCode::METHOD_NOT_ALLOWED, |res| {
+                Ok(ErrorHandlerResponse::Response(
-                    Ok(ErrorHandlerResponse::Response(
+                    if res.request().method() == Method::OPTIONS {
-                        if res.request().method() == Method::OPTIONS {
+                        let response = HttpResponse::Ok()
-                            let response = HttpResponse::Ok()
+                            .insert_header((
-                                .insert_header((
+                                HeaderName::from_static("dav"),
-                                    HeaderName::from_static("dav"),
+                                // https://datatracker.ietf.org/doc/html/rfc4918#section-18
-                                    // https://datatracker.ietf.org/doc/html/rfc4918#section-18
+                                HeaderValue::from_static(
-                                    HeaderValue::from_static(
+                                    "1, 3, access-control, addressbook, extended-mkcol",
-                                        "1, 3, access-control, addressbook, extended-mkcol",
-                                    ),
-                                ))
-                                .finish();
-                            ServiceResponse::new(res.into_parts().0, response).map_into_right_body()
-                        } else {
-                            res.map_into_left_body()
-                        },
-                    ))
-                }),
-            )
-            .app_data(Data::from(store.clone()))
-            .app_data(Data::from(subscription_store))
-            .service(RootResourceService::<PrincipalResource>::default().actix_resource())
-            .service(
-                web::scope("/user").service(
-                    web::scope("/{principal}")
-                        .service(
-                            PrincipalResourceService::new(store.clone())
-                                .actix_resource()
-                                .name(PrincipalResource::route_name()),
-                        )
-                        .service(
-                            web::scope("/{addressbook}")
-                                .service(
-                                    AddressbookResourceService::<A, S>::new(store.clone())
-                                        .actix_resource(),
-                                )
-                                .service(
-                                    web::scope("/{object}").service(
-                                        AddressObjectResourceService::<A>::new(store.clone())
-                                            .actix_resource(),
-                                    ),
                                 ),
-                        ),
+                            ))
-                ),
+                            .finish();
+                        ServiceResponse::new(res.into_parts().0, response).map_into_right_body()
+                    } else {
+                        res.map_into_left_body()
+                    },
+                ))
+            }),
+        )
+        .app_data(Data::from(store.clone()))
+        .app_data(Data::from(subscription_store))
+        .service(RootResourceService::<PrincipalResource>::default().actix_resource())
+        .service(
+            web::scope("/user").service(
+                web::scope("/{principal}")
+                    .service(
+                        PrincipalResourceService::new(store.clone())
+                            .actix_resource()
+                            .name(PrincipalResource::route_name()),
+                    )
+                    .service(
+                        web::scope("/{addressbook}")
+                            .service(
+                                AddressbookResourceService::<A, S>::new(store.clone())
+                                    .actix_resource(),
+                            )
+                            .service(
+                                web::scope("/{object}").service(
+                                    AddressObjectResourceService::<A>::new(store.clone())
+                                        .actix_resource(),
+                                ),
+                            ),
+                    ),
             ),
-    );
+        )
 }

src/app.rs

@@ -2,6 +2,8 @@ use actix_web::body::MessageBody;
 use actix_web::dev::{ServiceFactory, ServiceRequest, ServiceResponse};
 use actix_web::middleware::NormalizePath;
 use actix_web::{web, App};
+use rustical_caldav::caldav_service;
+use rustical_carddav::carddav_service;
 use rustical_frontend::{configure_frontend, FrontendConfig};
 use rustical_store::auth::AuthenticationProvider;
 use rustical_store::{AddressbookStore, CalendarStore, SubscriptionStore};
@@ -27,23 +29,17 @@ pub fn make_app<AS: AddressbookStore, CS: CalendarStore, S: SubscriptionStore>(
         // .wrap(Logger::new("[%s] %r"))
         .wrap(TracingLogger::default())
         .wrap(NormalizePath::trim())
-        .service(web::scope("/caldav").configure(|cfg| {
+        .service(web::scope("/caldav").service(caldav_service(
-            rustical_caldav::configure_dav(
+            auth_provider.clone(),
-                cfg,
+            cal_store.clone(),
-                auth_provider.clone(),
+            addr_store.clone(),
-                cal_store.clone(),
+            subscription_store.clone(),
-                addr_store.clone(),
+        )))
-                subscription_store.clone(),
+        .service(web::scope("/carddav").service(carddav_service(
-            )
+            auth_provider.clone(),
-        }))
+            addr_store.clone(),
-        .service(web::scope("/carddav").configure(|cfg| {
+            subscription_store,
-            rustical_carddav::configure_dav(
+        )))
-                cfg,
-                auth_provider.clone(),
-                addr_store.clone(),
-                subscription_store,
-            )
-        }))
         .service(
             web::scope("/.well-known")
                 .service(web::redirect("/caldav", "/caldav"))