nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 21:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring around routing and getting the principal uri (less dependence on actix)

Browse Source
This commit is contained in:
Lennart K
2025-06-02 16:17:13 +02:00
parent 0f294cf2e1
commit ef33868151
23 changed files with 169 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/dav/src/extensions/common.rs
View File

@@ -1,10 +1,9 @@
use crate::{
Principal,
privileges::UserPrivilegeSet,
resource::{NamedRoute, Resource},
resource::{PrincipalUri, Resource},
xml::{HrefElement, Resourcetype},
};
use actix_web::dev::ResourceMap;
use rustical_xml::{EnumUnitVariants, EnumVariants, XmlDeserialize, XmlSerialize};
#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumUnitVariants, EnumVariants)]
@@ -28,11 +27,9 @@ pub enum CommonPropertiesProp {
}
pub trait CommonPropertiesExtension: Resource {
type PrincipalResource: NamedRoute;
fn get_prop(
&self,
rmap: &ResourceMap,
principal_uri: &impl PrincipalUri,
principal: &Self::Principal,
prop: &CommonPropertiesPropName,
) -> Result<CommonPropertiesProp, <Self as Resource>::Error> {
@@ -42,21 +39,16 @@ pub trait CommonPropertiesExtension: Resource {
}
CommonPropertiesPropName::CurrentUserPrincipal => {
CommonPropertiesProp::CurrentUserPrincipal(
Self::PrincipalResource::get_url(rmap, [&principal.get_id()])
.unwrap()
.into(),
principal_uri.principal_uri(principal.get_id()).into(),
)
}
CommonPropertiesPropName::CurrentUserPrivilegeSet => {
CommonPropertiesProp::CurrentUserPrivilegeSet(self.get_user_privileges(principal)?)
}
CommonPropertiesPropName::Owner => {
CommonPropertiesProp::Owner(self.get_owner().map(|owner| {
Self::PrincipalResource::get_url(rmap, [owner])
.unwrap()
.into()
}))
}
CommonPropertiesPropName::Owner => CommonPropertiesProp::Owner(
self.get_owner()
.map(|owner| principal_uri.principal_uri(owner).into()),
),
})
}
@@ -68,3 +60,5 @@ pub trait CommonPropertiesExtension: Resource {
Err(crate::Error::PropReadOnly)
}
}
impl<R: Resource> CommonPropertiesExtension for R {}