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

addressbook_store, add option to not return deleted objects with get_object

Browse Source 
#61
This commit is contained in:
Lennart
2025-04-27 18:32:17 +02:00
parent df5f19faab
commit 99388cf992
12 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/carddav/src/address_object/methods.rs
View File

@@ -1,11 +1,11 @@
use super::resource::AddressObjectPathComponents;
use crate::addressbook::resource::AddressbookResource;
use crate::Error;
use crate::addressbook::resource::AddressbookResource;
use actix_web::HttpRequest;
use actix_web::HttpResponse;
use actix_web::http::header;
use actix_web::http::header::HeaderValue;
use actix_web::web::{Data, Path};
use actix_web::HttpRequest;
use actix_web::HttpResponse;
use rustical_dav::privileges::UserPrivilege;
use rustical_dav::resource::Resource;
use rustical_store::auth::User;
@@ -30,7 +30,9 @@ pub async fn get_object<AS: AddressbookStore>(
return Err(Error::Unauthorized);
}
let addressbook = store.get_addressbook(&principal, &addressbook_id).await?;
let addressbook = store
.get_addressbook(&principal, &addressbook_id, false)
.await?;
let addressbook_resource = AddressbookResource(addressbook);
if !addressbook_resource
.get_user_privileges(&user)?
@@ -40,7 +42,7 @@ pub async fn get_object<AS: AddressbookStore>(
}
let object = store
.get_object(&principal, &addressbook_id, &object_id)
.get_object(&principal, &addressbook_id, &object_id, false)
.await?;
Ok(HttpResponse::Ok()

2
crates/carddav/src/address_object/resource.rs
View File

@@ -144,7 +144,7 @@ impl<AS: AddressbookStore> ResourceService for AddressObjectResourceService<AS>
) -> Result<Self::Resource, Self::Error> {
let object = self
.addr_store
.get_object(principal, addressbook_id, object_id)
.get_object(principal, addressbook_id, object_id, false)
.await?;
Ok(AddressObjectResource {
object,