Checkpoint: Migration to axum

crates/caldav/src/lib.rs

@@ -1,28 +1,26 @@
-use actix_web::HttpResponse;
-use actix_web::body::BoxBody;
-use actix_web::dev::{HttpServiceFactory, ServiceResponse};
-use actix_web::http::header::{self, HeaderName, HeaderValue};
-use actix_web::http::{Method, StatusCode};
-use actix_web::middleware::{ErrorHandlerResponse, ErrorHandlers};
-use actix_web::web::Data;
+use axum::{Extension, Router};
 use derive_more::Constructor;
 use principal::PrincipalResourceService;
 use rustical_dav::resource::{PrincipalUri, ResourceService};
 use rustical_dav::resources::RootResourceService;
-use rustical_store::auth::{AuthenticationMiddleware, AuthenticationProvider, User};
+use rustical_store::auth::middleware::AuthenticationLayer;
+use rustical_store::auth::{AuthenticationProvider, User};
 use rustical_store::{AddressbookStore, CalendarStore, ContactBirthdayStore, SubscriptionStore};
 use std::sync::Arc;
-use subscription::subscription_resource;
 
 pub mod calendar;
 pub mod calendar_object;
 pub mod calendar_set;
 pub mod error;
 pub mod principal;
-mod subscription;
+// mod subscription;
 
 pub use error::Error;
 
+use crate::calendar::resource::CalendarResourceService;
+use crate::calendar_object::resource::CalendarObjectResourceService;
+use crate::calendar_set::CalendarSetResourceService;
+
 #[derive(Debug, Clone, Constructor)]
 pub struct CalDavPrincipalUri(&'static str);
 
@@ -32,33 +30,38 @@ impl PrincipalUri for CalDavPrincipalUri {
     }
 }
 
-/// Quite a janky implementation but the default METHOD_NOT_ALLOWED response gives us the allowed
-/// methods of a resource
-fn options_handler() -> ErrorHandlers<BoxBody> {
-    ErrorHandlers::new().handler(StatusCode::METHOD_NOT_ALLOWED, |res| {
-        Ok(ErrorHandlerResponse::Response(
-            if res.request().method() == Method::OPTIONS {
-                let mut response = HttpResponse::Ok();
-                response.insert_header((
-                    HeaderName::from_static("dav"),
-                    // https://datatracker.ietf.org/doc/html/rfc4918#section-18
-                    HeaderValue::from_static(
-                        "1, 3, access-control, calendar-access, extended-mkcol, webdav-push",
-                    ),
-                ));
+// pub fn caldav_service<
+//     AP: AuthenticationProvider,
+//     AS: AddressbookStore,
+//     C: CalendarStore,
+//     S: SubscriptionStore,
+// >(
+//     prefix: &'static str,
+//     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));
+//
+//     RootResourceService::<_, User, CalDavPrincipalUri>::new(PrincipalResourceService {
+//         auth_provider: auth_provider.clone(),
+//         sub_store: subscription_store.clone(),
+//         birthday_store: birthday_store.clone(),
+//         cal_store: store.clone(),
+//     })
+//     .actix_scope()
+//     .wrap(AuthenticationMiddleware::new(auth_provider.clone()))
+//     .wrap(options_handler())
+//     .app_data(Data::from(store.clone()))
+//     .app_data(Data::from(birthday_store.clone()))
+//     .app_data(Data::new(CalDavPrincipalUri::new(
+//         format!("{prefix}/principal").leak(),
+//     )))
+//     .service(subscription_resource(subscription_store))
+// }
 
-                if let Some(allow) = res.headers().get(header::ALLOW) {
-                    response.insert_header((header::ALLOW, allow.to_owned()));
-                }
-                ServiceResponse::new(res.into_parts().0, response.finish()).map_into_right_body()
-            } else {
-                res.map_into_left_body()
-            },
-        ))
-    })
-}
-
-pub fn caldav_service<
+pub fn caldav_router<
     AP: AuthenticationProvider,
     AS: AddressbookStore,
     C: CalendarStore,
@@ -69,22 +72,53 @@ pub fn caldav_service<
     store: Arc<C>,
     addr_store: Arc<AS>,
     subscription_store: Arc<S>,
-) -> impl HttpServiceFactory {
+) -> Router {
     let birthday_store = Arc::new(ContactBirthdayStore::new(addr_store));
-
-    RootResourceService::<_, User, CalDavPrincipalUri>::new(PrincipalResourceService {
+    let principal_service = PrincipalResourceService {
         auth_provider: auth_provider.clone(),
         sub_store: subscription_store.clone(),
         birthday_store: birthday_store.clone(),
         cal_store: store.clone(),
-    })
-    .actix_scope()
-    .wrap(AuthenticationMiddleware::new(auth_provider.clone()))
-    .wrap(options_handler())
-    .app_data(Data::from(store.clone()))
-    .app_data(Data::from(birthday_store.clone()))
-    .app_data(Data::new(CalDavPrincipalUri::new(
-        format!("{prefix}/principal").leak(),
-    )))
-    .service(subscription_resource(subscription_store))
+    };
+
+    Router::new()
+        .route_service(
+            "/",
+            RootResourceService::<_, User, CalDavPrincipalUri>::new(principal_service.clone())
+                .axum_service(),
+        )
+        .route_service("/principal/{principal}", principal_service.axum_service())
+        .route_service(
+            "/principal/{principal}/calendar",
+            CalendarSetResourceService::new("calendar", store.clone(), subscription_store.clone())
+                .axum_service(),
+        )
+        .route_service(
+            "/principal/{principal}/calendar/{calendar_id}",
+            CalendarResourceService::new(store.clone(), subscription_store.clone()).axum_service(),
+        )
+        .route_service(
+            "/principal/{principal}/calendar/{calendar_id}/{object_id}",
+            CalendarObjectResourceService::new(store.clone()).axum_service(),
+        )
+        .route_service(
+            "/principal/{principal}/birthdays",
+            CalendarSetResourceService::new(
+                "birthdays",
+                birthday_store.clone(),
+                subscription_store.clone(),
+            )
+            .axum_service(),
+        )
+        .route_service(
+            "/principal/{principal}/birthdays/{calendar_id}",
+            CalendarResourceService::new(birthday_store.clone(), subscription_store.clone())
+                .axum_service(),
+        )
+        .route_service(
+            "/principal/{principal}/birthdays/{calendar_id}/{object_id}",
+            CalendarObjectResourceService::new(birthday_store.clone()).axum_service(),
+        )
+        .layer(AuthenticationLayer::new(auth_provider))
+        .layer(Extension(CalDavPrincipalUri(prefix)))
 }