Checkpoint: Migration to axum

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

@@ -2,77 +2,15 @@ use crate::Error;
 use crate::privileges::UserPrivilege;
 use crate::resource::Resource;
 use crate::resource::ResourceService;
-#[cfg(feature = "axum")]
-use axum::extract::{Extension, Path, State};
-#[cfg(feature = "axum")]
+use axum::extract::{Path, State};
 use axum_extra::TypedHeader;
-use headers::Header;
-use headers::{HeaderValue, IfMatch, IfNoneMatch};
-#[cfg(feature = "axum")]
+use headers::{IfMatch, IfNoneMatch};
 use http::HeaderMap;
-use itertools::Itertools;
-#[cfg(feature = "axum")]
-use std::sync::Arc;
-use tracing::instrument;
 
-#[cfg(feature = "actix")]
-#[instrument(parent = root_span.id(), skip(path, req, root_span, resource_service))]
-pub async fn actix_route_delete<R: ResourceService>(
-    path: actix_web::web::Path<R::PathComponents>,
-    req: actix_web::HttpRequest,
-    principal: R::Principal,
-    resource_service: actix_web::web::Data<R>,
-    root_span: tracing_actix_web::RootSpan,
-) -> Result<actix_web::HttpResponse, R::Error> {
-    let no_trash = req
-        .headers()
-        .get("X-No-Trashbin")
-        .map(|val| matches!(val.to_str(), Ok("1")))
-        .unwrap_or(false);
-
-    // This weird conversion stuff is because we want to use the headers library (to be
-    // framework-agnostic in the future) which uses http==1.0,
-    // while actix-web still uses http==0.2
-    let if_match = req
-        .headers()
-        .get_all(http_02::header::IF_MATCH)
-        .map(|val_02| HeaderValue::from_bytes(val_02.as_bytes()).unwrap())
-        .collect_vec();
-    let if_none_match = req
-        .headers()
-        .get_all(http_02::header::IF_NONE_MATCH)
-        .map(|val_02| HeaderValue::from_bytes(val_02.as_bytes()).unwrap())
-        .collect_vec();
-
-    let if_match = if if_match.is_empty() {
-        None
-    } else {
-        Some(IfMatch::decode(&mut if_match.iter()).unwrap())
-    };
-    let if_none_match = if if_none_match.is_empty() {
-        None
-    } else {
-        Some(IfNoneMatch::decode(&mut if_none_match.iter()).unwrap())
-    };
-
-    route_delete(
-        &path.into_inner(),
-        &principal,
-        resource_service.as_ref(),
-        no_trash,
-        if_match,
-        if_none_match,
-    )
-    .await?;
-
-    Ok(actix_web::HttpResponse::Ok().body(""))
-}
-
-#[cfg(feature = "axum")]
 pub(crate) async fn axum_route_delete<R: ResourceService>(
     Path(path): Path<R::PathComponents>,
-    State(resource_service): State<Arc<R>>,
-    Extension(principal): Extension<R::Principal>,
+    State(resource_service): State<R>,
+    principal: R::Principal,
     if_match: Option<TypedHeader<IfMatch>>,
     if_none_match: Option<TypedHeader<IfNoneMatch>>,
     header_map: HeaderMap,
@@ -84,7 +22,7 @@ pub(crate) async fn axum_route_delete<R: ResourceService>(
     route_delete(
         &path,
         &principal,
-        resource_service.as_ref(),
+        &resource_service,
         no_trash,
         if_match.map(|hdr| hdr.0),
         if_none_match.map(|hdr| hdr.0),