Merge pull request #97 from lennart-k/feature/sharing

Fix issues with group collections

.sqlx/query-46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 13
-    },
-    "nullable": []
-  },
-  "hash": "46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3"
-}

.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 13
+    },
+    "nullable": []
+  },
+  "hash": "5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9"
+}

.sqlx/query-60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 12
-    },
-    "nullable": []
-  },
-  "hash": "60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113"
-}

.sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json

@@ -39,39 +39,44 @@
         "type_info": "Text"
       },
       {
-        "name": "timezone_id",
+        "name": "timezone",
         "ordinal": 7,
         "type_info": "Text"
       },
       {
-        "name": "deleted_at",
+        "name": "timezone_id",
         "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "deleted_at",
+        "ordinal": 9,
         "type_info": "Datetime"
       },
       {
         "name": "subscription_url",
-        "ordinal": 9,
-        "type_info": "Text"
-      },
-      {
-        "name": "push_topic",
         "ordinal": 10,
         "type_info": "Text"
       },
       {
-        "name": "comp_event",
+        "name": "push_topic",
         "ordinal": 11,
-        "type_info": "Bool"
+        "type_info": "Text"
       },
       {
-        "name": "comp_todo",
+        "name": "comp_event",
         "ordinal": 12,
         "type_info": "Bool"
       },
       {
-        "name": "comp_journal",
+        "name": "comp_todo",
         "ordinal": 13,
         "type_info": "Bool"
+      },
+      {
+        "name": "comp_journal",
+        "ordinal": 14,
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -88,6 +93,7 @@
       true,
       true,
       true,
+      true,
       false,
       false,
       false,

.sqlx/query-cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT principal, id, displayname, \"order\", description, color, timezone_id, deleted_at, synctoken, subscription_url, push_topic, comp_event, comp_todo, comp_journal\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
+  "query": "SELECT *\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
   "describe": {
     "columns": [
       {
@@ -14,14 +14,14 @@
         "type_info": "Text"
       },
       {
-        "name": "displayname",
+        "name": "synctoken",
         "ordinal": 2,
-        "type_info": "Text"
+        "type_info": "Integer"
       },
       {
-        "name": "order",
+        "name": "displayname",
         "ordinal": 3,
-        "type_info": "Integer"
+        "type_info": "Text"
       },
       {
         "name": "description",
@@ -29,49 +29,54 @@
         "type_info": "Text"
       },
       {
-        "name": "color",
+        "name": "order",
         "ordinal": 5,
-        "type_info": "Text"
+        "type_info": "Integer"
       },
       {
-        "name": "timezone_id",
+        "name": "color",
         "ordinal": 6,
         "type_info": "Text"
       },
       {
-        "name": "deleted_at",
+        "name": "timezone",
         "ordinal": 7,
-        "type_info": "Datetime"
-      },
-      {
-        "name": "synctoken",
-        "ordinal": 8,
-        "type_info": "Integer"
-      },
-      {
-        "name": "subscription_url",
-        "ordinal": 9,
         "type_info": "Text"
       },
       {
-        "name": "push_topic",
+        "name": "timezone_id",
+        "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "deleted_at",
+        "ordinal": 9,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "subscription_url",
         "ordinal": 10,
         "type_info": "Text"
       },
       {
-        "name": "comp_event",
+        "name": "push_topic",
         "ordinal": 11,
-        "type_info": "Bool"
+        "type_info": "Text"
       },
       {
-        "name": "comp_todo",
+        "name": "comp_event",
         "ordinal": 12,
         "type_info": "Bool"
       },
       {
-        "name": "comp_journal",
+        "name": "comp_todo",
         "ordinal": 13,
         "type_info": "Bool"
+      },
+      {
+        "name": "comp_journal",
+        "ordinal": 14,
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -80,13 +85,14 @@
     "nullable": [
       false,
       false,
+      false,
+      true,
       true,
       false,
       true,
       true,
       true,
       true,
-      false,
       true,
       false,
       false,
@@ -94,5 +100,5 @@
       false
     ]
   },
-  "hash": "27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd"
+  "hash": "cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237"
 }

.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json

@@ -39,39 +39,44 @@
         "type_info": "Text"
       },
       {
-        "name": "timezone_id",
+        "name": "timezone",
         "ordinal": 7,
         "type_info": "Text"
       },
       {
-        "name": "deleted_at",
+        "name": "timezone_id",
         "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "deleted_at",
+        "ordinal": 9,
         "type_info": "Datetime"
       },
       {
         "name": "subscription_url",
-        "ordinal": 9,
-        "type_info": "Text"
-      },
-      {
-        "name": "push_topic",
         "ordinal": 10,
         "type_info": "Text"
       },
       {
-        "name": "comp_event",
+        "name": "push_topic",
         "ordinal": 11,
-        "type_info": "Bool"
+        "type_info": "Text"
       },
       {
-        "name": "comp_todo",
+        "name": "comp_event",
         "ordinal": 12,
         "type_info": "Bool"
       },
       {
-        "name": "comp_journal",
+        "name": "comp_todo",
         "ordinal": 13,
         "type_info": "Bool"
+      },
+      {
+        "name": "comp_journal",
+        "ordinal": 14,
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -88,6 +93,7 @@
       true,
       true,
       true,
+      true,
       false,
       false,
       false,

.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 14
+    },
+    "nullable": []
+  },
+  "hash": "d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7"
+}

Cargo.toml

@@ -2,10 +2,9 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.9.5"
+version = "0.4.13"
 edition = "2024"
 description = "A CalDAV server"
-documentation = "https://lennart-k.github.io/rustical/"
 repository = "https://github.com/lennart-k/rustical"
 license = "AGPL-3.0-or-later"
 
@@ -17,7 +16,7 @@ description.workspace = true
 repository.workspace = true
 license.workspace = true
 resolver = "2"
-publish = true
+publish = false
 
 [features]
 debug = ["opentelemetry"]
@@ -49,7 +48,7 @@ rand_core = { version = "0.9", features = ["std"] }
 chrono = { version = "0.4", features = ["serde"] }
 regex = "1.10"
 lazy_static = "1.5"
