dav: Make reusable for other projects

crates/carddav/Cargo.toml

@@ -25,3 +25,4 @@ rustical_store = { workspace = true }
 chrono = { workspace = true }
 rustical_xml.workspace = true
 uuid.workspace = true
+rustical_dav_push.workspace = true

crates/carddav/src/address_object/resource.rs

@@ -1,4 +1,4 @@
-use crate::{principal::PrincipalResource, Error};
+use crate::{Error, principal::PrincipalResource};
 use actix_web::dev::ResourceMap;
 use async_trait::async_trait;
 use derive_more::derive::{Constructor, From, Into};
@@ -8,7 +8,7 @@ use rustical_dav::{
     resource::{Resource, ResourceService},
     xml::Resourcetype,
 };
-use rustical_store::{auth::User, AddressObject, AddressbookStore};
+use rustical_store::{AddressObject, AddressbookStore, auth::User};
 use rustical_xml::{EnumUnitVariants, EnumVariants, XmlDeserialize, XmlSerialize};
 use serde::Deserialize;
 use std::sync::Arc;
@@ -51,6 +51,7 @@ impl Resource for AddressObjectResource {
     type Prop = AddressObjectPropWrapper;
     type Error = Error;
     type PrincipalResource = PrincipalResource;
+    type Principal = User;
 
     fn get_resourcetype(&self) -> Resourcetype {
         Resourcetype(&[])
@@ -128,6 +129,7 @@ impl<AS: AddressbookStore> ResourceService for AddressObjectResourceService<AS>
     type Resource = AddressObjectResource;
     type MemberType = AddressObjectResource;
     type Error = Error;
+    type Principal = User;
 
     async fn get_resource(
         &self,

crates/carddav/src/addressbook/methods/post.rs

@@ -2,7 +2,7 @@ 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_dav_push::register::PushRegister;
 use rustical_store::auth::User;
 use rustical_store::{AddressbookStore, Subscription, SubscriptionStore};
 use rustical_xml::XmlDocument;

crates/carddav/src/addressbook/resource.rs

@@ -2,21 +2,21 @@ use super::methods::mkcol::route_mkcol;
 use super::methods::post::route_post;
 use super::methods::report::route_report_addressbook;
 use super::prop::{SupportedAddressData, SupportedReportSet};
+use crate::Error;
 use crate::address_object::resource::AddressObjectResource;
 use crate::principal::PrincipalResource;
-use crate::Error;
 use actix_web::dev::ResourceMap;
 use actix_web::http::Method;
 use actix_web::web;
 use async_trait::async_trait;
 use derive_more::derive::{From, Into};
 use rustical_dav::extensions::{
-    CommonPropertiesExtension, CommonPropertiesProp, DavPushExtension, DavPushExtensionProp,
-    SyncTokenExtension, SyncTokenExtensionProp,
+    CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
 use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{Resource, ResourceService};
 use rustical_dav::xml::{Resourcetype, ResourcetypeInner};
+use rustical_dav_push::{DavPushExtension, DavPushExtensionProp};
 use rustical_store::auth::User;
 use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore};
 use rustical_xml::{EnumUnitVariants, EnumVariants, XmlDeserialize, XmlSerialize};
@@ -84,6 +84,7 @@ impl Resource for AddressbookResource {
     type Prop = AddressbookPropWrapper;
     type Error = Error;
     type PrincipalResource = PrincipalResource;
+    type Principal = User;
 
     fn get_resourcetype(&self) -> Resourcetype {
         Resourcetype(&[
@@ -199,6 +200,7 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
     type PathComponents = (String, String); // principal, addressbook_id
     type Resource = AddressbookResource;
     type Error = Error;
+    type Principal = User;
 
     async fn get_resource(
         &self,

crates/carddav/src/lib.rs

@@ -1,12 +1,12 @@
 use actix_web::{
+    HttpResponse,
     dev::{HttpServiceFactory, ServiceResponse},
     http::{
-        header::{HeaderName, HeaderValue},
         Method, StatusCode,
+        header::{HeaderName, HeaderValue},
     },
     middleware::{ErrorHandlerResponse, ErrorHandlers},
     web::{self, Data},
-    HttpResponse,
 };
 use address_object::resource::AddressObjectResourceService;
 use addressbook::resource::AddressbookResourceService;
@@ -15,8 +15,8 @@ use principal::{PrincipalResource, PrincipalResourceService};
 use rustical_dav::resource::{NamedRoute, ResourceService};
 use rustical_dav::resources::RootResourceService;
 use rustical_store::{
-    auth::{AuthenticationMiddleware, AuthenticationProvider},
     AddressbookStore, SubscriptionStore,
+    auth::{AuthenticationMiddleware, AuthenticationProvider, User},
 };
 use std::sync::Arc;
 
@@ -54,7 +54,7 @@ pub fn carddav_service<AP: AuthenticationProvider, A: AddressbookStore, S: Subsc
         )
         .app_data(Data::from(store.clone()))
         .app_data(Data::from(subscription_store))
-        .service(RootResourceService::<PrincipalResource>::default().actix_resource())
+        .service(RootResourceService::<PrincipalResource, User>::default().actix_resource())
         .service(
             web::scope("/principal").service(
                 web::scope("/{principal}")

crates/carddav/src/principal/mod.rs

@@ -1,13 +1,13 @@
-use crate::addressbook::resource::AddressbookResource;
 use crate::Error;
+use crate::addressbook::resource::AddressbookResource;
 use actix_web::dev::ResourceMap;
 use async_trait::async_trait;
 use rustical_dav::extensions::{CommonPropertiesExtension, CommonPropertiesProp};
 use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{NamedRoute, Resource, ResourceService};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
-use rustical_store::auth::{AuthenticationProvider, User};
 use rustical_store::AddressbookStore;
+use rustical_store::auth::{AuthenticationProvider, User};
 use rustical_xml::{EnumUnitVariants, EnumVariants, XmlDeserialize, XmlSerialize};
 use std::sync::Arc;
 
@@ -74,6 +74,7 @@ impl Resource for PrincipalResource {
     type Prop = PrincipalPropWrapper;
     type Error = Error;
     type PrincipalResource = PrincipalResource;
+    type Principal = User;
 
     fn get_resourcetype(&self) -> Resourcetype {
         Resourcetype(&[
@@ -140,6 +141,7 @@ impl<A: AddressbookStore, AP: AuthenticationProvider> ResourceService
     type MemberType = AddressbookResource;
     type Resource = PrincipalResource;
     type Error = Error;
+    type Principal = User;
 
     async fn get_resource(
         &self,