@@ -9,7 +14,6 @@
Profile
Groups
-
{% for group in user.memberships() %}
- {{ group }}
@@ -117,51 +121,7 @@
{% endfor %}
{% endif %}
-
-
+
@@ -207,27 +167,7 @@
{% endif %}
-
+
{% endblock %}
diff --git a/crates/frontend/src/assets.rs b/crates/frontend/src/assets.rs
index fe31e01..c706a31 100644
--- a/crates/frontend/src/assets.rs
+++ b/crates/frontend/src/assets.rs
@@ -15,7 +15,7 @@ use tower::Service;
#[folder = "public/assets"]
pub struct Assets;
-#[derive(Clone)]
+#[derive(Clone, Default)]
pub struct EmbedService
where
E: 'static + RustEmbed,
@@ -23,17 +23,6 @@ where
_embed: PhantomData,
}
-impl EmbedService
-where
- E: 'static + RustEmbed,
-{
- pub fn new() -> Self {
- Self {
- _embed: PhantomData,
- }
- }
-}
-
impl Service for EmbedService
where
E: 'static + RustEmbed,
diff --git a/crates/frontend/src/lib.rs b/crates/frontend/src/lib.rs
index 7a4073b..7f5ed30 100644
--- a/crates/frontend/src/lib.rs
+++ b/crates/frontend/src/lib.rs
@@ -26,14 +26,9 @@ pub use config::FrontendConfig;
use oidc_user_store::OidcUserStore;
use crate::routes::{
- addressbook::{
- route_addressbook, route_addressbook_restore, route_create_addressbook,
- route_delete_addressbook,
- },
+ addressbook::{route_addressbook, route_addressbook_restore, route_delete_addressbook},
app_token::{route_delete_app_token, route_post_app_token},
- calendar::{
- route_calendar, route_calendar_restore, route_create_calendar, route_delete_calendar,
- },
+ calendar::{route_calendar, route_calendar_restore, route_delete_calendar},
login::{route_get_login, route_post_login, route_post_logout},
user::{route_get_home, route_root, route_user_named},
};
@@ -61,7 +56,6 @@ pub fn frontend_router),
)
// Calendar
- .route("/user/{user}/calendar", post(route_create_calendar::))
.route(
"/user/{user}/calendar/{calendar}",
get(route_calendar::),
@@ -75,10 +69,6 @@ pub fn frontend_router),
)
// Addressbook
- .route(
- "/user/{user}/addressbook",
- post(route_create_addressbook::),
- )
.route(
"/user/{user}/addressbook/{addressbook}",
get(route_addressbook::),
@@ -95,7 +85,7 @@ pub fn frontend_router::new());
+ let mut router = router.route_service("/assets/{*file}", EmbedService::::default());
#[cfg(feature = "dev")]
let mut router = router.nest_service(
"/assets",
diff --git a/crates/frontend/src/routes/addressbook.rs b/crates/frontend/src/routes/addressbook.rs
index 38a38d5..d489601 100644
--- a/crates/frontend/src/routes/addressbook.rs
+++ b/crates/frontend/src/routes/addressbook.rs
@@ -33,53 +33,6 @@ pub async fn route_addressbook(
.into_response())
}
-fn empty_to_none<'de, D>(deserializer: D) -> Result, D::Error>
-where
- D: Deserializer<'de>,
-{
- let val: Option = Deserialize::deserialize(deserializer)?;
- Ok(val.filter(|val| !val.is_empty()))
-}
-
-#[derive(Deserialize, Clone)]
-pub struct PutAddressbookForm {
- id: String,
- #[serde(deserialize_with = "empty_to_none")]
- displayname: Option,
- #[serde(deserialize_with = "empty_to_none")]
- description: Option,
-}
-
-pub async fn route_create_addressbook(
- Path(owner): Path,
- Extension(store): Extension>,
- user: User,
- Form(PutAddressbookForm {
- id,
- displayname,
- description,
- }): Form,
-) -> Result {
- if !user.is_principal(&owner) {
- return Ok(StatusCode::UNAUTHORIZED.into_response());
- }
-
- assert!(!id.is_empty());
-
- let addressbook = Addressbook {
- id: id.to_owned(),
- displayname,
- description,
- principal: user.id.to_owned(),
- synctoken: 0,
- deleted_at: None,
- push_topic: uuid::Uuid::new_v4().to_string(),
- };
-
- store.insert_addressbook(addressbook).await?;
- Ok(Redirect::to(&format!("/frontend/user/{}/addressbook/{}", user.id, id)).into_response())
-}
-
pub async fn route_addressbook_restore(
Path((owner, addressbook_id)): Path<(String, String)>,
Extension(store): Extension>,
diff --git a/crates/frontend/src/routes/calendar.rs b/crates/frontend/src/routes/calendar.rs
index cf4ae61..a6c2921 100644
--- a/crates/frontend/src/routes/calendar.rs
+++ b/crates/frontend/src/routes/calendar.rs
@@ -3,16 +3,14 @@ use std::sync::Arc;
use askama::Template;
use askama_web::WebTemplate;
use axum::{
- Extension, Form,
+ Extension,
extract::Path,
response::{IntoResponse, Redirect, Response},
};
use axum_extra::TypedHeader;
use headers::Referer;
use http::StatusCode;
-use rustical_ical::CalendarObjectType;
use rustical_store::{Calendar, CalendarStore, auth::User};
-use serde::{Deserialize, Deserializer};
#[derive(Template, WebTemplate)]
#[template(path = "pages/calendar.html")]
@@ -34,82 +32,6 @@ pub async fn route_calendar(
.into_response())
}
-fn empty_to_none<'de, D>(deserializer: D) -> Result, D::Error>
-where
- D: Deserializer<'de>,
-{
- let val: Option = Deserialize::deserialize(deserializer)?;
- Ok(val.filter(|val| !val.is_empty()))
-}
-
-#[derive(Deserialize, Clone)]
-pub struct PutCalendarForm {
- id: String,
- #[serde(deserialize_with = "empty_to_none")]
- displayname: Option,
- #[serde(deserialize_with = "empty_to_none")]
- description: Option,
- #[serde(deserialize_with = "empty_to_none")]
- color: Option,
- #[serde(deserialize_with = "empty_to_none")]
- subscription_url: Option,
- comp_event: Option,
- comp_todo: Option,
- comp_journal: Option,
-}
-
-pub async fn route_create_calendar(
- Path(owner): Path,
- Extension(store): Extension>,
- user: User,
- Form(PutCalendarForm {
- id,
- displayname,
- description,
- color,
- subscription_url,
- comp_event,
- comp_todo,
- comp_journal,
- }): Form,
-) -> Result {
- if !user.is_principal(&owner) {
- return Ok(StatusCode::UNAUTHORIZED.into_response());
- }
-
- assert!(!id.is_empty());
-
- let mut comps = vec![];
- if comp_event.is_some() {
- comps.push(CalendarObjectType::Event);
- }
- if comp_todo.is_some() {
- comps.push(CalendarObjectType::Todo);
- }
- if comp_journal.is_some() {
- comps.push(CalendarObjectType::Journal);
- }
-
- let cal = Calendar {
- id: id.to_owned(),
- displayname,
- description,
- color,
- subscription_url,
- principal: user.id.to_owned(),
- components: comps,
- order: 0,
- timezone_id: None,
- timezone: None,
- synctoken: 0,
- deleted_at: None,
- push_topic: uuid::Uuid::new_v4().to_string(),
- };
-
- store.insert_calendar(cal).await?;
- Ok(Redirect::to(&format!("/frontend/user/{}/calendar/{}", user.id, id)).into_response())
-}
-
pub async fn route_calendar_restore(
Path((owner, cal_id)): Path<(String, String)>,
Extension(store): Extension>,