-rstest = "0.26"
+rstest = "0.25"
 rstest_reuse = "0.7"
 sha2 = "0.10"
 tokio = { version = "1", features = [
@@ -62,7 +61,7 @@ tokio = { version = "1", features = [
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
-quick-xml = { version = "0.38" }
+quick-xml = { version = "0.37" }
 rust-embed = "8.5"
 tower-sessions = "0.14"
 futures-core = "0.3.31"
@@ -96,12 +95,8 @@ strum = "0.27"
 strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
-ical = { git = "https://github.com/lennart-k/ical-rs", features = [
-  "generator",
-  "serde",
-  "chrono-tz",
-] }
-toml = "0.9"
+ical = { version = "0.11", features = ["generator", "serde"] }
+toml = "0.8"
 tower = "0.5"
 tower-http = { version = "0.6", features = [
   "trace",
@@ -131,7 +126,7 @@ syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
 proc-macro2 = "1.0"
 heck = "0.5"
-darling = "0.21"
+darling = "0.20"
 reqwest = { version = "0.12", features = [
   "rustls-tls",
   "charset",
@@ -140,7 +135,6 @@ reqwest = { version = "0.12", features = [
 openidconnect = "4.0"
 clap = { version = "4.5", features = ["derive", "env"] }
 matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "f0591d13" }
-vtimezones-rs = "0.2"
 ece = { version = "2.3", default-features = false, features = [
   "backend-openssl",
 ] }

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM rust:1.89-alpine AS chef
+FROM --platform=$BUILDPLATFORM rust:1.88-alpine AS chef
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -45,5 +45,4 @@ CMD ["/usr/local/bin/rustical"]
 ENV RUSTICAL_DATA_STORE__SQLITE__DB_URL=/var/lib/rustical/db.sqlite3
 
 LABEL org.opencontainers.image.authors="Lennart K github.com/lennart-k"
-LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
 EXPOSE 4000

README.md

@@ -4,23 +4,21 @@ a CalDAV/CardDAV server
 
 > [!WARNING]
   RustiCal is under **active development**!
-  While I've been successfully using RustiCal productively for some months now and there seems to be a growing user base,
+  While I've been successfully using RustiCal productively for a few weeks now,
   you'd still be one of the first testers so expect bugs and rough edges.
-  If you still want to use it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
+  If you still want to play around with it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
 
 ## Features
 
 - easy to backup, everything saved in one SQLite database
   - also export feature in the frontend
-- Import your existing calendars in the frontend
-- **[WebDAV Push](https://github.com/bitfireAT/webdav-push/)** support, so near-instant synchronisation to DAVx5
+- [WebDAV Push](https://github.com/bitfireAT/webdav-push/) support, so near-instant synchronisation to DAVx5
 - lightweight (the container image contains only one binary)
 - adequately fast (I'd love to say blazingly fast™ :fire: but I don't have any benchmarks)
 - deleted calendars are recoverable
 - Nextcloud login flow (In DAVx5 you can login through the Nextcloud flow and automatically generate an app token)
 - Apple configuration profiles (skip copy-pasting passwords and instead generate the configuration in the frontend)
-- **OpenID Connect** support (with option to disable password login)
-- Group-based **sharing**
+- OpenID Connect support (with option to disable password login)
 
 ## Getting Started
 

about.toml

@@ -7,7 +7,6 @@ accepted = [
   "CDLA-Permissive-2.0",
   "Zlib",
   "AGPL-3.0",
-  "GPL-3.0",
   "MPL-2.0",
 ]
 workarounds = ["ring", "chrono", "rustls"]

compose.oidc.yml

@@ -1,22 +0,0 @@
-services:
-  rustical:
-    image: ghcr.io/lennart-k/rustical:latest
-    restart: unless-stopped
-    environment:
-      RUSTICAL_FRONTEND__ALLOW_PASSWORD_LOGIN: "false"
-      RUSTICAL_OIDC__NAME: "Authelia"
-      RUSTICAL_OIDC__ISSUER: "https://auth.example.com"
-      RUSTICAL_OIDC__CLIENT_ID: "{{ rustical_oidc_client_id }}"
-      RUSTICAL_OIDC__CLIENT_SECRET: "{{ rustical_oidc_client_secret }}"
-      RUSTICAL_OIDC__CLAIM_USERID: "preferred_username"
-      RUSTICAL_OIDC__SCOPES: '["openid", "profile", "groups"]'
-      RUSTICAL_OIDC__REQUIRE_GROUP: "app:rustical" # optional
-      RUSTICAL_OIDC__ALLOW_SIGN_UP: "true"
-    volumes:
-      - data:/var/lib/rustical
-    # Here you probably want to you expose instead
-    ports:
-      - 4000:4000
-
-volumes:
-  data:

crates/caldav/Cargo.toml

@@ -11,7 +11,6 @@ publish = false
 rustical_store_sqlite = { workspace = true, features = ["test"] }
 rstest.workspace = true
 async-std.workspace = true
-serde_json.workspace = true
 
 [dependencies]
 axum.workspace = true
@@ -43,4 +42,3 @@ headers.workspace = true
 tower-http.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
-vtimezones-rs.workspace = true

crates/caldav/src/calendar/methods/get.rs

@@ -37,36 +37,35 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
         .await?;
 
     let mut timezones = HashMap::new();
-    let mut vtimezones = HashMap::new();
     let objects = cal_store.get_objects(&principal, &calendar_id).await?;
 
     let mut ical_calendar_builder = IcalCalendarBuilder::version("4.0")
         .gregorian()
         .prodid("RustiCal");
-    if let Some(displayname) = calendar.meta.displayname {
+    if calendar.displayname.is_some() {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALNAME".to_owned(),
-            value: Some(displayname),
+            value: calendar.displayname,
             params: None,
         });
     }
-    if let Some(description) = calendar.meta.description {
+    if calendar.description.is_some() {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-CALDESC".to_owned(),
-            value: Some(description),
+            value: calendar.description,
             params: None,
         });
     }
-    if let Some(timezone_id) = calendar.timezone_id {
+    if calendar.timezone_id.is_some() {
         ical_calendar_builder = ical_calendar_builder.set(Property {
             name: "X-WR-TIMEZONE".to_owned(),
-            value: Some(timezone_id),
+            value: calendar.timezone_id,
             params: None,
         });
     }
+    let mut ical_calendar = ical_calendar_builder.build();
 
     for object in &objects {
-        vtimezones.extend(object.get_vtimezones());
         match object.get_data() {
             CalendarObjectComponent::Event(EventObject {
                 event,
@@ -74,25 +73,17 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
                 ..
             }) => {
                 timezones.extend(object_timezones);
-                ical_calendar_builder = ical_calendar_builder.add_event(event.clone());
+                ical_calendar.events.push(event.clone());
             }
-            CalendarObjectComponent::Todo(TodoObject(todo)) => {
-                ical_calendar_builder = ical_calendar_builder.add_todo(todo.clone());
+            CalendarObjectComponent::Todo(TodoObject { todo, .. }) => {
+                ical_calendar.todos.push(todo.clone());
             }
-            CalendarObjectComponent::Journal(JournalObject(journal)) => {
-                ical_calendar_builder = ical_calendar_builder.add_journal(journal.clone());
+            CalendarObjectComponent::Journal(JournalObject { journal, .. }) => {
+                ical_calendar.journals.push(journal.clone());
             }
         }
     }
 
-    for vtimezone in vtimezones.into_values() {
-        ical_calendar_builder = ical_calendar_builder.add_tz(vtimezone.to_owned());
-    }
-
-    let ical_calendar = ical_calendar_builder
-        .build()
-        .map_err(|parser_error| Error::IcalError(parser_error.into()))?;
-
     let mut resp = Response::builder().status(StatusCode::OK);
     let hdrs = resp.headers_mut().unwrap();
     hdrs.typed_insert(ContentType::from_str("text/calendar").unwrap());

crates/caldav/src/calendar/methods/import.rs

@@ -1,106 +0,0 @@
-use crate::Error;
-use crate::calendar::CalendarResourceService;
-use axum::{
-    extract::{Path, State},
-    response::{IntoResponse, Response},
-};
-use http::StatusCode;
-use ical::{
-    generator::Emitter,
-    parser::{Component, ComponentMut},
-};
-use rustical_ical::{CalendarObject, CalendarObjectType};
-use rustical_store::{
-    Calendar, CalendarMetadata, CalendarStore, SubscriptionStore, auth::Principal,
-};
-use std::io::BufReader;
-use tracing::instrument;
-
-#[instrument(skip(resource_service))]
-pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
-    Path((principal, cal_id)): Path<(String, String)>,
-    user: Principal,
-    State(resource_service): State<CalendarResourceService<C, S>>,
-    body: String,
-) -> Result<Response, Error> {
-    if !user.is_principal(&principal) {
-        return Err(Error::Unauthorized);
-    }
-
-    let mut parser = ical::IcalParser::new(BufReader::new(body.as_bytes()));
-    let mut cal = parser
-        .next()
-        .expect("input must contain calendar")
-        .unwrap()
-        .mutable();
-    if parser.next().is_some() {
-        return Err(rustical_ical::Error::InvalidData(
-            "multiple calendars, only one allowed".to_owned(),
-        )
-        .into());
-    }
-
-    // Extract calendar metadata
-    let displayname = cal
-        .get_property("X-WR-CALNAME")
-        .and_then(|prop| prop.value.to_owned());
-    let description = cal
-        .get_property("X-WR-CALDESC")
-        .and_then(|prop| prop.value.to_owned());
-    let timezone_id = cal
-        .get_property("X-WR-TIMEZONE")
-        .and_then(|prop| prop.value.to_owned());
-    // These properties should not appear in the expanded calendar objects
-    cal.remove_property("X-WR-CALNAME");
-    cal.remove_property("X-WR-CALDESC");
-    cal.remove_property("X-WR-TIMEZONE");
-    let cal = cal.verify().unwrap();
-    // Make sure timezone is valid
-    if let Some(timezone_id) = timezone_id.as_ref() {
-        assert!(
-            vtimezones_rs::VTIMEZONES.contains_key(timezone_id),
-            "Invalid calendar timezone id"
-        );
-    }
-
-    // Extract necessary component types
-    let mut cal_components = vec![];
-    if !cal.events.is_empty() {
-        cal_components.push(CalendarObjectType::Event);
-    }
-    if !cal.journals.is_empty() {
-        cal_components.push(CalendarObjectType::Journal);
-    }
-    if !cal.todos.is_empty() {
-        cal_components.push(CalendarObjectType::Todo);
-    }
-
-    let expanded_cals = cal.expand_calendar();
-    // Janky way to convert between IcalCalendar and CalendarObject
-    let objects = expanded_cals
-        .into_iter()
-        .map(|cal| cal.generate())
-        .map(CalendarObject::from_ics)
-        .collect::<Result<Vec<_>, _>>()?;
-    let new_cal = Calendar {
-        principal,
-        id: cal_id,
-        meta: CalendarMetadata {
-            displayname,
-            order: 0,
-            description,
-            color: None,
-        },
-        timezone_id,
-        deleted_at: None,
-        synctoken: 0,
-        subscription_url: None,
-        push_topic: uuid::Uuid::new_v4().to_string(),
-        components: cal_components,
-    };
-
-    let cal_store = resource_service.cal_store;
-    cal_store.import_calendar(new_cal, objects, false).await?;
-
-    Ok(StatusCode::OK.into_response())
-}

crates/caldav/src/calendar/methods/mkcalendar.rs

@@ -4,11 +4,10 @@ use crate::calendar::prop::SupportedCalendarComponentSet;
 use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use http::{Method, StatusCode};
-use ical::IcalParser;
 use rustical_dav::xml::HrefElement;
 use rustical_ical::CalendarObjectType;
 use rustical_store::auth::Principal;
-use rustical_store::{Calendar, CalendarMetadata, CalendarStore, SubscriptionStore};
+use rustical_store::{Calendar, CalendarStore, SubscriptionStore};
 use rustical_xml::{Unparsed, XmlDeserialize, XmlDocument, XmlRootTag};
 use tracing::instrument;
 
@@ -46,7 +45,7 @@ pub struct PropElement {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = "mkcalendar")]
+#[xml(root = b"mkcalendar")]
 #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
 struct MkcalendarRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -54,7 +53,7 @@ struct MkcalendarRequest {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = "mkcol")]
+#[xml(root = b"mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -83,42 +82,15 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
         request.displayname = None
     }
 
-    let timezone_id = if let Some(tzid) = request.calendar_timezone_id {
-        Some(tzid)
-    } else if let Some(tz) = request.calendar_timezone {
-        // TODO: Proper error (calendar-timezone precondition)
-        let calendar = IcalParser::new(tz.as_bytes())
-            .next()
-            .ok_or(rustical_dav::Error::BadRequest(
-                "No timezone data provided".to_owned(),
-            ))?
-            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
-
-        let timezone = calendar
-            .timezones
-            .first()
-            .ok_or(rustical_dav::Error::BadRequest(
-                "No timezone data provided".to_owned(),
-            ))?;
-        let timezone: chrono_tz::Tz = timezone
-            .try_into()
-            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
-
-        Some(timezone.name().to_owned())
-    } else {
-        None
-    };
-
     let calendar = Calendar {
         id: cal_id.to_owned(),
         principal: principal.to_owned(),
-        meta: CalendarMetadata {
         order: request.calendar_order.unwrap_or(0),
         displayname: request.displayname,
+        timezone: request.calendar_timezone,
+        timezone_id: request.calendar_timezone_id,
         color: request.calendar_color,
         description: request.calendar_description,
-        },
-        timezone_id,
         deleted_at: None,
         synctoken: 0,
         subscription_url: request.source.map(|href| href.href),

crates/caldav/src/calendar/methods/mod.rs

@@ -1,5 +1,4 @@
 pub mod get;
-pub mod import;
 pub mod mkcalendar;
 pub mod post;
 pub mod report;

crates/caldav/src/calendar/methods/report/calendar_query.rs

@@ -16,7 +16,6 @@ pub(crate) struct TimeRangeElement {
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
-// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
 struct ParamFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     is_not_defined: Option<()>,
@@ -33,13 +32,11 @@ struct TextMatchElement {
     #[xml(ty = "attr")]
     collation: String,
     #[xml(ty = "attr")]
-    // "yes" or "no", default: "no"
-    negate_condition: Option<String>,
+    negate_collation: String,
 }
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
-// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
 pub(crate) struct PropFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     is_not_defined: Option<()>,
@@ -49,9 +46,6 @@ pub(crate) struct PropFilterElement {
     text_match: Option<TextMatchElement>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
     param_filter: Vec<ParamFilterElement>,
-
-    #[xml(ty = "attr")]
-    name: String,
 }
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
@@ -67,7 +61,7 @@ pub(crate) struct CompFilterElement {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
     pub(crate) comp_filter: Vec<CompFilterElement>,
 
-    #[xml(ty = "attr")]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", ty = "attr")]
     pub(crate) name: String,
 }
 
@@ -116,18 +110,20 @@ impl CompFilterElement {
         // TODO: Implement prop-filter (and comp-filter?) at some point
 
         if let Some(time_range) = &self.time_range {
-            if let Some(start) = &time_range.start
-                && let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None)
-                && start.deref() > &last_occurence.utc()
-            {
+            if let Some(start) = &time_range.start {
+                if let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None) {
+                    if start.deref() > &last_occurence.utc() {
                         return false;
                     }
-            if let Some(end) = &time_range.end
-                && let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None)
-                && end.deref() < &first_occurence.utc()
-            {
+                };
+            }
+            if let Some(end) = &time_range.end {
+                if let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None) {
+                    if end.deref() < &first_occurence.utc() {
                         return false;
                     }
+                };
+            }
         }
         true
     }
@@ -154,9 +150,8 @@ impl From<&FilterElement> for CalendarQuery {
         for comp_filter in comp_filter_vcalendar.comp_filter.iter() {
             // A calendar object cannot contain both VEVENT and VTODO, so we only have to handle
             // whatever we get first
-            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO")
-                && let Some(time_range) = &comp_filter.time_range
-            {
+            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO") {
+                if let Some(time_range) = &comp_filter.time_range {
                     let start = time_range.start.as_ref().map(|start| start.date_naive());
                     let end = time_range.end.as_ref().map(|end| end.date_naive());
                     return CalendarQuery {
@@ -165,6 +160,7 @@ impl From<&FilterElement> for CalendarQuery {
                     };
                 }
             }
+        }
         Default::default()
     }
 }
@@ -207,102 +203,3 @@ pub async fn get_objects_calendar_query<C: CalendarStore>(
     }
     Ok(objects)
 }
-
-#[cfg(test)]
-mod tests {
-    use rustical_dav::xml::PropElement;
-    use rustical_xml::XmlDocument;
-
-    use crate::{
-        calendar::methods::report::{
-            ReportRequest,
-            calendar_query::{
-                CalendarQueryRequest, CompFilterElement, FilterElement, ParamFilterElement,
-                PropFilterElement, TextMatchElement,
-            },
-        },
-        calendar_object::{CalendarObjectPropName, CalendarObjectPropWrapperName},
-    };
-
-    #[test]
-    fn calendar_query_7_8_7() {
-        const INPUT: &str = r#"
-            <?xml version="1.0" encoding="utf-8" ?>
-            <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-                <D:prop xmlns:D="DAV:">
-                    <D:getetag/>
-                    <C:calendar-data/>
-                </D:prop>
-                <C:filter>
-                <C:comp-filter name="VCALENDAR">
-                    <C:comp-filter name="VEVENT">
-                        <C:prop-filter name="ATTENDEE">
-                            <C:text-match collation="i;ascii-casemap">mailto:lisa@example.com</C:text-match>
-                            <C:param-filter name="PARTSTAT">
-                                <C:text-match collation="i;ascii-casemap">NEEDS-ACTION</C:text-match>
-                            </C:param-filter>
-                        </C:prop-filter>
-                    </C:comp-filter>
-                </C:comp-filter>
-                </C:filter>
-            </C:calendar-query>
-        "#;
-
-        let report = ReportRequest::parse_str(INPUT).unwrap();
-        let calendar_query: CalendarQueryRequest =
-            if let ReportRequest::CalendarQuery(query) = report {
-                query
-            } else {
-                panic!()
-            };
-        assert_eq!(
-            calendar_query,
-            CalendarQueryRequest {
-                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
-                    vec![
-                        CalendarObjectPropWrapperName::CalendarObject(
-                            CalendarObjectPropName::Getetag,
-                        ),
-                        CalendarObjectPropWrapperName::CalendarObject(
-                            CalendarObjectPropName::CalendarData(Default::default())
-                        ),
-                    ],
-                    vec![]
-                )),
-                filter: Some(FilterElement {
-                    comp_filter: CompFilterElement {
-                        is_not_defined: None,
-                        time_range: None,
-                        prop_filter: vec![],
-                        comp_filter: vec![CompFilterElement {
-                            prop_filter: vec![PropFilterElement {
-                                name: "ATTENDEE".to_owned(),
-                                text_match: Some(TextMatchElement {
-                                    collation: "i;ascii-casemap".to_owned(),
-                                    negate_condition: None
-                                }),
-                                is_not_defined: None,
-                                param_filter: vec![ParamFilterElement {
-                                    is_not_defined: None,
-                                    name: "PARTSTAT".to_owned(),
-                                    text_match: Some(TextMatchElement {
-                                        collation: "i;ascii-casemap".to_owned(),
-                                        negate_condition: None
-                                    }),
-                                }],
-                                time_range: None
-                            }],
-                            comp_filter: vec![],
-                            is_not_defined: None,
-                            name: "VEVENT".to_owned(),
-                            time_range: None
-                        }],
-                        name: "VCALENDAR".to_owned()
-                    }
-                }),
-                timezone: None,
-                timezone_id: None
-            }
-        )
-    }
-}

crates/caldav/src/calendar/mod.rs

@@ -4,6 +4,3 @@ pub mod resource;
 mod service;
 
 pub use service::CalendarResourceService;
-
-#[cfg(test)]
-pub mod tests;

crates/caldav/src/calendar/resource.rs

@@ -3,7 +3,6 @@ use crate::Error;
 use crate::calendar::prop::ReportMethod;
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
-use ical::IcalParser;
 use rustical_dav::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
@@ -16,7 +15,7 @@ use rustical_store::Calendar;
 use rustical_store::auth::Principal;
 use rustical_xml::{EnumVariants, PropName};
 use rustical_xml::{XmlDeserialize, XmlSerialize};
-use serde::Deserialize;
+use std::str::FromStr;
 
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropName")]
@@ -35,7 +34,7 @@ pub enum CalendarProp {
     CalendarTimezoneId(Option<String>),
     #[xml(ns = "rustical_dav::namespace::NS_ICAL")]
     CalendarOrder(Option<i64>),
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
     SupportedCalendarComponentSet(SupportedCalendarComponentSet),
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
     SupportedCalendarData(SupportedCalendarData),
@@ -63,7 +62,7 @@ pub enum CalendarPropWrapper {
     Common(CommonPropertiesProp),
 }
 
-#[derive(Clone, Debug, From, Into, Deserialize)]
+#[derive(Clone, Debug, From, Into)]
 pub struct CalendarResource {
     pub cal: Calendar,
     pub read_only: bool,
@@ -128,15 +127,13 @@ impl Resource for CalendarResource {
         Ok(match prop {
             CalendarPropWrapperName::Calendar(prop) => CalendarPropWrapper::Calendar(match prop {
                 CalendarPropName::CalendarColor => {
-                    CalendarProp::CalendarColor(self.cal.meta.color.clone())
+                    CalendarProp::CalendarColor(self.cal.color.clone())
                 }
                 CalendarPropName::CalendarDescription => {
-                    CalendarProp::CalendarDescription(self.cal.meta.description.clone())
+                    CalendarProp::CalendarDescription(self.cal.description.clone())
                 }
                 CalendarPropName::CalendarTimezone => {
-                    CalendarProp::CalendarTimezone(self.cal.timezone_id.as_ref().and_then(|tzid| {
-                        vtimezones_rs::VTIMEZONES.get(tzid).map(|tz| tz.to_string())
-                    }))
+                    CalendarProp::CalendarTimezone(self.cal.timezone.clone())
                 }
                 // chrono_tz uses the IANA database
                 CalendarPropName::TimezoneServiceSet => CalendarProp::TimezoneServiceSet(
@@ -146,7 +143,7 @@ impl Resource for CalendarResource {
                     CalendarProp::CalendarTimezoneId(self.cal.timezone_id.clone())
                 }
                 CalendarPropName::CalendarOrder => {
-                    CalendarProp::CalendarOrder(Some(self.cal.meta.order))
+                    CalendarProp::CalendarOrder(Some(self.cal.order))
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
                     CalendarProp::SupportedCalendarComponentSet(self.cal.components.clone().into())
@@ -187,56 +184,32 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapper::Calendar(prop) => match prop {
                 CalendarProp::CalendarColor(color) => {
-                    self.cal.meta.color = color;
+                    self.cal.color = color;
                     Ok(())
                 }
                 CalendarProp::CalendarDescription(description) => {
-                    self.cal.meta.description = description;
+                    self.cal.description = description;
                     Ok(())
                 }
                 CalendarProp::CalendarTimezone(timezone) => {
-                    if let Some(tz) = timezone {
-                        // TODO: Proper error (calendar-timezone precondition)
-                        let calendar = IcalParser::new(tz.as_bytes())
-                            .next()
-                            .ok_or(rustical_dav::Error::BadRequest(
-                                "No timezone data provided".to_owned(),
-                            ))?
-                            .map_err(|_| {
-                                rustical_dav::Error::BadRequest(
-                                    "No timezone data provided".to_owned(),
-                                )
-                            })?;
-
-                        let timezone =
-                            calendar
-                                .timezones
-                                .first()
-                                .ok_or(rustical_dav::Error::BadRequest(
-                                    "No timezone data provided".to_owned(),
-                                ))?;
-                        let timezone: chrono_tz::Tz = timezone.try_into().map_err(|_| {
-                            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
-                        })?;
-
-                        self.cal.timezone_id = Some(timezone.name().to_owned());
-                    }
+                    // TODO: Ensure that timezone-id is also updated
+                    self.cal.timezone = timezone;
                     Ok(())
                 }
                 CalendarProp::TimezoneServiceSet(_) => Err(rustical_dav::Error::PropReadOnly),
                 CalendarProp::CalendarTimezoneId(timezone_id) => {
-                    if let Some(tzid) = &timezone_id
-                        && !vtimezones_rs::VTIMEZONES.contains_key(tzid)
-                    {
-                        return Err(rustical_dav::Error::BadRequest(format!(
-                            "Invalid timezone-id: {tzid}"
-                        )));
+                    if let Some(tzid) = &timezone_id {
+                        // Validate timezone id
+                        chrono_tz::Tz::from_str(tzid).map_err(|_| {
+                            rustical_dav::Error::BadRequest(format!("Invalid timezone-id: {tzid}"))
+                        })?;
+                        // TODO: Ensure that timezone is also updated (For now hope that clients play nice)
                     }
                     self.cal.timezone_id = timezone_id;
                     Ok(())
                 }
                 CalendarProp::CalendarOrder(order) => {
-                    self.cal.meta.order = order.unwrap_or_default();
+                    self.cal.order = order.unwrap_or_default();
                     Ok(())
                 }
                 CalendarProp::SupportedCalendarComponentSet(comp_set) => {
@@ -264,20 +237,24 @@ impl Resource for CalendarResource {
         match prop {
             CalendarPropWrapperName::Calendar(prop) => match prop {
                 CalendarPropName::CalendarColor => {
-                    self.cal.meta.color = None;
+                    self.cal.color = None;
                     Ok(())
                 }
                 CalendarPropName::CalendarDescription => {
-                    self.cal.meta.description = None;
+                    self.cal.description = None;
                     Ok(())
                 }
-                CalendarPropName::CalendarTimezone | CalendarPropName::CalendarTimezoneId => {
-                    self.cal.timezone_id = None;
+                CalendarPropName::CalendarTimezone => {
+                    self.cal.timezone = None;
                     Ok(())
                 }
                 CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
+                CalendarPropName::CalendarTimezoneId => {
+                    self.cal.timezone_id = None;
+                    Ok(())
+                }
                 CalendarPropName::CalendarOrder => {
-                    self.cal.meta.order = 0;
+                    self.cal.order = 0;
                     Ok(())
                 }
                 CalendarPropName::SupportedCalendarComponentSet => {
@@ -300,10 +277,10 @@ impl Resource for CalendarResource {
     }
 
     fn get_displayname(&self) -> Option<&str> {
-        self.cal.meta.displayname.as_deref()
+        self.cal.displayname.as_deref()
     }
     fn set_displayname(&mut self, name: Option<String>) -> Result<(), rustical_dav::Error> {
-        self.cal.meta.displayname = name;
+        self.cal.displayname = name;
         Ok(())
     }
 
@@ -328,15 +305,3 @@ impl Resource for CalendarResource {
         ))
     }
 }
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_tzdb_version() {
-        // Ensure that both chrono_tz and vzic_rs use the same tzdb version
-        assert_eq!(
-            chrono_tz::IANA_TZDB_VERSION,
-            vtimezones_rs::IANA_TZDB_VERSION
-        );
-    }
-}

crates/caldav/src/calendar/service.rs

@@ -1,5 +1,4 @@
 use crate::calendar::methods::get::route_get;
-use crate::calendar::methods::import::route_import;
 use crate::calendar::methods::mkcalendar::route_mkcalendar;
 use crate::calendar::methods::post::route_post;
 use crate::calendar::methods::report::route_report_calendar;
@@ -52,7 +51,7 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
     type Principal = Principal;
     type PrincipalUri = CalDavPrincipalUri;
 
-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, webdav-push";
+    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy, webdav-push";
 
     async fn get_resource(
         &self,
@@ -139,13 +138,6 @@ impl<C: CalendarStore, S: SubscriptionStore> AxumMethods for CalendarResourceSer
         })
     }
 
-    fn import() -> Option<rustical_dav::resource::MethodFunction<Self>> {
-        Some(|state, req| {
-            let mut service = Handler::with_state(route_import::<C, S>, state);
-            Box::pin(Service::call(&mut service, req))
-        })
-    }
-
     fn mkcalendar() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>>
     {
         Some(|state, req| {

crates/caldav/src/calendar/test_files/propfind.outputs

@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<response xmlns:CS="http://calendarserver.org/ns/" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns="DAV:" xmlns:PUSH="https://bitfire.at/webdav-push">
-    <href>/caldav/principal/user/calendar/</href>
-    <propstat>
-        <prop>
-            <calendar-color xmlns="http://apple.com/ns/ical/"/>
-            <calendar-description xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <calendar-timezone xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <timezone-service-set xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <calendar-timezone-id xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <calendar-order xmlns="http://apple.com/ns/ical/"/>
-            <supported-calendar-component-set xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <supported-calendar-data xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <max-resource-size xmlns="DAV:"/>
-            <supported-report-set xmlns="DAV:"/>
-            <source xmlns="http://calendarserver.org/ns/"/>
-            <min-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <max-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <sync-token xmlns="DAV:"/>
-            <getctag xmlns="http://calendarserver.org/ns/"/>
-            <transports xmlns="https://bitfire.at/webdav-push"/>
-            <topic xmlns="https://bitfire.at/webdav-push"/>
-            <supported-triggers xmlns="https://bitfire.at/webdav-push"/>
-            <resourcetype xmlns="DAV:"/>
-            <displayname xmlns="DAV:"/>
-            <current-user-principal xmlns="DAV:"/>
-            <current-user-privilege-set xmlns="DAV:"/>
-            <owner xmlns="DAV:"/>
-        </prop>
-        <status>HTTP/1.1 200 OK</status>
-    </propstat>
-</response>
-
-
-<?xml version="1.0" encoding="utf-8"?>
-<response xmlns:CS="http://calendarserver.org/ns/" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns="DAV:" xmlns:PUSH="https://bitfire.at/webdav-push">
-    <href>/caldav/principal/user/calendar/</href>
-    <propstat>
-        <prop>
-            <CAL:calendar-timezone>BEGIN:VCALENDAR
-PRODID:-//github.com/lennart-k/vzic-rs//RustiCal Calendar server//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-LAST-MODIFIED:20250723T190331Z
-X-LIC-LOCATION:Europe/Berlin
-X-PROLEPTIC-TZNAME:LMT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+005328
-TZOFFSETTO:+0100
-DTSTART:18930401T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19160430T230000
-RDATE:19400401T020000
-RDATE:19430329T020000
-RDATE:19460414T020000
-RDATE:19470406T030000
-RDATE:19480418T020000
-RDATE:19490410T020000
-RDATE:19800406T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19161001T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451118T030000
-RDATE:19461007T030000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19170917T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19440403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:CEMT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19450524T020000
-RDATE:19470511T030000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-DTSTART:19450924T030000
-RDATE:19470629T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-DTSTART:19460101T000000
-RDATE:19800101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19810329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19961027T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
-</CAL:calendar-timezone>
-            <CAL:timezone-service-set>
-                <href>https://www.iana.org/time-zones</href>
-            </CAL:timezone-service-set>
-            <CAL:calendar-timezone-id>Europe/Berlin</CAL:calendar-timezone-id>
-            <calendar-order xmlns="http://apple.com/ns/ical/">0</calendar-order>
-            <CAL:supported-calendar-component-set>
-                <CAL:comp name="VEVENT"/>
-                <CAL:comp name="VTODO"/>
-            </CAL:supported-calendar-component-set>
-            <CAL:supported-calendar-data>
-                <CAL:calendar-data content-type="text/calendar" version="2.0"/>
-            </CAL:supported-calendar-data>
-            <max-resource-size>10000000</max-resource-size>
-            <supported-report-set>
-                <supported-report>
-                    <report>
-                        <CAL:calendar-query/>
-                    </report>
-                </supported-report>
-                <supported-report>
-                    <report>
-                        <CAL:calendar-multiget/>
-                    </report>
-                </supported-report>
-                <supported-report>
-                    <report>
-                        <sync-collection/>
-                    </report>
-                </supported-report>
-            </supported-report-set>
-            <CAL:min-date-time>-2621430101T000000Z</CAL:min-date-time>
-            <CAL:max-date-time>+2621421231T235959Z</CAL:max-date-time>
-            <sync-token>github.com/lennart-k/rustical/ns/12</sync-token>
-            <CS:getctag>github.com/lennart-k/rustical/ns/12</CS:getctag>
-            <PUSH:transports>
-                <PUSH:web-push/>
-            </PUSH:transports>
-            <PUSH:topic>b28b41e9-8801-4fc5-ae29-8efb5fadeb36</PUSH:topic>
-            <PUSH:supported-triggers>
-                <PUSH:content-update>
-                    <depth>1</depth>
-                </PUSH:content-update>
-                <PUSH:property-update>
-                    <depth>1</depth>
-                </PUSH:property-update>
-            </PUSH:supported-triggers>
-            <resourcetype>
-                <collection/>
-                <CAL:calendar/>
-            </resourcetype>
-            <displayname>Calendar</displayname>
-            <current-user-principal>
-                <href>/caldav/principal/user/</href>
-            </current-user-principal>
-            <current-user-privilege-set>
-                <privilege>
-                    <read/>
-                </privilege>
-                <privilege>
-                    <read-acl/>
-                </privilege>
-                <privilege>
-                    <read-current-user-privilege-set/>
-                </privilege>
-            </current-user-privilege-set>
-            <owner>
-                <href>/caldav/principal/user/</href>
-            </owner>
-        </prop>
-        <status>HTTP/1.1 200 OK</status>
-    </propstat>
-</response>

crates/caldav/src/calendar/test_files/propfind.principals.json

@@ -1,11 +0,0 @@
-[
-  {
-    "id": "user",
-    "displayname": null,
-    "principal_type": "individual",
-    "password": null,
-    "memberships": [
-      "group"
-    ]
-  }
-]

crates/caldav/src/calendar/test_files/propfind.requests

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<propfind xmlns="DAV:"><propname/></propfind>
-
-
-<?xml version="1.0" encoding="UTF-8"?>
-<propfind xmlns="DAV:"><allprop/></propfind>

crates/caldav/src/calendar/test_files/propfind.resources.json

@@ -1,42 +0,0 @@
-[
-  {
-    "cal": {
-      "principal": "user",
-      "id": "calendar",
-      "displayname": "Calendar",
-      "order": 0,
-      "description": null,
-      "color": null,
-      "timezone_id": "Europe/Berlin",
-      "deleted_at": null,
-      "synctoken": 12,
-      "subscription_url": null,
-      "push_topic": "b28b41e9-8801-4fc5-ae29-8efb5fadeb36",
-      "components": [
-        "VEVENT",
-        "VTODO"
-      ]
-    },
-    "read_only": true
-  },
-  {
-    "cal": {
-      "principal": "user",
-      "id": "calendar",
-      "displayname": "Calendar",
-      "order": 0,
-      "description": null,
-      "color": null,
-      "timezone_id": "Europe/Berlin",
-      "deleted_at": null,
-      "synctoken": 12,
-      "subscription_url": null,
-      "push_topic": "b28b41e9-8801-4fc5-ae29-8efb5fadeb36",
-      "components": [
-        "VEVENT",
-        "VTODO"
-      ]
-    },
-    "read_only": true
-  }
-]

crates/caldav/src/calendar/tests.rs

@@ -1,47 +0,0 @@
-use crate::{CalDavPrincipalUri, calendar::resource::CalendarResource};
-use rustical_dav::resource::Resource;
-use rustical_store::auth::Principal;
-use rustical_xml::XmlSerializeRoot;
-use serde_json::from_str;
-
-// #[tokio::test]
-async fn test_propfind() {
-    let requests: Vec<_> = include_str!("./test_files/propfind.requests")
-        .trim()
-        .split("\n\n")
-        .collect();
-    let principals: Vec<Principal> =
-        from_str(include_str!("./test_files/propfind.principals.json")).unwrap();
-    let resources: Vec<CalendarResource> =
-        from_str(include_str!("./test_files/propfind.resources.json")).unwrap();
-    let outputs: Vec<_> = include_str!("./test_files/propfind.outputs")
-        .trim()
-        .split("\n\n")
-        .collect();
-
-    for principal in principals {
-        for ((request, resource), &expected_output) in requests.iter().zip(&resources).zip(&outputs)
-        {
-            let propfind = CalendarResource::parse_propfind(request).unwrap();
-
-            let response = resource
-                .propfind(
-                    &format!("/caldav/principal/{}/{}", principal.id, resource.cal.id),
-                    &propfind.prop,
-                    propfind.include.as_ref(),
-                    &CalDavPrincipalUri("/caldav"),
-                    &principal,
-                )
-                .unwrap();
-            let expected_output = expected_output.trim();
-            let output = response
-                .serialize_to_string()
-                .unwrap()
-                .trim()
-                .replace("\r\n", "\n");
-            println!("{output}");
-            println!("{}, {} \n\n\n", output.len(), expected_output.len());
-            assert_eq!(output, expected_output);
-        }
-    }
-}

crates/caldav/src/calendar_object/methods.rs

@@ -78,13 +78,12 @@ pub async fn put_event<C: CalendarStore>(
         true
     };
 
-    let object = match CalendarObject::from_ics(body) {
+    let object = match CalendarObject::from_ics(object_id, body) {
         Ok(obj) => obj,
         Err(_) => {
             return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
         }
     };
-    assert_eq!(object.get_id(), object_id);
     cal_store
         .put_object(principal, calendar_id, object, overwrite)
         .await?;

crates/caldav/src/principal/mod.rs

@@ -41,6 +41,11 @@ impl Resource for PrincipalResource {
         Resourcetype(&[
             ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "collection"),
             ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "principal"),
+            // https://github.com/apple/ccs-calendarserver/blob/13c706b985fb728b9aab42dc0fef85aae21921c3/doc/Extensions/caldav-proxy.txt
+            // ResourcetypeInner(
+            //     Some(rustical_dav::namespace::NS_CALENDARSERVER),
+            //     "calendar-proxy-write",
+            // ),
         ])
     }
 
@@ -121,7 +126,7 @@ impl Resource for PrincipalResource {
     }
 
     fn get_user_privileges(&self, user: &Principal) -> Result<UserPrivilegeSet, Self::Error> {
-        Ok(UserPrivilegeSet::owner_only(
+        Ok(UserPrivilegeSet::owner_read(
             user.is_principal(&self.principal.id),
         ))
     }

crates/caldav/src/principal/prop.rs

@@ -16,13 +16,13 @@ pub enum PrincipalProp {
     CalendarUserAddressSet(HrefElement),
 
     // WebDAV Access Control (RFC 3744)
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "principal-URL")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"principal-URL")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
     AlternateUriSet,
     // #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     // PrincipalCollectionSet(HrefElement),

crates/caldav/src/principal/service.rs

@@ -46,7 +46,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
     type Principal = Principal;
     type PrincipalUri = CalDavPrincipalUri;
 
-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
+    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy";
 
     async fn get_resource(
         &self,

crates/caldav/src/principal/tests.rs

@@ -1,19 +1,14 @@
 use std::sync::Arc;
 
-use crate::{
-    CalDavPrincipalUri,
-    principal::{PrincipalResource, PrincipalResourceService},
-};
+use crate::principal::PrincipalResourceService;
 use rstest::rstest;
-use rustical_dav::resource::{Resource, ResourceService};
-use rustical_store::auth::{Principal, PrincipalType::Individual};
+use rustical_dav::resource::ResourceService;
 use rustical_store_sqlite::{
     SqliteStore,
     calendar_store::SqliteCalendarStore,
     principal_store::SqlitePrincipalStore,
     tests::{get_test_calendar_store, get_test_principal_store, get_test_subscription_store},
 };
-use rustical_xml::XmlSerializeRoot;
 
 #[rstest]
 #[tokio::test]
@@ -49,35 +44,4 @@ async fn test_principal_resource(
 }
 
 #[tokio::test]
-async fn test_propfind() {
-    let propfind = PrincipalResource::parse_propfind(
-        r#"<?xml version="1.0" encoding="UTF-8"?><propfind xmlns="DAV:"><allprop/></propfind>"#,
-    )
-    .unwrap();
-
-    let principal = Principal {
-        id: "user".to_string(),
-        displayname: None,
-        principal_type: Individual,
-        password: None,
-        memberships: vec!["group".to_string()],
-    };
-
-    let resource = PrincipalResource {
-        principal: principal.clone(),
-        members: vec![],
-        simplified_home_set: false,
-    };
-
-    let response = resource
-        .propfind(
-            &format!("/caldav/principal/{}", principal.id),
-            &propfind.prop,
-            propfind.include.as_ref(),
-            &CalDavPrincipalUri("/caldav"),
-            &principal,
-        )
-        .unwrap();
-
-    let _output = response.serialize_to_string().unwrap();
-}
+async fn test_propfind() {}

crates/carddav/src/addressbook/methods/import.rs

@@ -1,67 +0,0 @@
-use std::io::BufReader;
-
-use crate::Error;
-use crate::addressbook::AddressbookResourceService;
-use axum::{
-    extract::{Path, State},
-    response::{IntoResponse, Response},
-};
-use http::StatusCode;
-use ical::{
-    parser::{Component, ComponentMut, vcard},
-    property::Property,
-};
-use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::Principal};
-use tracing::instrument;
-
-#[instrument(skip(resource_service))]
-pub async fn route_import<AS: AddressbookStore, S: SubscriptionStore>(
-    Path((principal, addressbook_id)): Path<(String, String)>,
-    user: Principal,
-    State(resource_service): State<AddressbookResourceService<AS, S>>,
-    body: String,
-) -> Result<Response, Error> {
-    if !user.is_principal(&principal) {
-        return Err(Error::Unauthorized);
-    }
-
-    let parser = vcard::VcardParser::new(BufReader::new(body.as_bytes()));
-
-    let mut objects = vec![];
-    for res in parser {
-        let mut card = res.unwrap();
-        let uid = card.get_uid();
-        if uid.is_none() {
-            let mut card_mut = card.mutable();
-            card_mut.set_property(Property {
-                name: "UID".to_owned(),
-                value: Some(uuid::Uuid::new_v4().to_string()),
-                params: None,
-            });
-            card = card_mut.verify().unwrap();
-        }
-
-        objects.push(card.try_into().unwrap());
-    }
-
-    if objects.is_empty() {
-        return Ok((StatusCode::BAD_REQUEST, "empty addressbook data").into_response());
-    }
-
-    let addressbook = Addressbook {
-        principal,
-        id: addressbook_id,
-        displayname: None,
-        description: None,
-        deleted_at: None,
-        synctoken: 0,
-        push_topic: uuid::Uuid::new_v4().to_string(),
-    };
-
-    let addr_store = resource_service.addr_store;
-    addr_store
-        .import_addressbook(addressbook, objects, false)
-        .await?;
-
-    Ok(StatusCode::OK.into_response())
-}

crates/carddav/src/addressbook/methods/mkcol.rs

@@ -22,7 +22,7 @@ pub struct MkcolAddressbookProp {
     resourcetype: Option<Resourcetype>,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     displayname: Option<String>,
-    #[xml(rename = "addressbook-description")]
+    #[xml(rename = b"addressbook-description")]
     #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
     description: Option<String>,
 }
@@ -34,7 +34,7 @@ pub struct PropElement<T: XmlDeserialize> {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = "mkcol")]
+#[xml(root = b"mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]

crates/carddav/src/addressbook/methods/mod.rs

@@ -1,5 +1,5 @@
 pub mod get;
-pub mod import;
 pub mod mkcol;
 pub mod post;
+pub mod put;
 pub mod report;

crates/carddav/src/addressbook/methods/put.rs

@@ -0,0 +1,47 @@
+use crate::Error;
+use crate::addressbook::AddressbookResourceService;
+use axum::response::IntoResponse;
+use axum::{
+    extract::{Path, State},
+    response::Response,
+};
+use http::StatusCode;
+use ical::VcardParser;
+use rustical_ical::AddressObject;
+use rustical_store::Addressbook;
+use rustical_store::{AddressbookStore, SubscriptionStore, auth::Principal};
+use tracing::instrument;
+
+#[instrument(skip(addr_store))]
+pub async fn route_put<AS: AddressbookStore, S: SubscriptionStore>(
+    Path((principal, addressbook_id)): Path<(String, String)>,
+    State(AddressbookResourceService { addr_store, .. }): State<AddressbookResourceService<AS, S>>,
+    user: Principal,
+    body: String,
+) -> Result<Response, Error> {
+    if !user.is_principal(&principal) {
+        return Err(Error::Unauthorized);
+    }
+
+    let mut objects = vec![];
+    for object in VcardParser::new(body.as_bytes()) {
+        let object = object.map_err(rustical_ical::Error::from)?;
+        objects.push(AddressObject::try_from(object)?);
+    }
+
+    let addressbook = Addressbook {
+        id: addressbook_id.clone(),
+        principal: principal.clone(),
+        displayname: None,
+        description: None,
+        deleted_at: None,
+        synctoken: Default::default(),
+        push_topic: uuid::Uuid::new_v4().to_string(),
+    };
+
+    addr_store
+        .import_addressbook(principal.clone(), addressbook, objects)
+        .await?;
+
+    Ok(StatusCode::CREATED.into_response())
+}

crates/carddav/src/addressbook/service.rs

@@ -3,8 +3,8 @@ use super::methods::report::route_report_addressbook;
 use crate::address_object::AddressObjectResourceService;
 use crate::address_object::resource::AddressObjectResource;
 use crate::addressbook::methods::get::route_get;
-use crate::addressbook::methods::import::route_import;
 use crate::addressbook::methods::post::route_post;
+use crate::addressbook::methods::put::route_put;
 use crate::addressbook::resource::AddressbookResource;
 use crate::{CardDavPrincipalUri, Error};
 use async_trait::async_trait;
@@ -139,9 +139,9 @@ impl<AS: AddressbookStore, S: SubscriptionStore> AxumMethods for AddressbookReso
         })
     }
 
-    fn import() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
+    fn put() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
         Some(|state, req| {
-            let mut service = Handler::with_state(route_import::<AS, S>, state);
+            let mut service = Handler::with_state(route_put::<AS, S>, state);
             Box::pin(Service::call(&mut service, req))
         })
     }

crates/carddav/src/principal/prop.rs

@@ -8,14 +8,14 @@ use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
     // WebDAV Access Control (RFC 3744)
-    #[xml(rename = "principal-URL")]
+    #[xml(rename = b"principal-URL")]
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalUrl(HrefElement),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMembership(GroupMembership),
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
     AlternateUriSet,
     #[xml(ns = "rustical_dav::namespace::NS_DAV")]
     PrincipalCollectionSet(HrefElement),

crates/dav/src/privileges.rs

@@ -1,10 +1,9 @@
-use itertools::Itertools;
 use quick_xml::name::Namespace;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use std::collections::{HashMap, HashSet};
 
 // https://datatracker.ietf.org/doc/html/rfc3744
-#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, Eq, Hash, PartialEq, PartialOrd, Ord)]
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, Eq, Hash, PartialEq)]
 pub enum UserPrivilege {
     Read,
     Write,
@@ -20,18 +19,18 @@ impl XmlSerialize for UserPrivilegeSet {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &str>,
+        tag: Option<&[u8]>,
+        namespaces: &HashMap<Namespace, &[u8]>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         #[derive(XmlSerialize)]
         pub struct FakeUserPrivilegeSet {
-            #[xml(rename = "privilege", flatten)]
+            #[xml(rename = b"privilege", flatten)]
             privileges: Vec<UserPrivilege>,
         }
 
         FakeUserPrivilegeSet {
-            privileges: self.privileges.iter().cloned().sorted().collect(),
+            privileges: self.privileges.iter().cloned().collect(),
         }
         .serialize(ns, tag, namespaces, writer)
     }

crates/dav/src/resource/axum_methods.rs

@@ -38,11 +38,6 @@ pub trait AxumMethods: Sized + Send + Sync + 'static {
         None
     }
 
-    #[inline]
-    fn import() -> Option<MethodFunction<Self>> {
-        None
-    }
-
     #[inline]
     fn allow_header() -> Allow {
         let mut allow = vec![
@@ -72,9 +67,6 @@ pub trait AxumMethods: Sized + Send + Sync + 'static {
         if Self::put().is_some() {
             allow.push(Method::PUT);
         }
-        if Self::import().is_some() {
-            allow.push(Method::from_str("IMPORT").unwrap());
-        }
 
         allow.into_iter().collect()
     }

crates/dav/src/resource/axum_service.rs

@@ -97,11 +97,6 @@ where
                     return svc(self.resource_service.clone(), req);
                 }
             }
-            "IMPORT" => {
-                if let Some(svc) = RS::import() {
-                    return svc(self.resource_service.clone(), req);
-                }
-            }
             _ => {}
         };
         Box::pin(async move {

crates/dav/src/resource/methods/delete.rs

@@ -60,12 +60,12 @@ pub async fn route_delete<R: ResourceService>(
             return Err(crate::Error::PreconditionFailed.into());
         }
     }
-    if let Some(if_none_match) = if_none_match
-        && resource.satisfies_if_none_match(&if_none_match)
-    {
+    if let Some(if_none_match) = if_none_match {
+        if resource.satisfies_if_none_match(&if_none_match) {
             // Precondition failed
             return Err(crate::Error::PreconditionFailed.into());
         }
+    }
     resource_service
         .delete_resource(path_components, !no_trash)
         .await?;

crates/dav/src/resource/methods/propfind.rs

@@ -6,7 +6,11 @@ use crate::resource::Resource;
 use crate::resource::ResourceName;
 use crate::resource::ResourceService;
 use crate::xml::MultistatusElement;
+use crate::xml::PropfindElement;
+use crate::xml::PropfindType;
 use axum::extract::{Extension, OriginalUri, Path, State};
+use rustical_xml::PropName;
+use rustical_xml::XmlDocument;
 use tracing::instrument;
 
 type RSMultistatus<R> = MultistatusElement<
@@ -54,8 +58,24 @@ pub(crate) async fn route_propfind<R: ResourceService>(
     }
 
     // A request body is optional. If empty we MUST return all props
-    let propfind_self = R::Resource::parse_propfind(body).map_err(Error::XmlError)?;
-    let propfind_member = R::MemberType::parse_propfind(body).map_err(Error::XmlError)?;
+    let propfind_self: PropfindElement<<<R::Resource as Resource>::Prop as PropName>::Names> =
+        if !body.is_empty() {
+            PropfindElement::parse_str(body).map_err(Error::XmlError)?
+        } else {
+            PropfindElement {
+                prop: PropfindType::Allprop,
+                include: None,
+            }
+        };
+    let propfind_member: PropfindElement<<<R::MemberType as Resource>::Prop as PropName>::Names> =
+        if !body.is_empty() {
+            PropfindElement::parse_str(body).map_err(Error::XmlError)?
+        } else {
+            PropfindElement {
+                prop: PropfindType::Allprop,
+                include: None,
+            }
+        };
 
     let mut member_responses = Vec::new();
     if depth != &Depth::Zero {

crates/dav/src/resource/methods/proppatch.rs

@@ -26,21 +26,21 @@ enum SetPropertyPropWrapper<T: XmlDeserialize> {
 // We are <prop>
 #[derive(XmlDeserialize, Clone, Debug)]
 struct SetPropertyPropWrapperWrapper<T: XmlDeserialize>(
-    #[xml(ty = "untagged", flatten)] Vec<SetPropertyPropWrapper<T>>,
+    #[xml(ty = "untagged")] SetPropertyPropWrapper<T>,
 );
 
 // We are <set>
 #[derive(XmlDeserialize, Clone, Debug)]
 struct SetPropertyElement<T: XmlDeserialize> {
     #[xml(ns = "crate::namespace::NS_DAV")]
-    prop: SetPropertyPropWrapperWrapper<T>,
+    prop: T,
 }
 
 #[derive(XmlDeserialize, Clone, Debug)]
 struct TagName(#[xml(ty = "tag_name")] String);
 
 #[derive(XmlDeserialize, Clone, Debug)]
-struct PropertyElement(#[xml(ty = "untagged", flatten)] Vec<TagName>);
+struct PropertyElement(#[xml(ty = "untagged")] TagName);
 
 #[derive(XmlDeserialize, Clone, Debug)]
 struct RemovePropertyElement {
@@ -57,7 +57,7 @@ enum Operation<T: XmlDeserialize> {
 }
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = "propertyupdate")]
+#[xml(root = b"propertyupdate")]
 #[xml(ns = "crate::namespace::NS_DAV")]
 struct PropertyupdateElement<T: XmlDeserialize>(#[xml(ty = "untagged", flatten)] Vec<Operation<T>>);
 
@@ -81,8 +81,9 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
     let href = path.to_owned();
 
     // Extract operations
-    let PropertyupdateElement::<<R::Resource as Resource>::Prop>(operations) =
-        XmlDocument::parse_str(body).map_err(Error::XmlError)?;
+    let PropertyupdateElement::<SetPropertyPropWrapperWrapper<<R::Resource as Resource>::Prop>>(
+        operations,
+    ) = XmlDocument::parse_str(body).map_err(Error::XmlError)?;
 
     let mut resource = resource_service
         .get_resource(path_components, false)
@@ -99,17 +100,17 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
     for operation in operations.into_iter() {
         match operation {
             Operation::Set(SetPropertyElement {
-                prop: SetPropertyPropWrapperWrapper(properties),
+                prop: SetPropertyPropWrapperWrapper(property),
             }) => {
-                for property in properties {
                 match property {
                     SetPropertyPropWrapper::Valid(prop) => {
                         let propname: <<R::Resource as Resource>::Prop as PropName>::Names =
                             prop.clone().into();
                         let (ns, propname): (Option<Namespace>, &str) = propname.into();
                         match resource.set_prop(prop) {
-                                Ok(()) => props_ok
-                                    .push((ns.map(NamespaceOwned::from), propname.to_owned())),
+                            Ok(()) => {
+                                props_ok.push((ns.map(NamespaceOwned::from), propname.to_owned()))
+                            }
                             Err(Error::PropReadOnly) => props_conflict
                                 .push((ns.map(NamespaceOwned::from), propname.to_owned())),
                             Err(err) => return Err(err.into()),
@@ -138,12 +139,9 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
                     }
                 }
             }
-            }
             Operation::Remove(remove_el) => {
-                for tagname in remove_el.prop.0 {
-                    let propname = tagname.0;
-                    match <<R::Resource as Resource>::Prop as PropName>::Names::from_str(&propname)
-                    {
+                let propname = remove_el.prop.0.0;
+                match <<R::Resource as Resource>::Prop as PropName>::Names::from_str(&propname) {
                     Ok(prop) => match resource.remove_prop(&prop) {
                         Ok(()) => props_ok.push((None, propname)),
                         Err(Error::PropReadOnly) => props_conflict.push({
@@ -158,7 +156,6 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
             }
         }
     }
-    }
 
     if props_not_found.is_empty() && props_conflict.is_empty() {
         // Only save if no errors occured

crates/dav/src/resource/mod.rs

@@ -1,16 +1,15 @@
 use crate::Principal;
 use crate::privileges::UserPrivilegeSet;
 use crate::xml::multistatus::{PropTagWrapper, PropstatElement, PropstatWrapper};
-use crate::xml::{PropElement, PropfindElement, PropfindType, Resourcetype};
+use crate::xml::{PropElement, PropfindType, Resourcetype};
 use crate::xml::{TagList, multistatus::ResponseElement};
 use headers::{ETag, IfMatch, IfNoneMatch};
 use http::StatusCode;
 use itertools::Itertools;
 use quick_xml::name::Namespace;
 pub use resource_service::ResourceService;
-use rustical_xml::{
-    EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlDocument, XmlSerialize,
-};
+use rustical_xml::{EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlSerialize};
+use std::collections::HashSet;
 use std::str::FromStr;
 
 mod axum_methods;
@@ -103,19 +102,6 @@ pub trait Resource: Clone + Send + 'static {
         principal: &Self::Principal,
     ) -> Result<UserPrivilegeSet, Self::Error>;
 
-    fn parse_propfind(
-        body: &str,
-    ) -> Result<PropfindElement<<Self::Prop as PropName>::Names>, rustical_xml::XmlError> {
-        if !body.is_empty() {
-            PropfindElement::parse_str(body)
-        } else {
-            Ok(PropfindElement {
-                prop: PropfindType::Allprop,
-                include: None,
-            })
-        }
-    }
-
     fn propfind(
         &self,
         path: &str,
@@ -130,7 +116,7 @@ pub trait Resource: Clone + Send + 'static {
             path.push('/');
         }
 
-        let (mut props, mut invalid_props): (Vec<<Self::Prop as PropName>::Names>, Vec<_>) =
+        let (mut props, mut invalid_props): (HashSet<<Self::Prop as PropName>::Names>, Vec<_>) =
             match prop {
                 PropfindType::Propname => {
                     let props = Self::list_props()
@@ -155,7 +141,7 @@ pub trait Resource: Clone + Send + 'static {
                     vec![],
                 ),
                 PropfindType::Prop(PropElement(valid_tags, invalid_tags)) => (
-                    valid_tags.iter().unique().cloned().collect(),
+                    valid_tags.iter().cloned().collect(),
                     invalid_tags.to_owned(),
                 ),
             };

crates/dav/src/xml/error.rs

@@ -1,12 +1,12 @@
 use rustical_xml::{XmlRootTag, XmlSerialize};
 
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(ns = "crate::namespace::NS_DAV", root = "error")]
+#[xml(ns = "crate::namespace::NS_DAV", root = b"error")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = "PUSH"
+    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_DAVPUSH = b"PUSH"
 ))]
 pub struct ErrorElement<'t, T: XmlSerialize>(#[xml(ty = "untagged")] pub &'t T);

crates/dav/src/xml/multistatus.rs

@@ -22,8 +22,8 @@ pub struct PropstatElement<PropType: XmlSerialize> {
 fn xml_serialize_status(
     status: &StatusCode,
     ns: Option<Namespace>,
-    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &str>,
+    tag: Option<&[u8]>,
+    namespaces: &HashMap<Namespace, &[u8]>,
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(&format!("HTTP/1.1 {}", status), ns, tag, namespaces, writer)
@@ -39,15 +39,8 @@ pub enum PropstatWrapper<T: XmlSerialize> {
 // RFC 2518
 // <!ELEMENT response (href, ((href*, status)|(propstat+)),
 // responsedescription?) >
-#[derive(XmlSerialize, XmlRootTag)]
-#[xml(ns = "crate::namespace::NS_DAV", root = "response")]
-#[xml(ns_prefix(
-    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = "PUSH"
-))]
+#[derive(XmlSerialize)]
+#[xml(ns = "crate::namespace::NS_DAV")]
 pub struct ResponseElement<PropstatType: XmlSerialize> {
     pub href: String,
     #[xml(serialize_with = "xml_serialize_optional_status")]
@@ -59,8 +52,8 @@ pub struct ResponseElement<PropstatType: XmlSerialize> {
 fn xml_serialize_optional_status(
     val: &Option<StatusCode>,
     ns: Option<Namespace>,
-    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &str>,
+    tag: Option<&[u8]>,
+    namespaces: &HashMap<Namespace, &[u8]>,
     writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
     XmlSerialize::serialize(
@@ -86,18 +79,18 @@ impl<PT: XmlSerialize> Default for ResponseElement<PT> {
 // <!ELEMENT multistatus (response+, responsedescription?) >
 // Extended by sync-token as specified in RFC 6578
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(root = "multistatus", ns = "crate::namespace::NS_DAV")]
+#[xml(root = b"multistatus", ns = "crate::namespace::NS_DAV")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = "PUSH"
+    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_DAVPUSH = b"PUSH"
 ))]
 pub struct MultistatusElement<PropType: XmlSerialize, MemberPropType: XmlSerialize> {
-    #[xml(rename = "response", flatten)]
+    #[xml(rename = b"response", flatten)]
     pub responses: Vec<ResponseElement<PropType>>,
-    #[xml(rename = "response", flatten)]
+    #[xml(rename = b"response", flatten)]
     pub member_responses: Vec<ResponseElement<MemberPropType>>,
     pub sync_token: Option<String>,
 }

crates/dav/src/xml/propfind.rs

@@ -7,7 +7,7 @@ use rustical_xml::XmlError;
 use rustical_xml::XmlRootTag;
 
 #[derive(Debug, Clone, XmlDeserialize, XmlRootTag, PartialEq)]
-#[xml(root = "propfind", ns = "crate::namespace::NS_DAV")]
+#[xml(root = b"propfind", ns = "crate::namespace::NS_DAV")]
 pub struct PropfindElement<PN: XmlDeserialize> {
     #[xml(ty = "untagged")]
     pub prop: PropfindType<PN>,
@@ -66,9 +66,6 @@ impl<PN: XmlDeserialize> XmlDeserialize for PropElement<PN> {
                 Event::Text(_) | Event::CData(_) => {
                     return Err(XmlError::UnsupportedEvent("Not expecting text here"));
                 }
-                Event::GeneralRef(_) => {
-                    return Err(::rustical_xml::XmlError::UnsupportedEvent("GeneralRef"));
-                }
                 Event::Decl(_) | Event::Comment(_) | Event::DocType(_) | Event::PI(_) => { /* ignore */
                 }
                 Event::End(_end) => {

crates/dav/src/xml/resourcetype.rs

@@ -16,7 +16,7 @@ mod tests {
     use super::{Resourcetype, ResourcetypeInner};
 
     #[derive(XmlSerialize, XmlRootTag)]
-    #[xml(root = "document")]
+    #[xml(root = b"document")]
     struct Document {
         resourcetype: Resourcetype,
     }

crates/dav/src/xml/sync_collection.rs

@@ -60,7 +60,7 @@ pub struct NresultsElement(#[xml(ty = "text")] u64);
 // <!ELEMENT sync-collection (sync-token, sync-level, limit?, prop)>
 //    <!-- DAV:limit defined in RFC 5323, Section 5.17 -->
 //    <!-- DAV:prop defined in RFC 4918, Section 14.18 -->
-#[xml(ns = "crate::namespace::NS_DAV", root = "sync-collection")]
+#[xml(ns = "crate::namespace::NS_DAV", root = b"sync-collection")]
 pub struct SyncCollectionRequest<PN: XmlDeserialize> {
     #[xml(ns = "crate::namespace::NS_DAV")]
     pub sync_token: String,

crates/dav/src/xml/tag_list.rs

@@ -13,8 +13,8 @@ impl XmlSerialize for TagList {
     fn serialize(
         &self,
         ns: Option<Namespace>,
-        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &str>,
+        tag: Option<&[u8]>,
+        namespaces: &HashMap<Namespace, &[u8]>,
         writer: &mut quick_xml::Writer<&mut Vec<u8>>,
     ) -> std::io::Result<()> {
         let prefix = ns
@@ -22,19 +22,24 @@ impl XmlSerialize for TagList {
             .unwrap_or(None)
             .map(|prefix| {
                 if !prefix.is_empty() {
-                    format!("{prefix}:")
+                    [*prefix, b":"].concat()
                 } else {
-                    String::new()
+                    Vec::new()
                 }
             });
         let has_prefix = prefix.is_some();
         let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
+        let qname = tagname
+            .as_ref()
+            .map(|tagname| ::quick_xml::name::QName(tagname));
 
-        if let Some(tagname) = tagname.as_ref() {
-            let mut bytes_start = BytesStart::new(tagname);
-            if !has_prefix && let Some(ns) = &ns {
+        if let Some(qname) = &qname {
+            let mut bytes_start = BytesStart::from(qname.to_owned());
+            if !has_prefix {
+                if let Some(ns) = &ns {
                     bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
                 }
+            }
             writer.write_event(Event::Start(bytes_start))?;
         }
 
@@ -46,8 +51,8 @@ impl XmlSerialize for TagList {
             el.write_empty()?;
         }
 
-        if let Some(tagname) = tagname.as_ref() {
-            writer.write_event(Event::End(BytesEnd::new(tagname)))?;
+        if let Some(qname) = &qname {
+            writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
         }
         Ok(())
     }

crates/dav_push/Cargo.toml

@@ -24,6 +24,7 @@ rustical_dav.workspace = true
 rustical_store.workspace = true
 http.workspace = true
 base64.workspace = true
+rand.workspace = true
 ece.workspace = true
 axum.workspace = true
 openssl.workspace = true

crates/dav_push/src/lib.rs

@@ -25,10 +25,10 @@ pub struct ContentUpdate {
 }
 
 #[derive(XmlSerialize, XmlRootTag, Debug)]
-#[xml(root = "push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
+#[xml(root = b"push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
 #[xml(ns_prefix(
-    rustical_dav::namespace::NS_DAVPUSH = "",
-    rustical_dav::namespace::NS_DAV = "D",
+    rustical_dav::namespace::NS_DAVPUSH = b"",
+    rustical_dav::namespace::NS_DAV = b"D",
 ))]
 struct PushMessage {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
@@ -183,7 +183,6 @@ impl<S: SubscriptionStore> DavPushController<S> {
             header::CONTENT_TYPE,
             HeaderValue::from_static("application/octet-stream"),
         );
-        hdrs.insert("TTL", HeaderValue::from(60));
         client.execute(request).await?;
 
         Ok(())

crates/dav_push/src/prop.rs

@@ -35,12 +35,12 @@ pub enum Trigger {
 
 #[derive(XmlSerialize, XmlDeserialize, PartialEq, Clone, Debug)]
 pub struct ContentUpdate(
-    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );
 
 #[derive(XmlSerialize, PartialEq, Clone, Debug)]
 pub struct PropertyUpdate(
-    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );
 
 impl XmlDeserialize for PropertyUpdate {
@@ -51,8 +51,8 @@ impl XmlDeserialize for PropertyUpdate {
     ) -> Result<Self, rustical_xml::XmlError> {
         #[derive(XmlDeserialize, PartialEq, Clone, Debug)]
         struct FakePropertyUpdate(
-            #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
-            #[xml(rename = "prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
+            #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+            #[xml(rename = b"prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
         );
         let FakePropertyUpdate(depth, _) = FakePropertyUpdate::deserialize(reader, start, empty)?;
         Ok(Self(depth))

crates/dav_push/src/register.rs

@@ -17,7 +17,7 @@ pub struct WebPushSubscription {
 
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct SubscriptionPublicKey {
-    #[xml(ty = "attr", rename = "type")]
+    #[xml(ty = "attr", rename = b"type")]
     pub ty: String,
     #[xml(ty = "text")]
     pub key: String,
@@ -33,7 +33,7 @@ pub struct SubscriptionElement {
 pub struct TriggerElement(#[xml(ty = "untagged", flatten)] Vec<Trigger>);
 
 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = "push-register")]
+#[xml(root = b"push-register")]
 #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
 pub struct PushRegister {
     #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]

crates/frontend/js-components/lib/create-addressbook-form.ts

@@ -1,6 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { Ref, createRef, ref } from 'lit/directives/ref.js';
+import { createClient } from "webdav";
 import { escapeXml } from ".";
 
 @customElement("create-addressbook-form")
@@ -14,12 +15,14 @@ export class CreateAddressbookForm extends LitElement {
     return this
   }
 
+  client = createClient("/carddav")
+
   @property()
   user: string = ''
   @property()
   principal: string = ''
   @property()
-  addr_id: string = self.crypto.randomUUID()
+  addr_id: string = ''
   @property()
   displayname: string = ''
   @property()
@@ -46,7 +49,7 @@ export class CreateAddressbookForm extends LitElement {
           <br>
           <label>
             id
-            <input type="text" name="id" value=${this.addr_id} @change=${e => this.addr_id = e.target.value} />
+            <input type="text" name="id" @change=${e => this.addr_id = e.target.value} />
           </label>
           <br>
           <label>
@@ -77,12 +80,8 @@ export class CreateAddressbookForm extends LitElement {
       alert("Empty displayname")
       return
     }
-    let response = await fetch(`/carddav/principal/${this.principal || this.user}/${this.addr_id}`, {
-      method: 'MKCOL',
-      headers: {
-        'Content-Type': 'application/xml'
-      },
-      body: `
+    await this.client.createDirectory(`/principal/${this.principal || this.user}/${this.addr_id}`, {
+      data: `
       <mkcol xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
         <set>
           <prop>
@@ -92,14 +91,7 @@ export class CreateAddressbookForm extends LitElement {
         </set>
       </mkcol>
       `
-
     })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
-
     window.location.reload()
     return null
   }

crates/frontend/js-components/lib/create-calendar-form.ts

@@ -1,6 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { Ref, createRef, ref } from 'lit/directives/ref.js';
+import { createClient } from "webdav";
 import { escapeXml } from ".";
 
 @customElement("create-calendar-form")
@@ -13,19 +14,19 @@ export class CreateCalendarForm extends LitElement {
     return this
   }
 
+  client = createClient("/caldav")
+
   @property()
   user: string = ''
   @property()
   principal: string = ''
   @property()
-  cal_id: string = self.crypto.randomUUID()
+  cal_id: string = ''
   @property()
   displayname: string = ''
   @property()
   description: string = ''
   @property()
-  timezone_id: string = ''
-  @property()
   color: string = ''
   @property()
   isSubscription: boolean = false
@@ -37,6 +38,7 @@ export class CreateCalendarForm extends LitElement {
   dialog: Ref<HTMLDialogElement> = createRef()
   form: Ref<HTMLFormElement> = createRef()
 
+
   override render() {
     return html`
       <button @click=${() => this.dialog.value.showModal()}>Create calendar</button>
@@ -55,7 +57,7 @@ export class CreateCalendarForm extends LitElement {
           <br>
           <label>
             id
-            <input type="text" name="id" value=${this.cal_id} @change=${e => this.cal_id = e.target.value} />
+            <input type="text" name="id" @change=${e => this.cal_id = e.target.value} />
           </label>
           <br>
           <label>
@@ -63,11 +65,6 @@ export class CreateCalendarForm extends LitElement {
             <input type="text" name="displayname" value=${this.displayname} @change=${e => this.displayname = e.target.value} />
           </label>
           <br>
-          <label>
-            Timezone (optional)
-            <input type="text" name="timezone" .value=${this.timezone_id} @change=${e => this.timezone_id = e.target.value} />
-          </label>
-          <br>
           <label>
             Description
             <input type="text" name="description" @change=${e => this.description = e.target.value} />
@@ -122,18 +119,12 @@ export class CreateCalendarForm extends LitElement {
       alert("No calendar components selected")
       return
     }
-
-    let response = await fetch(`/caldav/principal/${this.principal || this.user}/${this.cal_id}`, {
-      method: 'MKCOL',
-      headers: {
-        'Content-Type': 'application/xml'
-      },
-      body: `
+    await this.client.createDirectory(`/principal/${this.principal || this.user}/${this.cal_id}`, {
+      data: `
       <mkcol xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
         <set>
           <prop>
             <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ''}
             ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ''}
             ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ''}
             ${(this.isSubscription && this.subscriptionUrl) ? `<CS:source><href>${escapeXml(this.subscriptionUrl)}</href></CS:source>` : ''}
@@ -145,11 +136,6 @@ export class CreateCalendarForm extends LitElement {
       </mkcol>
       `
     })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
     window.location.reload()
     return null
   }

crates/frontend/js-components/lib/delete-button.ts

@@ -17,7 +17,7 @@ export class DeleteButton extends LitElement {
   }
 
   protected render() {
-    let text = this.trash ? 'Trash' : 'Delete'
+    let text = this.trash ? 'Move to trash' : 'Delete'
     return html`<button class="delete" @click=${e => this._onClick(e)}>${text}</button>`
   }
 

crates/frontend/js-components/lib/edit-addressbook-form.ts

@@ -1,103 +0,0 @@
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators.js";
-import { Ref, createRef, ref } from 'lit/directives/ref.js';
-import { escapeXml } from ".";
-
-@customElement("edit-addressbook-form")
-export class EditAddressbookForm extends LitElement {
-  constructor() {
-    super()
-
-  }
-
-  protected override createRenderRoot() {
-    return this
-  }
-
-  @property()
-  principal: string = ''
-  @property()
-  addr_id: string = ''
-  @property()
-  displayname: string = ''
-  @property()
-  description: string = ''
-
-  dialog: Ref<HTMLDialogElement> = createRef()
-  form: Ref<HTMLFormElement> = createRef()
-
-  override render() {
-    return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
-      <dialog ${ref(this.dialog)}>
-        <h3>Edit addressbook</h3>
-        <form @submit=${this.submit} ${ref(this.form)}>
-          <label>
-            Displayname
-            <input type="text" name="displayname" .value=${this.displayname} @change=${e => this.displayname = e.target.value} />
-          </label>
-          <br>
-          <label>
-            Description
-            <input type="text" name="description" .value=${this.description} @change=${e => this.description = e.target.value} />
-          </label>
-          <br>
-          <button type="submit">Submit</button>
-          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
-        </form>
-      </dialog>
-    `
-  }
-
-  async submit(e: SubmitEvent) {
-    e.preventDefault()
-    if (!this.principal) {
-      alert("Empty principal")
-      return
-    }
-    if (!this.addr_id) {
-      alert("Empty id")
-      return
-    }
-    if (!this.displayname) {
-      alert("Empty displayname")
-      return
-    }
-    let response = await fetch(`/carddav/principal/${this.principal}/${this.addr_id}`, {
-      method: 'PROPPATCH',
-      headers: {
-        'Content-Type': 'application/xml'
-      },
-      body: `
-      <propertyupdate xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
-        <set>
-          <prop>
-            <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.description ? `<CARD:addressbook-description>${escapeXml(this.description)}</CARD:addressbook-description>` : ''}
-          </prop>
-        </set>
-        <remove>
-          <prop>
-            ${!this.description ? '<CARD:calendar-description />' : ''}
-          </prop>
-        </remove>
-      </propertyupdate>
-      `
-
-    })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
-
-    window.location.reload()
-    return null
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    'edit-addressbook-form': EditAddressbookForm
-  }
-}

crates/frontend/js-components/lib/edit-calendar-form.ts

@@ -1,143 +0,0 @@
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators.js";
-import { Ref, createRef, ref } from 'lit/directives/ref.js';
-import { escapeXml } from ".";
-
-@customElement("edit-calendar-form")
-export class EditCalendarForm extends LitElement {
-  constructor() {
-    super()
-  }
-
-  protected override createRenderRoot() {
-    return this
-  }
-
-  @property()
-  principal: string
-  @property()
-  cal_id: string
-
-  @property()
-  displayname: string = ''
-  @property()
-  description: string = ''
-  @property()
-  timezone_id: string = ''
-  @property()
-  color: string = ''
-  @property({
-    converter: {
-      fromAttribute: (value, _type) => new Set(value ? JSON.parse(value) : []),
-      toAttribute: (value, _type) => JSON.stringify(value)
-    }
-  })
-  components: Set<"VEVENT" | "VTODO" | "VJOURNAL"> = new Set()
-
-  dialog: Ref<HTMLDialogElement> = createRef()
-  form: Ref<HTMLFormElement> = createRef()
-
-
-  override render() {
-    return html`
-      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
-      <dialog ${ref(this.dialog)}>
-        <h3>Edit calendar</h3>
-        <form @submit=${this.submit} ${ref(this.form)}>
-          <label>
-            Displayname
-            <input type="text" name="displayname" .value=${this.displayname} @change=${e => this.displayname = e.target.value} />
-          </label>
-          <br>
-          <label>
-            Timezone (optional)
-            <input type="text" name="timezone" .value=${this.timezone_id} @change=${e => this.timezone_id = e.target.value} />
-          </label>
-          <br>
-          <label>
-            Description
-            <input type="text" name="description" .value=${this.description} @change=${e => this.description = e.target.value} />
-          </label>
-          <br>
-          <label>
-            Color
-            <input type="color" name="color" .value=${this.color} @change=${e => this.color = e.target.value} />
-          </label>
-          <br>
-          ${["VEVENT", "VTODO", "VJOURNAL"].map(comp => html`
-            <label>
-              Support ${comp}
-              <input type="checkbox" value=${comp} ?checked=${this.components.has(comp)} @change=${e => e.target.checked ? this.components.add(e.target.value) : this.components.delete(e.target.value)} />
-            </label>
-            <br>
-          `)}
-          <br>
-          <button type="submit">Submit</button>
-          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
-      </form>
-      </dialog>
-        `
-  }
-
-  async submit(e: SubmitEvent) {
-    e.preventDefault()
-    if (!this.principal) {
-      alert("Empty principal")
-      return
-    }
-    if (!this.cal_id) {
-      alert("Empty id")
-      return
-    }
-    if (!this.displayname) {
-      alert("Empty displayname")
-      return
-    }
-    if (!this.components.size) {
-      alert("No calendar components selected")
-      return
-    }
-    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
-      method: 'PROPPATCH',
-      headers: {
-        'Content-Type': 'application/xml'
-      },
-      body: `
-      <propertyupdate xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
-        <set>
-          <prop>
-            <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ''}
-            ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ''}
-            ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ''}
-            <CAL:supported-calendar-component-set>
-              ${Array.from(this.components.keys()).map(comp => `<CAL:comp name="${escapeXml(comp)}" />`).join('\n')}
-            </CAL:supported-calendar-component-set>
-          </prop>
-        </set>
-        <remove>
-          <prop>
-            ${!this.timezone_id ? `<CAL:calendar-timezone-id />` : ''}
-            ${!this.description ? '<CAL:calendar-description />' : ''}
-            ${!this.color ? '<ICAL:calendar-color />' : ''}
-          </prop>
-        </remove>
-      </propertyupdate>
-      `
-    })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
-
-    window.location.reload()
-    return null
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    'edit-calendar-form': EditCalendarForm
-  }
-}

crates/frontend/js-components/lib/import-addressbook-form.ts

@@ -1,92 +0,0 @@
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators.js";
-import { Ref, createRef, ref } from 'lit/directives/ref.js';
-
-@customElement("import-addressbook-form")
-export class ImportAddressbookForm extends LitElement {
-  constructor() {
-    super()
-  }
-
-  protected override createRenderRoot() {
-    return this
-  }
-
-  @property()
-  user: string = ''
-  @property()
-  principal: string
-  @property()
-  addressbook_id: string = self.crypto.randomUUID()
-
-  dialog: Ref<HTMLDialogElement> = createRef()
-  form: Ref<HTMLFormElement> = createRef()
-  file: File;
-
-
-  override render() {
-    return html`
-      <button @click=${() => this.dialog.value.showModal()}>Import addressbook</button>
-      <dialog ${ref(this.dialog)}>
-        <h3>Import addressbook</h3>
-        <form @submit=${this.submit} ${ref(this.form)}>
-          <label>
-            principal (for group addressbook)
-            <select name="principal" value=${this.user} @change=${e => this.principal = e.target.value}>
-              <option value=${this.user}>${this.user}</option>
-              ${window.rusticalUser.memberships.map(membership => html`
-                <option value=${membership}>${membership}</option>
-              `)}
-            </select>
-          </label>
-          <br>
-          <label>
-            id
-            <input type="text" name="id" value=${this.addressbook_id} @change=${e => this.addressbook_id = e.target.value} />
-          </label>
-          <br>
-          <label>
-            file
-            <input type="file" accept="text/vcard" name="file" @change=${e => this.file = e.target.files[0]} />
-          </label>
-          <button type="submit">Import</button>
-          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
-      </form>
-      </dialog>
-        `
-  }
-
-  async submit(e: SubmitEvent) {
-    e.preventDefault()
-    this.principal ||= this.user
-    if (!this.principal) {
-      alert("Empty principal")
-      return
-    }
-    if (!this.addressbook_id) {
-      alert("Empty id")
-      return
-    }
-    let response = await fetch(`/carddav/principal/${this.principal}/${this.addressbook_id}`, {
-      method: 'IMPORT',
-      headers: {
-        'Content-Type': 'text/vcard'
-      },
-      body: this.file,
-    })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
-
-    window.location.reload()
-    return null
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    'import-addressbook-form': ImportAddressbookForm
-  }
-}

crates/frontend/js-components/lib/import-calendar-form.ts

@@ -1,92 +0,0 @@
-import { html, LitElement } from "lit";
-import { customElement, property } from "lit/decorators.js";
-import { Ref, createRef, ref } from 'lit/directives/ref.js';
-
-@customElement("import-calendar-form")
-export class ImportCalendarForm extends LitElement {
-  constructor() {
-    super()
-  }
-
-  protected override createRenderRoot() {
-    return this
-  }
-
-  @property()
-  user: string = ''
-  @property()
-  principal: string
-  @property()
-  cal_id: string = self.crypto.randomUUID()
-
-  dialog: Ref<HTMLDialogElement> = createRef()
-  form: Ref<HTMLFormElement> = createRef()
-  file: File;
-
-
-  override render() {
-    return html`
-      <button @click=${() => this.dialog.value.showModal()}>Import calendar</button>
-      <dialog ${ref(this.dialog)}>
-        <h3>Import calendar</h3>
-        <form @submit=${this.submit} ${ref(this.form)}>
-          <label>
-            principal (for group calendars)
-            <select name="principal" value=${this.user} @change=${e => this.principal = e.target.value}>
-              <option value=${this.user}>${this.user}</option>
-              ${window.rusticalUser.memberships.map(membership => html`
-                <option value=${membership}>${membership}</option>
-              `)}
-            </select>
-          </label>
-          <br>
-          <label>
-            id
-            <input type="text" name="id" value=${this.cal_id} @change=${e => this.cal_id = e.target.value} />
-          </label>
-          <br>
-          <label>
-            file
-            <input type="file" accept="text/calendar" name="file" @change=${e => this.file = e.target.files[0]} />
-          </label>
-          <button type="submit">Import</button>
-          <button type="submit" @click=${event => { event.preventDefault(); this.dialog.value.close(); this.form.value.reset() }} class="cancel">Cancel</button>
-      </form>
-      </dialog>
-        `
-  }
-
-  async submit(e: SubmitEvent) {
-    e.preventDefault()
-    this.principal ||= this.user
-    if (!this.principal) {
-      alert("Empty principal")
-      return
-    }
-    if (!this.cal_id) {
-      alert("Empty id")
-      return
-    }
-    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
-      method: 'IMPORT',
-      headers: {
-        'Content-Type': 'text/calendar'
-      },
-      body: this.file,
-    })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
-
-    window.location.reload()
-    return null
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    'import-calendar-form': ImportCalendarForm
-  }
-}

crates/frontend/js-components/vite.config.ts

@@ -15,11 +15,7 @@ export default defineConfig({
     rollupOptions: {
       input: [
         "lib/create-calendar-form.ts",
-        "lib/edit-calendar-form.ts",
-        "lib/import-calendar-form.ts",
         "lib/create-addressbook-form.ts",
-        "lib/edit-addressbook-form.ts",
-        "lib/import-addressbook-form.ts",
         "lib/delete-button.ts",
       ],
       output: {
@@ -27,7 +23,7 @@ export default defineConfig({
         format: "es",
         manualChunks: {
           lit: ["lit"],
-          // webdav: ["webdav"],
+          webdav: ["webdav"],
         }
       }
     },

crates/frontend/public/assets/js/create-addressbook-form.mjs

@@ -1,7 +1,7 @@
 import { i, x } from "./lit-z6_uA4GX.mjs";
 import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
-import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
+import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { a as an } from "./webdav-D0R7xCzX.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -15,9 +15,10 @@ var __decorateClass = (decorators, target, key, kind) => {
 let CreateAddressbookForm = class extends i {
   constructor() {
     super();
+    this.client = an("/carddav");
     this.user = "";
     this.principal = "";
-    this.addr_id = self.crypto.randomUUID();
+    this.addr_id = "";
     this.displayname = "";
     this.description = "";
     this.dialog = e();
@@ -44,7 +45,7 @@ let CreateAddressbookForm = class extends i {
           <br>
           <label>
             id
-            <input type="text" name="id" value=${this.addr_id} @change=${(e2) => this.addr_id = e2.target.value} />
+            <input type="text" name="id" @change=${(e2) => this.addr_id = e2.target.value} />
           </label>
           <br>
           <label>
@@ -78,12 +79,8 @@ let CreateAddressbookForm = class extends i {
       alert("Empty displayname");
       return;
     }
-    let response = await fetch(`/carddav/principal/${this.principal || this.user}/${this.addr_id}`, {
-      method: "MKCOL",
-      headers: {
-        "Content-Type": "application/xml"
-      },
-      body: `
+    await this.client.createDirectory(`/principal/${this.principal || this.user}/${this.addr_id}`, {
+      data: `
       <mkcol xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
         <set>
           <prop>
@@ -94,10 +91,6 @@ let CreateAddressbookForm = class extends i {
       </mkcol>
       `
     });
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`);
-      return null;
-    }
     window.location.reload();
     return null;
   }

crates/frontend/public/assets/js/create-calendar-form.mjs

@@ -1,7 +1,7 @@
 import { i, x } from "./lit-z6_uA4GX.mjs";
 import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
-import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
+import { e, n, a as escapeXml } from "./index-b86iLJlP.mjs";
+import { a as an } from "./webdav-D0R7xCzX.mjs";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -15,12 +15,12 @@ var __decorateClass = (decorators, target, key, kind) => {
 let CreateCalendarForm = class extends i {
   constructor() {
     super();
+    this.client = an("/caldav");
     this.user = "";
     this.principal = "";
-    this.cal_id = self.crypto.randomUUID();
+    this.cal_id = "";
     this.displayname = "";
     this.description = "";
-    this.timezone_id = "";
     this.color = "";
     this.isSubscription = false;
     this.subscriptionUrl = "";
@@ -49,7 +49,7 @@ let CreateCalendarForm = class extends i {
           <br>
           <label>
             id
-            <input type="text" name="id" value=${this.cal_id} @change=${(e2) => this.cal_id = e2.target.value} />
+            <input type="text" name="id" @change=${(e2) => this.cal_id = e2.target.value} />
           </label>
           <br>
           <label>
@@ -57,11 +57,6 @@ let CreateCalendarForm = class extends i {
             <input type="text" name="displayname" value=${this.displayname} @change=${(e2) => this.displayname = e2.target.value} />
           </label>
           <br>
-          <label>
-            Timezone (optional)
-            <input type="text" name="timezone" .value=${this.timezone_id} @change=${(e2) => this.timezone_id = e2.target.value} />
-          </label>
-          <br>
           <label>
             Description
             <input type="text" name="description" @change=${(e2) => this.description = e2.target.value} />
@@ -119,17 +114,12 @@ let CreateCalendarForm = class extends i {
       alert("No calendar components selected");
       return;
     }
-    let response = await fetch(`/caldav/principal/${this.principal || this.user}/${this.cal_id}`, {
-      method: "MKCOL",
-      headers: {
-        "Content-Type": "application/xml"
-      },
-      body: `
+    await this.client.createDirectory(`/principal/${this.principal || this.user}/${this.cal_id}`, {
+      data: `
       <mkcol xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
         <set>
           <prop>
             <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ""}
             ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ""}
             ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ""}
             ${this.isSubscription && this.subscriptionUrl ? `<CS:source><href>${escapeXml(this.subscriptionUrl)}</href></CS:source>` : ""}
@@ -141,10 +131,6 @@ let CreateCalendarForm = class extends i {
       </mkcol>
       `
     });
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`);
-      return null;
-    }
     window.location.reload();
     return null;
   }
@@ -164,9 +150,6 @@ __decorateClass([
 __decorateClass([
   n$1()
 ], CreateCalendarForm.prototype, "description", 2);
-__decorateClass([
-  n$1()
-], CreateCalendarForm.prototype, "timezone_id", 2);
 __decorateClass([
   n$1()
 ], CreateCalendarForm.prototype, "color", 2);

crates/frontend/public/assets/js/delete-button.mjs

@@ -19,7 +19,7 @@ let DeleteButton = class extends i {
     return this;
   }
   render() {
-    let text = this.trash ? "Trash" : "Delete";
+    let text = this.trash ? "Move to trash" : "Delete";
     return x`<button class="delete" @click=${(e) => this._onClick(e)}>${text}</button>`;
   }
   async _onClick(event) {

crates/frontend/public/assets/js/edit-addressbook-form.mjs

@@ -1,114 +0,0 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
-import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i2 = decorators.length - 1, decorator; i2 >= 0; i2--)
-    if (decorator = decorators[i2])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
-let EditAddressbookForm = class extends i {
-  constructor() {
-    super();
-    this.principal = "";
-    this.addr_id = "";
-    this.displayname = "";
-    this.description = "";
-    this.dialog = e();
-    this.form = e();
-  }
-  createRenderRoot() {
-    return this;
-  }
-  render() {
-    return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
-      <dialog ${n(this.dialog)}>
-        <h3>Edit addressbook</h3>
-        <form @submit=${this.submit} ${n(this.form)}>
-          <label>
-            Displayname
-            <input type="text" name="displayname" .value=${this.displayname} @change=${(e2) => this.displayname = e2.target.value} />
-          </label>
-          <br>
-          <label>
-            Description
-            <input type="text" name="description" .value=${this.description} @change=${(e2) => this.description = e2.target.value} />
-          </label>
-          <br>
-          <button type="submit">Submit</button>
-          <button type="submit" @click=${(event) => {
-      event.preventDefault();
-      this.dialog.value.close();
-      this.form.value.reset();
-    }} class="cancel">Cancel</button>
-        </form>
-      </dialog>
-    `;
-  }
-  async submit(e2) {
-    e2.preventDefault();
-    if (!this.principal) {
-      alert("Empty principal");
-      return;
-    }
-    if (!this.addr_id) {
-      alert("Empty id");
-      return;
-    }
-    if (!this.displayname) {
-      alert("Empty displayname");
-      return;
-    }
-    let response = await fetch(`/carddav/principal/${this.principal}/${this.addr_id}`, {
-      method: "PROPPATCH",
-      headers: {
-        "Content-Type": "application/xml"
-      },
-      body: `
-      <propertyupdate xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
-        <set>
-          <prop>
-            <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.description ? `<CARD:addressbook-description>${escapeXml(this.description)}</CARD:addressbook-description>` : ""}
-          </prop>
-        </set>
-        <remove>
-          <prop>
-            ${!this.description ? "<CARD:calendar-description />" : ""}
-          </prop>
-        </remove>
-      </propertyupdate>
-      `
-    });
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`);
-      return null;
-    }
-    window.location.reload();
-    return null;
-  }
-};
-__decorateClass([
-  n$1()
-], EditAddressbookForm.prototype, "principal", 2);
-__decorateClass([
-  n$1()
-], EditAddressbookForm.prototype, "addr_id", 2);
-__decorateClass([
-  n$1()
-], EditAddressbookForm.prototype, "displayname", 2);
-__decorateClass([
-  n$1()
-], EditAddressbookForm.prototype, "description", 2);
-EditAddressbookForm = __decorateClass([
-  t("edit-addressbook-form")
-], EditAddressbookForm);
-export {
-  EditAddressbookForm
-};

crates/frontend/public/assets/js/edit-calendar-form.mjs

@@ -1,158 +0,0 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
-import { e as escapeXml } from "./index-_IB1wMbZ.mjs";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i2 = decorators.length - 1, decorator; i2 >= 0; i2--)
-    if (decorator = decorators[i2])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
-let EditCalendarForm = class extends i {
-  constructor() {
-    super();
-    this.displayname = "";
-    this.description = "";
-    this.timezone_id = "";
-    this.color = "";
-    this.components = /* @__PURE__ */ new Set();
-    this.dialog = e();
-    this.form = e();
-  }
-  createRenderRoot() {
-    return this;
-  }
-  render() {
-    return x`
-      <button @click=${() => this.dialog.value.showModal()}>Edit</button>
-      <dialog ${n(this.dialog)}>
-        <h3>Edit calendar</h3>
-        <form @submit=${this.submit} ${n(this.form)}>
-          <label>
-            Displayname
-            <input type="text" name="displayname" .value=${this.displayname} @change=${(e2) => this.displayname = e2.target.value} />
-          </label>
-          <br>
-          <label>
-            Timezone (optional)
-            <input type="text" name="timezone" .value=${this.timezone_id} @change=${(e2) => this.timezone_id = e2.target.value} />
-          </label>
-          <br>
-          <label>
-            Description
-            <input type="text" name="description" .value=${this.description} @change=${(e2) => this.description = e2.target.value} />
-          </label>
-          <br>
-          <label>
-            Color
-            <input type="color" name="color" .value=${this.color} @change=${(e2) => this.color = e2.target.value} />
-          </label>
-          <br>
-          ${["VEVENT", "VTODO", "VJOURNAL"].map((comp) => x`
-            <label>
-              Support ${comp}
-              <input type="checkbox" value=${comp} ?checked=${this.components.has(comp)} @change=${(e2) => e2.target.checked ? this.components.add(e2.target.value) : this.components.delete(e2.target.value)} />
-            </label>
-            <br>
-          `)}
-          <br>
-          <button type="submit">Submit</button>
-          <button type="submit" @click=${(event) => {
-      event.preventDefault();
-      this.dialog.value.close();
-      this.form.value.reset();
-    }} class="cancel">Cancel</button>
-      </form>
-      </dialog>
-        `;
-  }
-  async submit(e2) {
-    e2.preventDefault();
-    if (!this.principal) {
-      alert("Empty principal");
-      return;
-    }
-    if (!this.cal_id) {
-      alert("Empty id");
-      return;
-    }
-    if (!this.displayname) {
-      alert("Empty displayname");
-      return;
-    }
-    if (!this.components.size) {
-      alert("No calendar components selected");
-      return;
-    }
-    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
-      method: "PROPPATCH",
-      headers: {
-        "Content-Type": "application/xml"
-      },
-      body: `
-      <propertyupdate xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
-        <set>
-          <prop>
-            <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ""}
-            ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ""}
-            ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ""}
-            <CAL:supported-calendar-component-set>
-              ${Array.from(this.components.keys()).map((comp) => `<CAL:comp name="${escapeXml(comp)}" />`).join("\n")}
-            </CAL:supported-calendar-component-set>
-          </prop>
-        </set>
-        <remove>
-          <prop>
-            ${!this.timezone_id ? `<CAL:calendar-timezone-id />` : ""}
-            ${!this.description ? "<CAL:calendar-description />" : ""}
-            ${!this.color ? "<ICAL:calendar-color />" : ""}
-          </prop>
-        </remove>
-      </propertyupdate>
-      `
-    });
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`);
-      return null;
-    }
-    window.location.reload();
-    return null;
-  }
-};
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "principal", 2);
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "cal_id", 2);
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "displayname", 2);
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "description", 2);
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "timezone_id", 2);
-__decorateClass([
-  n$1()
-], EditCalendarForm.prototype, "color", 2);
-__decorateClass([
-  n$1({
-    converter: {
-      fromAttribute: (value, _type) => new Set(value ? JSON.parse(value) : []),
-      toAttribute: (value, _type) => JSON.stringify(value)
-    }
-  })
-], EditCalendarForm.prototype, "components", 2);
-EditCalendarForm = __decorateClass([
-  t("edit-calendar-form")
-], EditCalendarForm);
-export {
-  EditCalendarForm
-};

crates/frontend/public/assets/js/import-addressbook-form.mjs

@@ -1,100 +0,0 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i2 = decorators.length - 1, decorator; i2 >= 0; i2--)
-    if (decorator = decorators[i2])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
-let ImportAddressbookForm = class extends i {
-  constructor() {
-    super();
-    this.user = "";
-    this.addressbook_id = self.crypto.randomUUID();
-    this.dialog = e();
-    this.form = e();
-  }
-  createRenderRoot() {
-    return this;
-  }
-  render() {
-    return x`
-      <button @click=${() => this.dialog.value.showModal()}>Import addressbook</button>
-      <dialog ${n(this.dialog)}>
-        <h3>Import addressbook</h3>
-        <form @submit=${this.submit} ${n(this.form)}>
-          <label>
-            principal (for group addressbook)
-            <select name="principal" value=${this.user} @change=${(e2) => this.principal = e2.target.value}>
-              <option value=${this.user}>${this.user}</option>
-              ${window.rusticalUser.memberships.map((membership) => x`
-                <option value=${membership}>${membership}</option>
-              `)}
-            </select>
-          </label>
-          <br>
-          <label>
-            id
-            <input type="text" name="id" value=${this.addressbook_id} @change=${(e2) => this.addressbook_id = e2.target.value} />
-          </label>
-          <br>
-          <label>
-            file
-            <input type="file" accept="text/vcard" name="file" @change=${(e2) => this.file = e2.target.files[0]} />
-          </label>
-          <button type="submit">Import</button>
-          <button type="submit" @click=${(event) => {
-      event.preventDefault();
-      this.dialog.value.close();
-      this.form.value.reset();
-    }} class="cancel">Cancel</button>
-      </form>
-      </dialog>
-        `;
-  }
-  async submit(e2) {
-    e2.preventDefault();
-    this.principal || (this.principal = this.user);
-    if (!this.principal) {
-      alert("Empty principal");
-      return;
-    }
-    if (!this.addressbook_id) {
-      alert("Empty id");
-      return;
-    }
-    let response = await fetch(`/carddav/principal/${this.principal}/${this.addressbook_id}`, {
-      method: "IMPORT",
-      headers: {
-        "Content-Type": "text/vcard"
-      },
-      body: this.file
-    });
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`);
-      return null;
-    }
-    window.location.reload();
-    return null;
-  }
-};
-__decorateClass([
-  n$1()
-], ImportAddressbookForm.prototype, "user", 2);
-__decorateClass([
-  n$1()
-], ImportAddressbookForm.prototype, "principal", 2);
-__decorateClass([
-  n$1()
-], ImportAddressbookForm.prototype, "addressbook_id", 2);
-ImportAddressbookForm = __decorateClass([
-  t("import-addressbook-form")
-], ImportAddressbookForm);
-export {
-  ImportAddressbookForm
-};

crates/frontend/public/assets/js/import-calendar-form.mjs

@@ -1,100 +0,0 @@
-import { i, x } from "./lit-z6_uA4GX.mjs";
-import { n as n$1, t } from "./property-D0NJdseG.mjs";
-import { e, n } from "./ref-CPp9J0V5.mjs";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i2 = decorators.length - 1, decorator; i2 >= 0; i2--)
-    if (decorator = decorators[i2])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
-let ImportCalendarForm = class extends i {
-  constructor() {
-    super();
-    this.user = "";
-    this.cal_id = self.crypto.randomUUID();
-    this.dialog = e();
-    this.form = e();
-  }
-  createRenderRoot() {
-    return this;
-  }
-  render() {
-    return x`
-      <button @click=${() => this.dialog.value.showModal()}>Import calendar</button>
-      <dialog ${n(this.dialog)}>
-        <h3>Import calendar</h3>
-        <form @submit=${this.submit} ${n(this.form)}>
-          <label>
-            principal (for group calendars)
-            <select name="principal" value=${this.user} @change=${(e2) => this.principal = e2.target.value}>
-              <option value=${this.user}>${this.user}</option>
-              ${window.rusticalUser.memberships.map((membership) => x`
-                <option value=${membership}>${membership}</option>
-              `)}
-            </select>
-          </label>
-          <br>
-          <label>
-            id
-            <input type="text" name="id" value=${this.cal_id} @change=${(e2) => this.cal_id = e2.target.value} />
-          </label>
-          <br>
-          <label>
-            file
-            <input type="file" accept="text/calendar" name="file" @change=${(e2) => this.file = e2.target.files[0]} />
-          </label>
-          <button type="submit">Import</button>
-          <button type="submit" @click=${(event) => {
-      event.preventDefault();
-      this.dialog.value.close();
-      this.form.value.reset();
-    }} class="cancel">Cancel</button>
-      </form>
-      </dialog>
-        `;
-  }
-  async submit(e2) {
-    e2.preventDefault();
-    this.principal || (this.principal = this.user);
-    if (!this.principal) {
-      alert("Empty principal");
-      return;
-    }
-    if (!this.cal_id) {
-      alert("Empty id");
-      return;
-    }
-    let response = await fetch(`/caldav/principal/${this.principal}/${this.cal_id}`, {
-      method: "IMPORT",
-      headers: {
-        "Content-Type": "text/calendar"
-      },
-      body: this.file
-    });
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`);
-      return null;
-    }
-    window.location.reload();
-    return null;
-  }
-};
-__decorateClass([
-  n$1()
-], ImportCalendarForm.prototype, "user", 2);
-__decorateClass([
-  n$1()
-], ImportCalendarForm.prototype, "principal", 2);
-__decorateClass([
-  n$1()
-], ImportCalendarForm.prototype, "cal_id", 2);
-ImportCalendarForm = __decorateClass([
-  t("import-calendar-form")
-], ImportCalendarForm);
-export {
-  ImportCalendarForm
-};

crates/frontend/public/assets/js/index-_IB1wMbZ.mjs

@@ -1,6 +0,0 @@
-function escapeXml(unsafe) {
-  return unsafe.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
-}
-export {
-  escapeXml as e
-};

crates/frontend/public/assets/js/index-b86iLJlP.mjs

@@ -122,7 +122,11 @@ const o = /* @__PURE__ */ new WeakMap(), n = e$1(class extends f {
     this.rt(this.ct);
   }
 });
+function escapeXml(unsafe) {
+  return unsafe.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+}
 export {
+  escapeXml as a,
   e,
   n
 };

crates/frontend/public/assets/style.css

@@ -224,15 +224,15 @@ ul.collection-list {
       min-height: 80px;
       height: fit-content;
       grid-template-areas:
-        ".                color-chip"
-        "title            color-chip"
-        "description      color-chip"
-        "subscription-url color-chip"
-        "metadata         color-chip"
-        "actions          color-chip"
-        ".                color-chip";
+        ".                .                 color-chip"
+        "title            comps             color-chip"
+        "description      description       color-chip"
+        "subscription-url subscription-url  color-chip"
+        "metadata         metadata          color-chip"
+        "actions          actions           color-chip"
+        ".                .                 color-chip";
       grid-template-rows: 12px auto auto auto auto auto 12px;
-      grid-template-columns: auto 80px;
+      grid-template-columns: min-content auto 80px;
       row-gap: 4px;
       color: inherit;
       text-decoration: none;
@@ -260,7 +260,7 @@ ul.collection-list {
       }
 
       .comps {
-        display: inline;
+        grid-area: comps;
 
         span {
           margin: 0 2px;
@@ -290,11 +290,9 @@ ul.collection-list {
       .color-chip {
         background: var(--color);
         grid-area: color-chip;
-        margin-left: 8px;
       }
 
       .actions {
-        pointer-events: all;
         grid-area: actions;
         width: fit-content;
         display: flex;
@@ -318,10 +316,6 @@ dialog {
   padding: 32px;
 }
 
-dialog::backdrop {
-  background: color-mix(in srgb, var(--background-color), transparent 50%);
-}
-
 footer {
   display: flex;
   justify-content: center;
@@ -347,17 +341,6 @@ select {
   }
 }
 
-form {
-
-  input[type="text"],
-  input[type="password"],
-  input[type="color"],
-  textarea,
-  select {
-    width: 100%;
-  }
-}
-
 svg.icon {
   stroke-width: 2px;
   color: var(--text-on-background-color);

crates/frontend/public/templates/components/sections/addressbooks_section.html

@@ -16,12 +16,6 @@
           method="GET">
           <button type="submit">Download</button>
         </form>
-        <edit-addressbook-form
-          principal="{{ addressbook.principal }}"
-          addr_id="{{ addressbook.id }}"
-          displayname="{{ addressbook.displayname.as_deref().unwrap_or_default() }}"
-          description="{{ addressbook.description.as_deref().unwrap_or_default() }}"
-        ></edit-addressbook-form>
         <delete-button trash
           href="/carddav/principal/{{ addressbook.principal }}/{{ addressbook.id }}"></delete-button>
       </div>
@@ -65,5 +59,4 @@
 {% endif %}
 
 <create-addressbook-form user="{{ user.id }}"></create-addressbook-form>
-<import-addressbook-form user="{{ user.id }}"></import-addressbook-form>
 

crates/frontend/public/templates/components/sections/calendars_section.html

@@ -1,21 +1,21 @@
 <h2>{{ user.id }}'s Calendars</h2>
 <ul class="collection-list">
   {% for (meta, calendar) in calendars %}
-  {% let color = calendar.meta.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
   <li class="collection-list-item" style="--color: {{ color }}">
     <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id }}"></a>
     <div class="inner">
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
-        {{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+      </span>
       <div class="comps">
         {% for comp in calendar.components %}
         <span>{{ comp }}</span>
         {% endfor %}
       </div>
-      </span>
       <span class="description">
-        {% if let Some(description) = calendar.meta.description %}{{ description }}{% endif %}
+        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
       </span>
       {% if let Some(subscription_url) = calendar.subscription_url %}
       <span class="subscription-url">{{ subscription_url }}</span>
@@ -25,15 +25,6 @@
           <button type="submit">Download</button>
         </form>
         {% if !calendar.id.starts_with("_birthdays_") %}
-        <edit-calendar-form
-          principal="{{ calendar.principal }}"
-          cal_id="{{ calendar.id }}"
-          timezone_id="{{ calendar.timezone_id.as_deref().unwrap_or_default() }}"
-          displayname="{{ calendar.meta.displayname.as_deref().unwrap_or_default() }}"
-          description="{{ calendar.meta.description.as_deref().unwrap_or_default() }}"
-          color="{{ calendar.meta.color.as_deref().unwrap_or_default() }}"
-          components="{{ calendar.components | json }}"
-        ></edit-calendar-form>
         <delete-button trash href="/caldav/principal/{{ calendar.principal }}/{{ calendar.id }}"></delete-button>
         {% endif %}
       </div>
@@ -51,21 +42,21 @@
 <h3>Deleted Calendars</h3>
 <ul class="collection-list">
   {% for (meta, calendar) in deleted_calendars %}
-  {% let color = calendar.meta.color.to_owned().unwrap_or("transparent".to_owned()) %}
+  {% let color = calendar.color.to_owned().unwrap_or("transparent".to_owned()) %}
   <li class="collection-list-item" style="--color: {{ color }}">
     <a href="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}"></a>
     <div class="inner">
       <span class="title">
         {%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
-        {{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+        {{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
+      </span>
       <div class="comps">
         {% for comp in calendar.components %}
         <span>{{ comp }}</span>
         {% endfor %}
       </div>
-      </span>
       <span class="description">
-        {% if let Some(description) = calendar.meta.description %}{{ description }}{% endif %}
+        {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
       </span>
       <div class="actions">
         <form action="/frontend/user/{{ calendar.principal }}/calendar/{{ calendar.id}}/restore" method="POST"
@@ -84,5 +75,4 @@
 </ul>
 {% endif %}
 <create-calendar-form user="{{ user.id }}"></create-calendar-form>
-<import-calendar-form user="{{ user.id }}"></import-calendar-form>
 

crates/frontend/public/templates/icons/calendar.svg

@@ -1,4 +1,5 @@
 <!-- Adapted from https://iconoir.com/ -->
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="icon">
   <path d="M15 4V2M15 4V6M15 4H10.5M3 10V19C3 20.1046 3.89543 21 5 21H19C20.1046 21 21 20.1046 21 19V10H3Z" stroke-linecap="round" stroke-linejoin="round"></path>
   <path d="M3 10V6C3 4.89543 3.89543 4 5 4H7" stroke-linecap="round" stroke-linejoin="round"></path>

crates/frontend/public/templates/icons/group.svg

@@ -1,4 +1,5 @@
 <!-- Adapted from https://iconoir.com/ -->
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="icon">
   <path d="M1 20V19C1 15.134 4.13401 12 8 12V12C11.866 12 15 15.134 15 19V20" stroke-linecap="round"></path>
   <path d="M13 14V14C13 11.2386 15.2386 9 18 9V9C20.7614 9 23 11.2386 23 14V14.5" stroke-linecap="round"></path>

crates/frontend/public/templates/icons/user.svg

@@ -1,4 +1,5 @@
 <!-- Adapted from https://iconoir.com/ -->
+<?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="icon">
   <path d="M5 20V19C5 15.134 8.13401 12 12 12V12C15.866 12 19 15.134 19 19V20" stroke-linecap="round" stroke-linejoin="round"></path>
   <path d="M12 12C14.2091 12 16 10.2091 16 8C16 5.79086 14.2091 4 12 4C9.79086 4 8 5.79086 8 8C8 10.2091 9.79086 12 12 12Z" stroke-linecap="round" stroke-linejoin="round"></path>

crates/frontend/public/templates/layouts/default.html

@@ -22,9 +22,9 @@
   <div id="app">
     {% block content %}<p>Placeholder</p>{% endblock %}
   </div>
+</body>
 <footer>
     <a href="{{ env!("CARGO_PKG_REPOSITORY") }}" target="_blank">RustiCal {{ env!("CARGO_PKG_VERSION") }}</a>
     <a href="/frontend/assets/licenses.html" target="_blank">Open Source Licenses</a>
 </footer>
-</body>
 </html>

crates/frontend/public/templates/pages/calendar.html

@@ -4,9 +4,9 @@
 {% endblock %}
 
 {% block content %}
-{% let name = calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
+{% let name = calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
 <h1>{{ calendar.principal }}/{{ name }}</h1>
-{% if let Some(description) = calendar.meta.description %}<p>{{ description }}</p>{% endif%}
+{% if let Some(description) = calendar.description %}<p>{{ description }}</p>{% endif%}
 
 {% if let Some(subscription_url) = calendar.subscription_url %}
 <h2>Subscription URL</h2>
@@ -25,6 +25,9 @@
 {% if let Some(timezone_id) = calendar.timezone_id %}
 <p>{{ timezone_id }}</p>
 {% endif %}
+{% if let Some(timezone) = calendar.timezone %}
+<textarea rows="16" readonly>{{ timezone }}</textarea>
+{% endif %}
 
 <pre>{{ calendar|json }}</pre>
 

crates/frontend/public/templates/pages/user.html

@@ -6,11 +6,7 @@
 window.rusticalUser = JSON.parse(document.querySelector('#data-rustical-user').innerHTML)
 </script>
 <script type="module" src="/frontend/assets/js/create-calendar-form.mjs" async></script>
-<script type="module" src="/frontend/assets/js/edit-calendar-form.mjs" async></script>
-<script type="module" src="/frontend/assets/js/import-calendar-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/create-addressbook-form.mjs" async></script>
-<script type="module" src="/frontend/assets/js/edit-addressbook-form.mjs" async></script>
-<script type="module" src="/frontend/assets/js/import-addressbook-form.mjs" async></script>
 <script type="module" src="/frontend/assets/js/delete-button.mjs" async></script>
 {% endblock %}
 {% block header_center %}

crates/frontend/src/assets.rs

@@ -13,7 +13,6 @@ use tower::Service;
 
 #[derive(Clone, RustEmbed, Default)]
 #[folder = "public/assets"]
-#[allow(dead_code)] // Since this is not used with the frontend-dev feature
 pub struct Assets;
 
 #[derive(Clone, Default)]

crates/frontend/src/lib.rs

@@ -45,38 +45,38 @@ pub fn frontend_router<AP: AuthenticationProvider, CS: CalendarStore, AS: Addres
     frontend_config: FrontendConfig,
     oidc_config: Option<OidcConfig>,
 ) -> Router {
-    let user_router = Router::new()
-        .route("/", get(route_get_home))
-        .route("/{user}", get(route_user_named::<CS, AS, AP>))
+    let mut router = Router::new();
+    router = router
+        .route("/", get(route_root))
+        .route("/user", get(route_get_home))
+        .route("/user/{user}", get(route_user_named::<CS, AS, AP>))
         // App token management
-        .route("/{user}/app_token", post(route_post_app_token::<AP>))
+        .route("/user/{user}/app_token", post(route_post_app_token::<AP>))
         .route(
             // POST because HTML5 forms don't support DELETE method
-            "/{user}/app_token/{id}/delete",
+            "/user/{user}/app_token/{id}/delete",
             post(route_delete_app_token::<AP>),
         )
         // Calendar
-        .route("/{user}/calendar", get(route_calendars::<CS>))
-        .route("/{user}/calendar/{calendar}", get(route_calendar::<CS>))
+        .route("/user/{user}/calendar", get(route_calendars::<CS>))
         .route(
-            "/{user}/calendar/{calendar}/restore",
+            "/user/{user}/calendar/{calendar}",
+            get(route_calendar::<CS>),
+        )
+        .route(
+            "/user/{user}/calendar/{calendar}/restore",
             post(route_calendar_restore::<CS>),
         )
         // Addressbook
-        .route("/{user}/addressbook", get(route_addressbooks::<AS>))
+        .route("/user/{user}/addressbook", get(route_addressbooks::<AS>))
         .route(
-            "/{user}/addressbook/{addressbook}",
+            "/user/{user}/addressbook/{addressbook}",
             get(route_addressbook::<AS>),
         )
         .route(
-            "/{user}/addressbook/{addressbook}/restore",
+            "/user/{user}/addressbook/{addressbook}/restore",
             post(route_addressbook_restore::<AS>),
         )
-        .layer(middleware::from_fn(unauthorized_handler));
-
-    let router = Router::new()
-        .route("/", get(route_root))
-        .nest("/user", user_router)
         .route("/login", get(route_get_login).post(route_post_login::<AP>))
         .route("/logout", post(route_post_logout));
 
@@ -109,7 +109,8 @@ pub fn frontend_router<AP: AuthenticationProvider, CS: CalendarStore, AS: Addres
         .layer(Extension(cal_store.clone()))
         .layer(Extension(addr_store.clone()))
         .layer(Extension(frontend_config.clone()))
-        .layer(Extension(oidc_config.clone()));
+        .layer(Extension(oidc_config.clone()))
+        .layer(middleware::from_fn(unauthorized_handler));
 
     Router::new()
         .nest(prefix, router)
@@ -147,7 +148,8 @@ async fn unauthorized_handler(mut request: Request, next: Next) -> Response {
                     <body>
                         Unauthorized, redirecting to <a href="{login_url}">login page</a>
                     </body>
-</html>"#,
+                <html>
+            "#,
             )))
             .unwrap();
     }

crates/frontend/src/routes/app_token.rs

@@ -56,13 +56,9 @@ pub async fn route_post_app_token<AP: AuthenticationProvider>(
     assert!(!name.is_empty());
     assert_eq!(user_id, user.id);
     let token = generate_app_token();
-    let mut token_id = auth_provider
+    auth_provider
         .add_app_token(&user.id, name.to_owned(), token.clone())
         .await?;
-    // Get first 4 characters of token identifier
-    token_id.truncate(4);
-    // This will be a hint for the token validator which app token hash to verify against
-    let token = format!("{token_id}_{token}");
     if apple {
         let profile = AppleConfig {
             token_name: name,

crates/frontend/src/routes/login.rs

@@ -13,7 +13,7 @@ use http::StatusCode;
 use rustical_store::auth::AuthenticationProvider;
 use serde::Deserialize;
 use tower_sessions::Session;
-use tracing::{instrument, warn};
+use tracing::instrument;
 use url::Url;
 
 #[derive(Template, WebTemplate)]
@@ -98,7 +98,6 @@ pub async fn route_post_login<AP: AuthenticationProvider>(
         session.insert("user", user.id).await.unwrap();
         Redirect::to(&redirect_uri).into_response()
     } else {
-        warn!("Failed password login attempt as {username}");
         StatusCode::UNAUTHORIZED.into_response()
     }
 }

crates/ical/src/address_object.rs

@@ -20,21 +20,19 @@ impl TryFrom<VcardContact> for AddressObject {
     type Error = Error;
 
     fn try_from(vcard: VcardContact) -> Result<Self, Self::Error> {
-        let uid = vcard
-            .get_uid()
-            .ok_or(Error::InvalidData("missing UID".to_owned()))?
-            .to_owned();
+        let id = vcard
+            .get_property("UID")
+            .ok_or(Error::InvalidData("Missing UID".to_owned()))?
+            .value
+            .clone()
+            .ok_or(Error::InvalidData("Missing UID".to_owned()))?;
         let vcf = vcard.generate();
-        Ok(Self {
-            vcf,
-            vcard,
-            id: uid,
-        })
+        Ok(Self { id, vcf, vcard })
     }
 }
 
 impl AddressObject {
-    pub fn from_vcf(id: String, vcf: String) -> Result<Self, Error> {
+    pub fn from_vcf(object_id: String, vcf: String) -> Result<Self, Error> {
         let mut parser = vcard::VcardParser::new(BufReader::new(vcf.as_bytes()));
         let vcard = parser.next().ok_or(Error::MissingContact)??;
         if parser.next().is_some() {
@@ -42,7 +40,11 @@ impl AddressObject {
                 "multiple vcards, only one allowed".to_owned(),
             ));
         }
-        Ok(Self { id, vcf, vcard })
+        Ok(Self {
+            id: object_id,
+            vcf,
+            vcard,
+        })
     }
 
     pub fn get_id(&self) -> &str {
@@ -51,7 +53,7 @@ impl AddressObject {
 
     pub fn get_etag(&self) -> String {
         let mut hasher = Sha256::new();
-        hasher.update(self.get_id());
+        hasher.update(&self.id);
         hasher.update(self.get_vcf());
         format!("\"{:x}\"", hasher.finalize())
     }
@@ -93,7 +95,9 @@ impl AddressObject {
                 let uid = format!("{}-anniversary", self.get_id());
 
                 let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
-                Some(CalendarObject::from_ics(format!(
+                Some(CalendarObject::from_ics(
+                    uid.clone(),
+                    format!(
                         r#"BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
@@ -112,7 +116,8 @@ DESCRIPTION:💍 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
 END:VCALENDAR"#,
-                ))?)
+                    ),
+                )?)
             } else {
                 None
             },
@@ -134,7 +139,9 @@ END:VCALENDAR"#,
                 let uid = format!("{}-birthday", self.get_id());
 
                 let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
-                Some(CalendarObject::from_ics(format!(
+                Some(CalendarObject::from_ics(
+                    uid.clone(),
+                    format!(
                         r#"BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
@@ -153,7 +160,8 @@ DESCRIPTION:🎂 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
 END:VCALENDAR"#,
-                ))?)
+                    ),
+                )?)
             } else {
                 None
             },

crates/ical/src/duration.rs

@@ -0,0 +1,53 @@
+use crate::CalDateTimeError;
+use chrono::Duration;
+use lazy_static::lazy_static;
+
+lazy_static! {
+    static ref RE_DURATION: regex::Regex = regex::Regex::new(r"^(?<sign>[+-])?P((?P<W>\d+)W)?((?P<D>\d+)D)?(T((?P<H>\d+)H)?((?P<M>\d+)M)?((?P<S>\d+)S)?)?$").unwrap();
+}
+
+pub fn parse_duration(string: &str) -> Result<Duration, CalDateTimeError> {
+    let captures = RE_DURATION
+        .captures(string)
+        .ok_or(CalDateTimeError::InvalidDurationFormat(string.to_string()))?;
+
+    let mut duration = Duration::zero();
+    if let Some(weeks) = captures.name("W") {
+        duration += Duration::weeks(weeks.as_str().parse().unwrap());
+    }
+    if let Some(days) = captures.name("D") {
+        duration += Duration::days(days.as_str().parse().unwrap());
+    }
+    if let Some(hours) = captures.name("H") {
+        duration += Duration::hours(hours.as_str().parse().unwrap());
+    }
+    if let Some(minutes) = captures.name("M") {
+        duration += Duration::minutes(minutes.as_str().parse().unwrap());
+    }
+    if let Some(seconds) = captures.name("S") {
+        duration += Duration::seconds(seconds.as_str().parse().unwrap());
+    }
+    if let Some(sign) = captures.name("sign") {
+        if sign.as_str() == "-" {
+            duration = -duration;
+        }
+    }
+
+    Ok(duration)
+}
+
+#[cfg(test)]
+mod tests {
+    use chrono::Duration;
+
+    use crate::parse_duration;
+
+    #[test]
+    fn test_parse_duration() {
+        assert_eq!(parse_duration("P12W").unwrap(), Duration::weeks(12));
+        assert_eq!(parse_duration("P12D").unwrap(), Duration::days(12));
+        assert_eq!(parse_duration("PT12H").unwrap(), Duration::hours(12));
+        assert_eq!(parse_duration("PT12M").unwrap(), Duration::minutes(12));
+        assert_eq!(parse_duration("PT12S").unwrap(), Duration::seconds(12));
+    }
+}

crates/ical/src/icalendar/event.rs

@@ -1,22 +1,24 @@
-use crate::CalDateTime;
 use crate::Error;
+use crate::{CalDateTime, ComponentMut, parse_duration};
 use chrono::{DateTime, Duration, Utc};
-use ical::parser::ComponentMut;
-use ical::{generator::IcalEvent, parser::Component, property::Property};
+use ical::{
+    generator::IcalEvent,
+    parser::{Component, ical::component::IcalTimeZone},
+    property::Property,
+};
 use rrule::{RRule, RRuleSet};
 use std::{collections::HashMap, str::FromStr};
 
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone)]
 pub struct EventObject {
     pub event: IcalEvent,
-    // If a timezone is None that means that in the VCALENDAR object there's a timezone defined
-    // with that name but its not from the Olson DB
-    pub timezones: HashMap<String, Option<chrono_tz::Tz>>,
+    pub timezones: HashMap<String, IcalTimeZone>,
+    pub(crate) ics: String,
 }
 
 impl EventObject {
     pub fn get_dtstart(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(dtstart) = self.event.get_dtstart() {
+        if let Some(dtstart) = self.event.get_property("DTSTART") {
             Ok(Some(CalDateTime::parse_prop(dtstart, &self.timezones)?))
         } else {
             Ok(None)
@@ -24,7 +26,7 @@ impl EventObject {
     }
 
     pub fn get_dtend(&self) -> Result<Option<CalDateTime>, Error> {
-        if let Some(dtend) = self.event.get_dtend() {
+        if let Some(dtend) = self.event.get_property("DTEND") {
             Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?))
         } else {
             Ok(None)
@@ -32,21 +34,33 @@ impl EventObject {
     }
 
     pub fn get_last_occurence(&self) -> Result<Option<CalDateTime>, Error> {
-        if self.event.get_rrule().is_some() {
+        if let Some(_rrule) = self.event.get_property("RRULE") {
             // TODO: understand recurrence rules
             return Ok(None);
         }
 
-        if let Some(dtend) = self.get_dtend()? {
-            return Ok(Some(dtend));
+        if let Some(dtend) = self.event.get_property("DTEND") {
+            return Ok(Some(CalDateTime::parse_prop(dtend, &self.timezones)?));
         };
 
-        let duration = self.event.get_duration().unwrap_or(Duration::days(1));
+        let duration = self.get_duration()?.unwrap_or(Duration::days(1));
 
         let first_occurence = self.get_dtstart()?;
         Ok(first_occurence.map(|first_occurence| first_occurence + duration))
     }
 
+    pub fn get_duration(&self) -> Result<Option<Duration>, Error> {
+        if let Some(Property {
+            value: Some(duration),
+            ..
+        }) = self.event.get_property("DURATION")
+        {
+            Ok(Some(parse_duration(duration)?))
+        } else {
+            Ok(None)
+        }
+    }
+
     pub fn recurrence_ruleset(&self) -> Result<Option<rrule::RRuleSet>, Error> {
         let dtstart: DateTime<rrule::Tz> = if let Some(dtstart) = self.get_dtstart()? {
             if let Some(dtend) = self.get_dtend()? {
@@ -114,7 +128,7 @@ impl EventObject {
                 } else {
                     date.format()
                 };
-                let mut ev = self.event.clone().mutable();
+                let mut ev = self.event.clone();
                 ev.remove_property("RRULE");
                 ev.remove_property("RDATE");
                 ev.remove_property("EXDATE");
@@ -149,7 +163,7 @@ impl EventObject {
                         params: dtstart_prop.params,
                     });
                 }
-                events.push(ev.verify()?);
+                events.push(ev);
             }
             Ok(events)
         } else {
@@ -228,7 +242,11 @@ END:VEVENT\r\n",
 
     #[test]
     fn test_expand_recurrence() {
-        let event = CalendarObject::from_ics(ICS.to_string()).unwrap();
+        let event = CalendarObject::from_ics(
+            "318ec6503573d9576818daf93dac07317058d95c".to_string(),
+            ICS.to_string(),
+        )
+        .unwrap();
         let event = event.event().unwrap();
 
         let events: Vec<String> = event

crates/ical/src/icalendar/journal.rs

@@ -1,5 +1,7 @@
-use derive_more::From;
 use ical::parser::ical::component::IcalJournal;
 
-#[derive(Debug, Clone, From)]
-pub struct JournalObject(pub IcalJournal);
+#[derive(Debug, Clone)]
+pub struct JournalObject {
+    pub journal: IcalJournal,
+    pub(crate) ics: String,
+}

crates/ical/src/icalendar/object.rs

@@ -4,22 +4,19 @@ use crate::Error;
 use chrono::DateTime;
 use chrono::Utc;
 use derive_more::Display;
-use ical::generator::{Emitter, IcalCalendar};
-use ical::parser::ical::component::IcalTimeZone;
-use ical::property::Property;
-use serde::Deserialize;
+use ical::{
+    generator::{Emitter, IcalCalendar},
+    parser::{Component, ical::component::IcalTimeZone},
+};
 use serde::Serialize;
 use sha2::{Digest, Sha256};
 use std::{collections::HashMap, io::BufReader};
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Display)]
+#[derive(Debug, Clone, Serialize, PartialEq, Eq, Display)]
 // specified in https://datatracker.ietf.org/doc/html/rfc5545#section-3.6
 pub enum CalendarObjectType {
-    #[serde(rename = "VEVENT")]
     Event = 0,
-    #[serde(rename = "VTODO")]
     Todo = 1,
-    #[serde(rename = "VJOURNAL")]
     Journal = 2,
 }
 
@@ -47,7 +44,8 @@ impl rustical_xml::ValueDeserialize for CalendarObjectType {
             "VJOURNAL" => Ok(Self::Journal),
             _ => Err(rustical_xml::XmlError::InvalidValue(
                 rustical_xml::ParseValueError::Other(format!(
-                    "Invalid value '{val}', must be VEVENT, VTODO, or VJOURNAL"
+                    "Invalid value '{}', must be VEVENT, VTODO, or VJOURNAL",
+                    val
                 )),
             )),
         }
@@ -61,22 +59,15 @@ pub enum CalendarObjectComponent {
     Journal(JournalObject),
 }
 
-impl Default for CalendarObjectComponent {
-    fn default() -> Self {
-        Self::Event(EventObject::default())
-    }
-}
-
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone)]
 pub struct CalendarObject {
+    id: String,
     data: CalendarObjectComponent,
-    properties: Vec<Property>,
-    ics: String,
-    vtimezones: HashMap<String, IcalTimeZone>,
+    cal: IcalCalendar,
 }
 
 impl CalendarObject {
-    pub fn from_ics(ics: String) -> Result<Self, Error> {
+    pub fn from_ics(object_id: String, ics: String) -> Result<Self, Error> {
         let mut parser = ical::IcalParser::new(BufReader::new(ics.as_bytes()));
         let cal = parser.next().ok_or(Error::MissingCalendar)??;
         if parser.next().is_some() {
@@ -97,42 +88,52 @@ impl CalendarObject {
             ));
         }
 
-        let timezones: HashMap<String, Option<chrono_tz::Tz>> = cal
+        let timezones: HashMap<String, IcalTimeZone> = cal
             .timezones
             .clone()
             .into_iter()
-            .map(|timezone| (timezone.get_tzid().to_owned(), (&timezone).try_into().ok()))
-            .collect();
-
-        let vtimezones = cal
-            .timezones
-            .clone()
-            .into_iter()
-            .map(|timezone| (timezone.get_tzid().to_owned(), timezone))
-            .collect();
-
-        let data = if let Some(event) = cal.events.into_iter().next() {
-            CalendarObjectComponent::Event(EventObject { event, timezones })
-        } else if let Some(todo) = cal.todos.into_iter().next() {
-            CalendarObjectComponent::Todo(todo.into())
-        } else if let Some(journal) = cal.journals.into_iter().next() {
-            CalendarObjectComponent::Journal(journal.into())
-        } else {
-            return Err(Error::InvalidData(
-                "iCalendar component type not supported :(".to_owned(),
-            ));
-        };
-
-        Ok(Self {
-            data,
-            properties: cal.properties,
-            ics,
-            vtimezones,
+            .filter_map(|timezone| {
+                let timezone_prop = timezone.get_property("TZID")?.to_owned();
+                let tzid = timezone_prop.value?;
+                Some((tzid, timezone))
             })
+            .collect();
+
+        if let Some(event) = cal.events.first() {
+            return Ok(CalendarObject {
+                id: object_id,
+                cal: cal.clone(),
+                data: CalendarObjectComponent::Event(EventObject {
+                    event: event.clone(),
+                    timezones,
+                    ics,
+                }),
+            });
+        }
+        if let Some(todo) = cal.todos.first() {
+            return Ok(CalendarObject {
+                id: object_id,
+                cal: cal.clone(),
+                data: CalendarObjectComponent::Todo(TodoObject {
+                    todo: todo.clone(),
+                    ics,
+                }),
+            });
+        }
+        if let Some(journal) = cal.journals.first() {
+            return Ok(CalendarObject {
+                id: object_id,
+                cal: cal.clone(),
+                data: CalendarObjectComponent::Journal(JournalObject {
+                    journal: journal.clone(),
+                    ics,
+                }),
+            });
         }
 
-    pub fn get_vtimezones(&self) -> &HashMap<String, IcalTimeZone> {
-        &self.vtimezones
+        Err(Error::InvalidData(
+            "iCalendar component type not supported :(".to_owned(),
+        ))
     }
 
     pub fn get_data(&self) -> &CalendarObjectComponent {
@@ -140,26 +141,29 @@ impl CalendarObject {
     }
 
     pub fn get_id(&self) -> &str {
-        match &self.data {
-            CalendarObjectComponent::Todo(todo) => todo.0.get_uid(),
-            CalendarObjectComponent::Event(event) => event.event.get_uid(),
-            CalendarObjectComponent::Journal(journal) => journal.0.get_uid(),
+        &self.id
     }
-    }
-
     pub fn get_etag(&self) -> String {
         let mut hasher = Sha256::new();
-        hasher.update(self.get_id());
+        hasher.update(&self.id);
         hasher.update(self.get_ics());
         format!("\"{:x}\"", hasher.finalize())
     }
 
     pub fn get_ics(&self) -> &str {
-        &self.ics
+        match &self.data {
+            CalendarObjectComponent::Todo(todo) => &todo.ics,
+            CalendarObjectComponent::Event(event) => &event.ics,
+            CalendarObjectComponent::Journal(journal) => &journal.ics,
+        }
     }
 
     pub fn get_component_name(&self) -> &str {
-        self.get_object_type().as_str()
+        match self.data {
+            CalendarObjectComponent::Todo(_) => "VTODO",
+            CalendarObjectComponent::Event(_) => "VEVENT",
+            CalendarObjectComponent::Journal(_) => "VJOURNAL",
+        }
     }
 
     pub fn get_object_type(&self) -> CalendarObjectType {
@@ -199,11 +203,8 @@ impl CalendarObject {
         // Only events can be expanded
         match &self.data {
             CalendarObjectComponent::Event(event) => {
-                let cal = IcalCalendar {
-                    properties: self.properties.clone(),
-                    events: event.expand_recurrence(start, end)?,
-                    ..Default::default()
-                };
+                let mut cal = self.cal.clone();
+                cal.events = event.expand_recurrence(start, end)?;
                 Ok(cal.generate())
             }
             _ => Ok(self.get_ics().to_string()),

crates/ical/src/icalendar/todo.rs

@@ -1,5 +1,7 @@
-use derive_more::From;
 use ical::parser::ical::component::IcalTodo;
 
-#[derive(Debug, Clone, From)]
-pub struct TodoObject(pub IcalTodo);
+#[derive(Debug, Clone)]
+pub struct TodoObject {
+    pub todo: IcalTodo,
+    pub(crate) ics: String,
+}

crates/ical/src/lib.rs

@@ -1,8 +1,14 @@
+mod property_ext;
+pub use property_ext::*;
+
 mod timestamp;
 mod timezone;
 pub use timestamp::*;
 pub use timezone::*;
 
+mod duration;
+pub use duration::parse_duration;
+
 mod icalendar;
 pub use icalendar::*;
 

crates/ical/src/property_ext.rs

@@ -0,0 +1,46 @@
+use ical::{generator::IcalEvent, property::Property};
+
+pub trait IcalProperty {
+    fn get_param(&self, name: &str) -> Option<Vec<&str>>;
+    fn get_value_type(&self) -> Option<&str>;
+    fn get_tzid(&self) -> Option<&str>;
+}
+
+impl IcalProperty for ical::property::Property {
+    fn get_param(&self, name: &str) -> Option<Vec<&str>> {
+        self.params
+            .as_ref()?
+            .iter()
+            .find(|(key, _)| name == key)
+            .map(|(_, value)| value.iter().map(String::as_str).collect())
+    }
+
+    fn get_value_type(&self) -> Option<&str> {
+        self.get_param("VALUE")
+            .and_then(|params| params.into_iter().next())
+    }
+
+    fn get_tzid(&self) -> Option<&str> {
+        self.get_param("TZID")
+            .and_then(|params| params.into_iter().next())
+    }
+}
+
+pub trait ComponentMut {
+    fn remove_property(&mut self, name: &str);
+    fn set_property(&mut self, prop: Property);
+    fn push_property(&mut self, prop: Property);
+}
+
+impl ComponentMut for IcalEvent {
+    fn remove_property(&mut self, name: &str) {
+        self.properties.retain(|prop| prop.name != name);
+    }
+    fn set_property(&mut self, prop: Property) {
+        self.remove_property(&prop.name);
+        self.push_property(prop);
+    }
+    fn push_property(&mut self, prop: Property) {
+        self.properties.push(prop);
+    }
+}

crates/ical/src/timestamp.rs

@@ -1,8 +1,12 @@
-use super::timezone::ICalTimezone;
+use super::timezone::CalTimezone;
+use crate::IcalProperty;
 use chrono::{DateTime, Datelike, Duration, Local, NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use chrono_tz::Tz;
 use derive_more::derive::Deref;
-use ical::property::Property;
+use ical::{
+    parser::{Component, ical::component::IcalTimeZone},
+    property::Property,
+};
 use lazy_static::lazy_static;
 use rustical_xml::{ValueDeserialize, ValueSerialize};
 use std::{borrow::Cow, collections::HashMap, ops::Add};
@@ -64,8 +68,8 @@ pub enum CalDateTime {
     // Form 2, example: 19980119T070000Z -> UTC
     // Form 3, example: TZID=America/New_York:19980119T020000 -> Olson
     // https://en.wikipedia.org/wiki/Tz_database
-    DateTime(DateTime<ICalTimezone>),
-    Date(NaiveDate, ICalTimezone),
+    DateTime(DateTime<CalTimezone>),
+    Date(NaiveDate, CalTimezone),
 }
 
 impl From<CalDateTime> for DateTime<rrule::Tz> {
@@ -102,13 +106,13 @@ impl Ord for CalDateTime {
 
 impl From<DateTime<Local>> for CalDateTime {
     fn from(value: DateTime<Local>) -> Self {
-        CalDateTime::DateTime(value.with_timezone(&ICalTimezone::Local))
+        CalDateTime::DateTime(value.with_timezone(&CalTimezone::Local))
     }
 }
 
 impl From<DateTime<Utc>> for CalDateTime {
     fn from(value: DateTime<Utc>) -> Self {
-        CalDateTime::DateTime(value.with_timezone(&ICalTimezone::Olson(chrono_tz::UTC)))
+        CalDateTime::DateTime(value.with_timezone(&CalTimezone::Utc))
     }
 }
 
@@ -132,7 +136,7 @@ impl Add<Duration> for CalDateTime {
 impl CalDateTime {
     pub fn parse_prop(
         prop: &Property,
-        timezones: &HashMap<String, Option<chrono_tz::Tz>>,
+        timezones: &HashMap<String, IcalTimeZone>,
     ) -> Result<Self, CalDateTimeError> {
         let prop_value = prop
             .value
@@ -141,9 +145,28 @@ impl CalDateTime {
                 "empty property".to_owned(),
             ))?;
 
-        let timezone = if let Some(tzid) = prop.get_param("TZID") {
+        // Use the TZID parameter from the property
+        let timezone = if let Some(tzid) = prop.get_tzid() {
             if let Some(timezone) = timezones.get(tzid) {
-                timezone.to_owned()
+                // X-LIC-LOCATION is often used to refer to a standardised timezone from the Olson
+                // database
+                if let Some(olson_name) = timezone
+                    .get_property("X-LIC-LOCATION")
+                    .map(|prop| prop.value.to_owned())
+                    .unwrap_or_default()
+                {
+                    if let Ok(tz) = olson_name.parse::<Tz>() {
+                        Some(tz)
+                    } else {
+                        return Err(CalDateTimeError::InvalidOlson(olson_name));
+                    }
+                } else {
+                    // If the TZID matches a name from the Olson database (e.g. Europe/Berlin) we
+                    // guess that we can just use it
+                    tzid.parse::<Tz>().ok()
+                    // TODO: If None: Too bad, we need to manually parse it
+                    // For now it's just treated as localtime
+                }
             } else {
                 // TZID refers to timezone that does not exist
                 return Err(CalDateTimeError::InvalidTZID(tzid.to_string()));
@@ -151,7 +174,6 @@ impl CalDateTime {
         } else {
             // No explicit timezone specified.
             // This is valid and will be localtime or UTC depending on the value
-            // We will stick to this default as documented in https://github.com/lennart-k/rustical/issues/102
             None
         };
 
@@ -161,7 +183,7 @@ impl CalDateTime {
     pub fn format(&self) -> String {
         match self {
             Self::DateTime(datetime) => match datetime.timezone() {
-                ICalTimezone::Olson(chrono_tz::UTC) => datetime.format(UTC_DATE_TIME).to_string(),
+                CalTimezone::Utc => datetime.format(UTC_DATE_TIME).to_string(),
                 _ => datetime.format(LOCAL_DATE_TIME).to_string(),
             },
             Self::Date(date, _) => date.format(LOCAL_DATE).to_string(),
@@ -186,7 +208,7 @@ impl CalDateTime {
         matches!(&self, Self::Date(_, _))
     }
 
-    pub fn as_datetime(&self) -> Cow<'_, DateTime<ICalTimezone>> {
+    pub fn as_datetime(&self) -> Cow<DateTime<CalTimezone>> {
         match self {
             Self::DateTime(datetime) => Cow::Borrowed(datetime),
             Self::Date(date, tz) => Cow::Owned(
@@ -210,7 +232,7 @@ impl CalDateTime {
             }
             return Ok(CalDateTime::DateTime(
                 datetime
-                    .and_local_timezone(ICalTimezone::Local)
+                    .and_local_timezone(CalTimezone::Local)
                     .earliest()
                     .ok_or(CalDateTimeError::LocalTimeGap)?,
             ));
@@ -220,8 +242,8 @@ impl CalDateTime {
             return Ok(datetime.and_utc().into());
         }
         let timezone = timezone
-            .map(ICalTimezone::Olson)
-            .unwrap_or(ICalTimezone::Local);
+            .map(CalTimezone::Olson)
+            .unwrap_or(CalTimezone::Local);
         if let Ok(date) = NaiveDate::parse_from_str(value, LOCAL_DATE) {
             return Ok(CalDateTime::Date(date, timezone));
         }
@@ -253,7 +275,7 @@ impl CalDateTime {
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(year, month, day)
                         .ok_or(CalDateTimeError::ParseError(value.to_string()))?,
-                    ICalTimezone::Local,
+                    CalTimezone::Local,
                 ),
                 false,
             ));
@@ -265,7 +287,7 @@ impl CalDateTime {
         self.as_datetime().to_utc()
     }
 
-    pub fn timezone(&self) -> ICalTimezone {
+    pub fn timezone(&self) -> CalTimezone {
         match &self {
             CalDateTime::DateTime(datetime) => datetime.timezone(),
             CalDateTime::Date(_, tz) => tz.to_owned(),
@@ -401,7 +423,7 @@ mod tests {
             (
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                    crate::ICalTimezone::Local
+                    crate::CalTimezone::Local
                 ),
                 true
             )
@@ -411,7 +433,7 @@ mod tests {
             (
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                    crate::ICalTimezone::Local
+                    crate::CalTimezone::Local
                 ),
                 true
             )
@@ -421,7 +443,7 @@ mod tests {
             (
                 CalDateTime::Date(
                     NaiveDate::from_ymd_opt(1972, 4, 12).unwrap(),
-                    crate::ICalTimezone::Local
+                    crate::CalTimezone::Local
                 ),
                 false
             )

crates/ical/src/timezone.rs

@@ -1,26 +1,29 @@
-use chrono::{Local, NaiveDate, NaiveDateTime, TimeZone};
+use chrono::{Local, NaiveDate, NaiveDateTime, TimeZone, Utc};
 use chrono_tz::Tz;
 use derive_more::{Display, From};
 
 #[derive(Debug, Clone, From, PartialEq, Eq)]
-pub enum ICalTimezone {
+pub enum CalTimezone {
     Local,
+    Utc,
     Olson(Tz),
 }
 
-impl From<ICalTimezone> for rrule::Tz {
-    fn from(value: ICalTimezone) -> Self {
+impl From<CalTimezone> for rrule::Tz {
+    fn from(value: CalTimezone) -> Self {
         match value {
-            ICalTimezone::Local => Self::LOCAL,
-            ICalTimezone::Olson(tz) => Self::Tz(tz),
+            CalTimezone::Local => Self::LOCAL,
+            CalTimezone::Utc => Self::UTC,
+            CalTimezone::Olson(tz) => Self::Tz(tz),
         }
     }
 }
 
-impl From<rrule::Tz> for ICalTimezone {
+impl From<rrule::Tz> for CalTimezone {
     fn from(value: rrule::Tz) -> Self {
         match value {
             rrule::Tz::Local(_) => Self::Local,
+            rrule::Tz::Tz(chrono_tz::UTC) => Self::Utc,
             rrule::Tz::Tz(tz) => Self::Olson(tz),
         }
     }
@@ -29,6 +32,7 @@ impl From<rrule::Tz> for ICalTimezone {
 #[derive(Debug, Clone, PartialEq, Display)]
 pub enum CalTimezoneOffset {
     Local(chrono::FixedOffset),
+    Utc(chrono::Utc),
     Olson(chrono_tz::TzOffset),
 }
 
@@ -36,17 +40,19 @@ impl chrono::Offset for CalTimezoneOffset {
     fn fix(&self) -> chrono::FixedOffset {
         match self {
             Self::Local(local) => local.fix(),
+            Self::Utc(utc) => utc.fix(),
             Self::Olson(olson) => olson.fix(),
         }
     }
 }
 
-impl TimeZone for ICalTimezone {
+impl TimeZone for CalTimezone {
     type Offset = CalTimezoneOffset;
 
     fn from_offset(offset: &Self::Offset) -> Self {
         match offset {
             CalTimezoneOffset::Local(_) => Self::Local,
+            CalTimezoneOffset::Utc(_) => Self::Utc,
             CalTimezoneOffset::Olson(offset) => Self::Olson(Tz::from_offset(offset)),
         }
     }
@@ -56,6 +62,9 @@ impl TimeZone for ICalTimezone {
             Self::Local => Local
                 .offset_from_local_date(local)
                 .map(CalTimezoneOffset::Local),
+            Self::Utc => Utc
+                .offset_from_local_date(local)
+                .map(CalTimezoneOffset::Utc),
             Self::Olson(tz) => tz
                 .offset_from_local_date(local)
                 .map(CalTimezoneOffset::Olson),
@@ -70,6 +79,9 @@ impl TimeZone for ICalTimezone {
             Self::Local => Local
                 .offset_from_local_datetime(local)
                 .map(CalTimezoneOffset::Local),
+            Self::Utc => Utc
+                .offset_from_local_datetime(local)
+                .map(CalTimezoneOffset::Utc),
             Self::Olson(tz) => tz
                 .offset_from_local_datetime(local)
                 .map(CalTimezoneOffset::Olson),
@@ -79,6 +91,7 @@ impl TimeZone for ICalTimezone {
     fn offset_from_utc_datetime(&self, utc: &NaiveDateTime) -> Self::Offset {
         match self {
             Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_datetime(utc)),
+            Self::Utc => CalTimezoneOffset::Utc(Utc.offset_from_utc_datetime(utc)),
             Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_datetime(utc)),
         }
     }
@@ -86,6 +99,7 @@ impl TimeZone for ICalTimezone {
     fn offset_from_utc_date(&self, utc: &NaiveDate) -> Self::Offset {
         match self {
             Self::Local => CalTimezoneOffset::Local(Local.offset_from_utc_date(utc)),
+            Self::Utc => CalTimezoneOffset::Utc(Utc.offset_from_utc_date(utc)),
             Self::Olson(tz) => CalTimezoneOffset::Olson(tz.offset_from_utc_date(utc)),
         }
     }

crates/oidc/src/lib.rs

@@ -192,8 +192,8 @@ pub async fn route_get_oidc_callback<US: UserStore + Clone>(
         .await
         .map_err(|e| OidcError::UserInfo(e.to_string()))?;
 
-    if let Some(require_group) = &oidc_config.require_group
-        && !user_info_claims
+    if let Some(require_group) = &oidc_config.require_group {
+        if !user_info_claims
             .additional_claims()
             .groups
             .clone()
@@ -206,6 +206,7 @@ pub async fn route_get_oidc_callback<US: UserStore + Clone>(
             )
                 .into_response());
         }
+    }
 
     let user_id = match oidc_config.claim_userid {
         UserIdClaim::Sub => user_info_claims.subject().to_string(),

crates/store/Cargo.toml

@@ -22,6 +22,7 @@ chrono-tz = { workspace = true }
 derive_more = { workspace = true, features = ["as_ref"] }
 rustical_xml.workspace = true
 tokio.workspace = true
+rand.workspace = true
 clap.workspace = true
 rustical_dav.workspace = true
 rustical_ical.workspace = true
@@ -32,7 +33,6 @@ headers.workspace = true
 tower.workspace = true
 futures-core.workspace = true
 tower-sessions.workspace = true
-vtimezones-rs.workspace = true
 
 [dev-dependencies]
 rstest = { workspace = true }

crates/store/src/addressbook_store.rs

@@ -76,8 +76,8 @@ pub trait AddressbookStore: Send + Sync + 'static {
 
     async fn import_addressbook(
         &self,
+        principal: String,
         addressbook: Addressbook,
         objects: Vec<AddressObject>,
-        merge_existing: bool,
     ) -> Result<(), Error>;
 }