mirror of
https://github.com/lennart-k/rustical.git
synced 2025-12-13 18:12:27 +00:00
@@ -1,9 +1,9 @@
|
||||
use crate::Error;
|
||||
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_store::auth::User;
|
||||
use rustical_store::{CalendarObject, CalendarStore};
|
||||
use tracing::instrument;
|
||||
@@ -20,7 +20,7 @@ pub async fn get_event<C: CalendarStore>(
|
||||
) -> Result<HttpResponse, Error> {
|
||||
let CalendarObjectPathComponents {
|
||||
principal,
|
||||
cal_id,
|
||||
calendar_id,
|
||||
object_id,
|
||||
} = path.into_inner();
|
||||
|
||||
@@ -28,12 +28,14 @@ pub async fn get_event<C: CalendarStore>(
|
||||
return Ok(HttpResponse::Unauthorized().body(""));
|
||||
}
|
||||
|
||||
let calendar = store.get_calendar(&principal, &cal_id).await?;
|
||||
let calendar = store.get_calendar(&principal, &calendar_id).await?;
|
||||
if !user.is_principal(&calendar.principal) {
|
||||
return Ok(HttpResponse::Unauthorized().body(""));
|
||||
}
|
||||
|
||||
let event = store.get_object(&principal, &cal_id, &object_id).await?;
|
||||
let event = store
|
||||
.get_object(&principal, &calendar_id, &object_id)
|
||||
.await?;
|
||||
|
||||
Ok(HttpResponse::Ok()
|
||||
.insert_header(("ETag", event.get_etag()))
|
||||
@@ -52,7 +54,7 @@ pub async fn put_event<C: CalendarStore>(
|
||||
) -> Result<HttpResponse, Error> {
|
||||
let CalendarObjectPathComponents {
|
||||
principal,
|
||||
cal_id,
|
||||
calendar_id,
|
||||
object_id,
|
||||
} = path.into_inner();
|
||||
|
||||
@@ -65,7 +67,7 @@ pub async fn put_event<C: CalendarStore>(
|
||||
|
||||
let object = CalendarObject::from_ics(object_id, body)?;
|
||||
store
|
||||
.put_object(principal, cal_id, object, overwrite)
|
||||
.put_object(principal, calendar_id, object, overwrite)
|
||||
.await?;
|
||||
|
||||
Ok(HttpResponse::Created().body(""))
|
||||
|
||||
Reference in New Issue
Block a user