Move DELETE method to Resource framework

crates/caldav/src/calendar/methods/delete.rs

@@ -1,36 +0,0 @@
-use crate::CalDavContext;
-use crate::Error;
-use actix_web::HttpRequest;
-use actix_web::{
-    web::{Data, Path},
-    HttpResponse,
-};
-use rustical_auth::{AuthInfoExtractor, CheckAuthentication};
-use rustical_store::CalendarStore;
-
-pub async fn route_delete_calendar<A: CheckAuthentication, C: CalendarStore + ?Sized>(
-    context: Data<CalDavContext<C>>,
-    path: Path<(String, String)>,
-    auth: AuthInfoExtractor<A>,
-    req: HttpRequest,
-) -> Result<HttpResponse, Error> {
-    let (principal, cid) = path.into_inner();
-    if principal != auth.inner.user_id {
-        return Err(Error::Unauthorized);
-    }
-
-    let no_trash = req
-        .headers()
-        .get("X-No-Trashbin")
-        .map(|val| matches!(val.to_str(), Ok("1")))
-        .unwrap_or(false);
-
-    context
-        .store
-        .write()
-        .await
-        .delete_calendar(&principal, &cid, !no_trash)
-        .await?;
-
-    Ok(HttpResponse::Ok().body(""))
-}

crates/caldav/src/calendar/methods/mod.rs

@@ -1,3 +1,2 @@
-pub mod delete;
 pub mod mkcalendar;
 pub mod report;

crates/caldav/src/calendar/resource.rs

@@ -289,4 +289,13 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResource<C> {
             .await?;
         Ok(())
     }
+
+    async fn delete_file(&self, use_trashbin: bool) -> Result<(), Self::Error> {
+        self.cal_store
+            .write()
+            .await
+            .delete_calendar(&self.principal, &self.calendar_id, use_trashbin)
+            .await?;
+        Ok(())
+    }
 }