nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 16:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Got rid of this ServicePrefix thing

Browse Source
This commit is contained in:
Lennart
2024-10-04 18:15:35 +02:00
parent a2e3cd527e
commit 2aa0e173c8
4 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/caldav/src/calendar/methods/report/calendar_multiget.rs
View File

@@ -1,5 +1,6 @@
use crate::{
calendar_object::resource::{CalendarObjectProp, CalendarObjectResource},
principal::PrincipalResource,
Error,
};
use actix_web::{
@@ -27,14 +28,13 @@ pub struct CalendarMultigetRequest {
pub async fn get_objects_calendar_multiget<C: CalendarStore + ?Sized>(
cal_query: &CalendarMultigetRequest,
prefix: &str,
principal_url: &str,
principal: &str,
cid: &str,
store: &RwLock<C>,
) -> Result<Vec<CalendarObject>, Error> {
// TODO: add proper error results for single events
let resource_def =
ResourceDef::prefix(prefix).join(&ResourceDef::new("/user/{principal}/{cid}/{uid}"));
let resource_def = ResourceDef::prefix(principal_url).join(&ResourceDef::new("/{cid}/{uid}"));
let mut result = vec![];
@@ -45,10 +45,6 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore + ?Sized>(
// TODO: Handle error
continue;
};
if path.get("principal").unwrap() != principal {
// TODO: Handle error
continue;
}
if path.get("cid").unwrap() != cid {
// TODO: Handle error
continue;
@@ -63,13 +59,14 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore + ?Sized>(
pub async fn handle_calendar_multiget<C: CalendarStore + ?Sized>(
cal_multiget: CalendarMultigetRequest,
req: HttpRequest,
prefix: &str,
principal: &str,
cid: &str,
cal_store: &RwLock<C>,
) -> Result<MultistatusElement<PropstatWrapper<CalendarObjectProp>, String>, Error> {
let principal_url = PrincipalResource::get_url(req.resource_map(), vec![principal]).unwrap();
let objects =
get_objects_calendar_multiget(&cal_multiget, prefix, principal, cid, cal_store).await?;
get_objects_calendar_multiget(&cal_multiget, &principal_url, principal, cid, cal_store)
.await?;
let props = match cal_multiget.prop {
PropfindType::Allprop => {

6
crates/caldav/src/calendar/methods/report/mod.rs
View File

@@ -5,7 +5,6 @@ use actix_web::{
};
use calendar_multiget::{handle_calendar_multiget, CalendarMultigetRequest};
use calendar_query::{handle_calendar_query, CalendarQueryRequest};
use rustical_dav::methods::propfind::ServicePrefix;
use rustical_store::{auth::User, CalendarStore};
use serde::{Deserialize, Serialize};
use sync_collection::{handle_sync_collection, SyncCollectionRequest};
@@ -37,9 +36,7 @@ pub async fn route_report_calendar<C: CalendarStore + ?Sized>(
user: User,
req: HttpRequest,
cal_store: Data<RwLock<C>>,
prefix: Data<ServicePrefix>,
) -> Result<impl Responder, Error> {
let prefix = prefix.into_inner();
let (principal, cid) = path.into_inner();
if principal != user.id {
return Err(Error::Unauthorized);
@@ -54,8 +51,7 @@ pub async fn route_report_calendar<C: CalendarStore + ?Sized>(
handle_calendar_query(cal_query, req, &principal, &cid, &cal_store).await?
}
ReportRequest::CalendarMultiget(cal_multiget) => {
handle_calendar_multiget(cal_multiget, req, &prefix, &principal, &cid, &cal_store)
.await?
handle_calendar_multiget(cal_multiget, req, &principal, &cid, &cal_store).await?
}
ReportRequest::SyncCollection(sync_collection) => {
handle_sync_collection(sync_collection, req, &principal, &cid, &cal_store).await?