carddav: Implement DAV Push

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

@@ -2,35 +2,13 @@ use crate::Error;
 use actix_web::http::header;
 use actix_web::web::{Data, Path};
 use actix_web::{HttpRequest, HttpResponse};
+use rustical_dav::push::PushRegister;
 use rustical_store::auth::User;
 use rustical_store::{CalendarStore, Subscription, SubscriptionStore};
-use rustical_xml::{XmlDeserialize, XmlDocument, XmlRootTag};
+use rustical_xml::XmlDocument;
 use tracing::instrument;
 use tracing_actix_web::RootSpan;
 
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-#[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
-struct WebPushSubscription {
-    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
-    push_resource: String,
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
-struct SubscriptionElement {
-    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
-    pub web_push_subscription: WebPushSubscription,
-}
-
-#[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = b"push-register")]
-#[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
-struct PushRegister {
-    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
-    subscription: SubscriptionElement,
-    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
-    expires: Option<String>,
-}
-
 #[instrument(parent = root_span.id(), skip(store, subscription_store, root_span, req))]
 pub async fn route_post<C: CalendarStore + ?Sized, S: SubscriptionStore + ?Sized>(
     path: Path<(String, String)>,
@@ -79,37 +57,3 @@ pub async fn route_post<C: CalendarStore + ?Sized, S: SubscriptionStore + ?Sized
         .append_header((header::EXPIRES, expires.to_rfc2822()))
         .finish())
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_xml_push_register() {
-        let push_register = PushRegister::parse_str(
-            r#"
-            <?xml version="1.0" encoding="utf-8" ?>
-            <push-register xmlns="https://bitfire.at/webdav-push">
-                <subscription>
-                    <web-push-subscription>
-                        <push-resource>https://up.example.net/yohd4yai5Phiz1wi</push-resource>
-                    </web-push-subscription>
-                </subscription>
-                <expires>Wed, 20 Dec 2023 10:03:31 GMT</expires>
-            </push-register>
-    "#,
-        )
-        .unwrap();
-        assert_eq!(
-            push_register,
-            PushRegister {
-                subscription: SubscriptionElement {
-                    web_push_subscription: WebPushSubscription {
-                        push_resource: "https://up.example.net/yohd4yai5Phiz1wi".to_owned()
-                    }
-                },
-                expires: Some("Wed, 20 Dec 2023 10:03:31 GMT".to_owned())
-            }
-        )
-    }
-}

crates/caldav/src/calendar/prop.rs

@@ -80,24 +80,3 @@ impl Default for SupportedReportSet {
         }
     }
 }
-
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
-pub enum Transport {
-    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
-    WebPush,
-}
-
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
-pub struct Transports {
-    #[xml(flatten, ty = "untagged")]
-    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
-    transports: Vec<Transport>,
-}
-
-impl Default for Transports {
-    fn default() -> Self {
-        Self {
-            transports: vec![Transport::WebPush],
-        }
-    }
-}

crates/caldav/src/calendar/resource.rs

@@ -1,9 +1,7 @@
 use super::methods::mkcalendar::route_mkcalendar;
 use super::methods::post::route_post;
 use super::methods::report::route_report_calendar;
-use super::prop::{
-    SupportedCalendarComponentSet, SupportedCalendarData, SupportedReportSet, Transports,
-};
+use super::prop::{SupportedCalendarComponentSet, SupportedCalendarData, SupportedReportSet};
 use crate::calendar_object::resource::CalendarObjectResource;
 use crate::principal::PrincipalResource;
 use crate::Error;
@@ -13,6 +11,7 @@ use actix_web::web;
 use async_trait::async_trait;
 use derive_more::derive::{From, Into};
 use rustical_dav::privileges::UserPrivilegeSet;
+use rustical_dav::push::Transports;
 use rustical_dav::resource::{Resource, ResourceService};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
 use rustical_store::auth::User;