Update documentation given the changes to memberships

Add group-membership to both caldav and carddav and fix addressbook-home-set for shared principals
carddav: Remove members from addressbook-home-set
2025-12-13 19:22:26 +00:00 · 2025-06-12 20:59:50 +02:00 · 2025-06-12 20:55:22 +02:00 · 2025-06-12 20:12:17 +02:00 · 2025-06-12 20:10:14 +02:00 · 2025-06-12 20:05:51 +02:00
74 changed files with 197 additions and 1433 deletions
--- a/.sqlx/query-0195268daddd2d171577c93d1bae1b8937405bcefffa8f1f9b9c9f7f2084088f.json
+++ b/.sqlx/query-0195268daddd2d171577c93d1bae1b8937405bcefffa8f1f9b9c9f7f2084088f.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM app_tokens WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "0195268daddd2d171577c93d1bae1b8937405bcefffa8f1f9b9c9f7f2084088f"
-}
--- a/.sqlx/query-02a9260d0ff496a6bf226fc8238ae332f8eb18dddbd80d31989c074804f31dee.json
+++ b/.sqlx/query-02a9260d0ff496a6bf226fc8238ae332f8eb18dddbd80d31989c074804f31dee.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendars SET deleted_at = NULL WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "02a9260d0ff496a6bf226fc8238ae332f8eb18dddbd80d31989c074804f31dee"
-}
--- a/.sqlx/query-0fd3167a58cbfb4ee44249dbc346d2d9077adfa04c35c8c6f2a1e24720baf753.json
+++ b/.sqlx/query-0fd3167a58cbfb4ee44249dbc346d2d9077adfa04c35c8c6f2a1e24720baf753.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO app_tokens\n                (id, principal, token, displayname)\n            VALUES (?, ?, ?, ?)\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "0fd3167a58cbfb4ee44249dbc346d2d9077adfa04c35c8c6f2a1e24720baf753"
-}
--- a/.sqlx/query-10325688a6601f6205cde9d9e2d582ca87a46607a1d889af155debc3073d78e1.json
+++ b/.sqlx/query-10325688a6601f6205cde9d9e2d582ca87a46607a1d889af155debc3073d78e1.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendarobjects SET deleted_at = NULL, updated_at = datetime() WHERE (principal, cal_id, id) = (?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "10325688a6601f6205cde9d9e2d582ca87a46607a1d889af155debc3073d78e1"
-}
--- a/.sqlx/query-130986d03d4d78ceeb15aff6f4d6304f0be0100e4bffad9cc3f6c1a2c6c4b297.json
+++ b/.sqlx/query-130986d03d4d78ceeb15aff6f4d6304f0be0100e4bffad9cc3f6c1a2c6c4b297.json
@@ -1,56 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT principal, id, synctoken, displayname, description, deleted_at, push_topic\n                FROM addressbooks\n                WHERE (principal, id) = (?, ?)\n                AND ((deleted_at IS NULL) OR ?) ",
-  "describe": {
-    "columns": [
-      {
-        "name": "principal",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "id",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "synctoken",
-        "ordinal": 2,
-        "type_info": "Integer"
-      },
-      {
-        "name": "displayname",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "description",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "deleted_at",
-        "ordinal": 5,
-        "type_info": "Datetime"
-      },
-      {
-        "name": "push_topic",
-        "ordinal": 6,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      false
-    ]
-  },
-  "hash": "130986d03d4d78ceeb15aff6f4d6304f0be0100e4bffad9cc3f6c1a2c6c4b297"
-}
--- a/.sqlx/query-16a7e0cb4527060339c168ee2528416036e401f75a03100b6bfbee687b978520.json
+++ b/.sqlx/query-16a7e0cb4527060339c168ee2528416036e401f75a03100b6bfbee687b978520.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE addressbooks SET principal = ?, id = ?, displayname = ?, description = ?, push_topic = ?\n                WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 7
-    },
-    "nullable": []
-  },
-  "hash": "16a7e0cb4527060339c168ee2528416036e401f75a03100b6bfbee687b978520"
-}
--- a/.sqlx/query-1ebaf3fd99bee2382abc931a1eeb29badc3aabcf6b8fd58e4cf92721588a9966.json
+++ b/.sqlx/query-1ebaf3fd99bee2382abc931a1eeb29badc3aabcf6b8fd58e4cf92721588a9966.json
@@ -1,38 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT id, displayname AS name, token, created_at AS \"created_at: _\" FROM app_tokens WHERE principal = ?",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "name",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "token",
-        "ordinal": 2,
-        "type_info": "Text"
-      },
-      {
-        "name": "created_at: _",
-        "ordinal": 3,
-        "type_info": "Datetime"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true
-    ]
-  },
-  "hash": "1ebaf3fd99bee2382abc931a1eeb29badc3aabcf6b8fd58e4cf92721588a9966"
-}
--- a/.sqlx/query-23a07f4a732f95ff7483cd1cfe3b74af4fe6b97546a631bc96d03bdc3d764ed0.json
+++ b/.sqlx/query-23a07f4a732f95ff7483cd1cfe3b74af4fe6b97546a631bc96d03bdc3d764ed0.json
@@ -1,44 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            SELECT id, displayname, principal_type, password_hash, json_group_array(member_of) AS \"memberships: Json<Vec<Option<String>>>\"\n            FROM principals\n            LEFT JOIN memberships ON principals.id == memberships.principal\n            GROUP BY principals.id\n        ",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "displayname",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "principal_type",
-        "ordinal": 2,
-        "type_info": "Text"
-      },
-      {
-        "name": "password_hash",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "memberships: Json<Vec<Option<String>>>",
-        "ordinal": 4,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 0
-    },
-    "nullable": [
-      false,
-      true,
-      false,
-      true,
-      true
-    ]
-  },
-  "hash": "23a07f4a732f95ff7483cd1cfe3b74af4fe6b97546a631bc96d03bdc3d764ed0"
-}
--- a/.sqlx/query-2834e16e6a7acb58141a2433f7735d5e2bf913c30f9f3e7bd9fecc7d4376be0f.json
+++ b/.sqlx/query-2834e16e6a7acb58141a2433f7735d5e2bf913c30f9f3e7bd9fecc7d4376be0f.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM calendars WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "2834e16e6a7acb58141a2433f7735d5e2bf913c30f9f3e7bd9fecc7d4376be0f"
-}
--- a/.sqlx/query-2b145d094188fab69371d98520a034c69c0b61583d4e245388d3879d290619d0.json
+++ b/.sqlx/query-2b145d094188fab69371d98520a034c69c0b61583d4e245388d3879d290619d0.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE addressobjects SET deleted_at = NULL, updated_at = datetime() WHERE (principal, addressbook_id, id) = (?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "2b145d094188fab69371d98520a034c69c0b61583d4e245388d3879d290619d0"
-}
--- a/.sqlx/query-2f043f62a7c0eae1023e319f0bc8f35dfdcf6a8247e03b1de3e2cabb2d3ab8ae.json
+++ b/.sqlx/query-2f043f62a7c0eae1023e319f0bc8f35dfdcf6a8247e03b1de3e2cabb2d3ab8ae.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            REPLACE INTO principals\n            (id, displayname, principal_type, password_hash)\n            VALUES (?, ?, ?, ?)\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "2f043f62a7c0eae1023e319f0bc8f35dfdcf6a8247e03b1de3e2cabb2d3ab8ae"
-}
--- a/.sqlx/query-3885219f7e132876fa8bdfd31c0761d54fbcfe2846ffd8e4e94feb40547205be.json
+++ b/.sqlx/query-3885219f7e132876fa8bdfd31c0761d54fbcfe2846ffd8e4e94feb40547205be.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM addressbooks WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "3885219f7e132876fa8bdfd31c0761d54fbcfe2846ffd8e4e94feb40547205be"
-}
--- a/.sqlx/query-395e40a7b3333b79bc2ad50a123d99f74bc2712a16257ee2119dd211fdb61f7e.json
+++ b/.sqlx/query-395e40a7b3333b79bc2ad50a123d99f74bc2712a16257ee2119dd211fdb61f7e.json
@@ -1,26 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT id, vcf FROM addressobjects WHERE (principal, addressbook_id, id) = (?, ?, ?) AND ((deleted_at IS NULL) or ?)",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "vcf",
-        "ordinal": 1,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "395e40a7b3333b79bc2ad50a123d99f74bc2712a16257ee2119dd211fdb61f7e"
-}
--- a/.sqlx/query-3a1dbfbe9d22a62f1830d004548b7e805bcb9fdd24b49c8c9efa93df149b1002.json
+++ b/.sqlx/query-3a1dbfbe9d22a62f1830d004548b7e805bcb9fdd24b49c8c9efa93df149b1002.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM principals WHERE id = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": []
-  },
-  "hash": "3a1dbfbe9d22a62f1830d004548b7e805bcb9fdd24b49c8c9efa93df149b1002"
-}
--- a/.sqlx/query-3e1cca532372e891ab3e604ecb79311d8cd64108d4f238db4c79e9467a3b6d2e.json
+++ b/.sqlx/query-3e1cca532372e891ab3e604ecb79311d8cd64108d4f238db4c79e9467a3b6d2e.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "REPLACE INTO calendarobjects (principal, cal_id, id, ics, first_occurence, last_occurence, etag, object_type) VALUES (?, ?, ?, ?, date(?), date(?), ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 8
-    },
-    "nullable": []
-  },
-  "hash": "3e1cca532372e891ab3e604ecb79311d8cd64108d4f238db4c79e9467a3b6d2e"
-}
--- a/.sqlx/query-41b415bfb07113cab4dc5d556d39d1d040025c33dfc24e276eb0b2a27ea1799f.json
+++ b/.sqlx/query-41b415bfb07113cab4dc5d556d39d1d040025c33dfc24e276eb0b2a27ea1799f.json
@@ -1,26 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n                SELECT DISTINCT object_id, max(0, synctoken) as \"synctoken!: i64\" from addressobjectchangelog\n                WHERE synctoken > ?\n                ORDER BY synctoken ASC\n            ",
-  "describe": {
-    "columns": [
-      {
-        "name": "object_id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "synctoken!: i64",
-        "ordinal": 1,
-        "type_info": "Null"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      null
-    ]
-  },
-  "hash": "41b415bfb07113cab4dc5d556d39d1d040025c33dfc24e276eb0b2a27ea1799f"
-}
--- a/.sqlx/query-508adcac37e0d6751924f65e9aed24c0185ce3b1bc39fd0eab7426f581aafe02.json
+++ b/.sqlx/query-508adcac37e0d6751924f65e9aed24c0185ce3b1bc39fd0eab7426f581aafe02.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT INTO addressbooks (principal, id, displayname, description, push_topic)\n                VALUES (?, ?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "508adcac37e0d6751924f65e9aed24c0185ce3b1bc39fd0eab7426f581aafe02"
-}
--- a/.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json
+++ b/.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json
@@ -1,12 +0,0 @@
-{
-  "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"
-}
--- a/.sqlx/query-526c4a9326db7f026eee15cca358943b0546fe56fc09204f1dfe90e2614f99b9.json
+++ b/.sqlx/query-526c4a9326db7f026eee15cca358943b0546fe56fc09204f1dfe90e2614f99b9.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n        INSERT INTO addressobjectchangelog (principal, addressbook_id, object_id, \"operation\", synctoken)\n        VALUES (?1, ?2, ?3, ?4, (\n            SELECT synctoken FROM addressbooks WHERE (principal, id) = (?1, ?2)\n        ))",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "526c4a9326db7f026eee15cca358943b0546fe56fc09204f1dfe90e2614f99b9"
-}
--- a/.sqlx/query-54c9c0e36a52e6963f11c6aa27f13aafb4204b8aa34b664fd825bd447db80e86.json
+++ b/.sqlx/query-54c9c0e36a52e6963f11c6aa27f13aafb4204b8aa34b664fd825bd447db80e86.json
@@ -1,26 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT id, ics FROM calendarobjects WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "ics",
-        "ordinal": 1,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "54c9c0e36a52e6963f11c6aa27f13aafb4204b8aa34b664fd825bd447db80e86"
-}
--- a/.sqlx/query-557344035d762f2d385e505c15288ab9c89c1572f06e7fb61073e335a801b9db.json
+++ b/.sqlx/query-557344035d762f2d385e505c15288ab9c89c1572f06e7fb61073e335a801b9db.json
@@ -1,26 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT id, vcf FROM addressobjects WHERE principal = ? AND addressbook_id = ? AND deleted_at IS NULL",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "vcf",
-        "ordinal": 1,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "557344035d762f2d385e505c15288ab9c89c1572f06e7fb61073e335a801b9db"
-}
--- a/.sqlx/query-6327bee90e5df01536a0ddb15adcc37af3027f6902aa3786365c5ab2fbf06bda.json
+++ b/.sqlx/query-6327bee90e5df01536a0ddb15adcc37af3027f6902aa3786365c5ab2fbf06bda.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT INTO calendarobjects (principal, cal_id, id, ics, first_occurence, last_occurence, etag, object_type) VALUES (?, ?, ?, ?, date(?), date(?), ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 8
-    },
-    "nullable": []
-  },
-  "hash": "6327bee90e5df01536a0ddb15adcc37af3027f6902aa3786365c5ab2fbf06bda"
-}
--- a/.sqlx/query-69b92e393e55b0d49d1671abf53d06551452846dd94d54ed67d85eb3ace6b568.json
+++ b/.sqlx/query-69b92e393e55b0d49d1671abf53d06551452846dd94d54ed67d85eb3ace6b568.json
@@ -1,20 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n        UPDATE calendars\n        SET synctoken = synctoken + 1\n        WHERE (principal, id) = (?1, ?2)\n        RETURNING synctoken",
-  "describe": {
-    "columns": [
-      {
-        "name": "synctoken",
-        "ordinal": 0,
-        "type_info": "Integer"
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "69b92e393e55b0d49d1671abf53d06551452846dd94d54ed67d85eb3ace6b568"
-}
--- a/.sqlx/query-6d08d3a014743da9b445ab012437ec11f81fd86d3b02fc1df07a036c6b47ace2.json
+++ b/.sqlx/query-6d08d3a014743da9b445ab012437ec11f81fd86d3b02fc1df07a036c6b47ace2.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT OR REPLACE INTO davpush_subscriptions (id, topic, expiration, push_resource, public_key, public_key_type, auth_secret) VALUES (?, ?, ?, ?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 7
-    },
-    "nullable": []
-  },
-  "hash": "6d08d3a014743da9b445ab012437ec11f81fd86d3b02fc1df07a036c6b47ace2"
-}
--- a/.sqlx/query-77ad562b6d78115ebb726d58cf1e4de69df169c1872cb452488ff8c43ed983a9.json
+++ b/.sqlx/query-77ad562b6d78115ebb726d58cf1e4de69df169c1872cb452488ff8c43ed983a9.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n        INSERT INTO calendarobjectchangelog (principal, cal_id, object_id, \"operation\", synctoken)\n        VALUES (?1, ?2, ?3, ?4, (\n            SELECT synctoken FROM calendars WHERE (principal, id) = (?1, ?2)\n        ))",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "77ad562b6d78115ebb726d58cf1e4de69df169c1872cb452488ff8c43ed983a9"
-}
--- a/.sqlx/query-7d4348f04ea5ac82e0f362240fb677740288c963c24b85de11bad011ec5da4bc.json
+++ b/.sqlx/query-7d4348f04ea5ac82e0f362240fb677740288c963c24b85de11bad011ec5da4bc.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM addressobjects WHERE addressbook_id = ? AND id = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "7d4348f04ea5ac82e0f362240fb677740288c963c24b85de11bad011ec5da4bc"
-}
--- a/.sqlx/query-7e874304170bef19ceb6f96b3d9803ce6d4553cc2bd57b05d1e546e857f995cf.json
+++ b/.sqlx/query-7e874304170bef19ceb6f96b3d9803ce6d4553cc2bd57b05d1e546e857f995cf.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendarobjects SET deleted_at = datetime(), updated_at = datetime() WHERE (principal, cal_id, id) = (?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "7e874304170bef19ceb6f96b3d9803ce6d4553cc2bd57b05d1e546e857f995cf"
-}
--- a/.sqlx/query-809600b79c012e77c5efabe5d355a8b188f23826a723030807dedc96fd24fdcc.json
+++ b/.sqlx/query-809600b79c012e77c5efabe5d355a8b188f23826a723030807dedc96fd24fdcc.json
@@ -1,56 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT id, topic, expiration, push_resource, public_key, public_key_type, auth_secret\n                FROM davpush_subscriptions\n                WHERE (topic) = (?)",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "topic",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "expiration",
-        "ordinal": 2,
-        "type_info": "Datetime"
-      },
-      {
-        "name": "push_resource",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "public_key",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "public_key_type",
-        "ordinal": 5,
-        "type_info": "Text"
-      },
-      {
-        "name": "auth_secret",
-        "ordinal": 6,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "809600b79c012e77c5efabe5d355a8b188f23826a723030807dedc96fd24fdcc"
-}
--- a/.sqlx/query-879e2717335db3b04884fc91173c8507272f1804b27b6a7f61cbe1fbb01265cd.json
+++ b/.sqlx/query-879e2717335db3b04884fc91173c8507272f1804b27b6a7f61cbe1fbb01265cd.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM memberships WHERE (principal, member_of) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "879e2717335db3b04884fc91173c8507272f1804b27b6a7f61cbe1fbb01265cd"
-}
--- a/.sqlx/query-95dce97b2e3224c327690c36777e3ece84a9529551696198b745dd8c743c8a38.json
+++ b/.sqlx/query-95dce97b2e3224c327690c36777e3ece84a9529551696198b745dd8c743c8a38.json
@@ -1,44 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            SELECT id, displayname, principal_type, password_hash, json_group_array(member_of) AS \"memberships: Json<Vec<Option<String>>>\"\n            FROM (SELECT * FROM principals WHERE id = ?) AS principals\n            LEFT JOIN memberships ON principals.id == memberships.principal\n            GROUP BY principals.id\n        ",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "displayname",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "principal_type",
-        "ordinal": 2,
-        "type_info": "Text"
-      },
-      {
-        "name": "password_hash",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "memberships: Json<Vec<Option<String>>>",
-        "ordinal": 4,
-        "type_info": "Null"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      true,
-      false,
-      true,
-      null
-    ]
-  },
-  "hash": "95dce97b2e3224c327690c36777e3ece84a9529551696198b745dd8c743c8a38"
-}
--- a/.sqlx/query-98dba6ddce38d166ef325bbce6055d83fb0092619262c281a271bdc783a0aed9.json
+++ b/.sqlx/query-98dba6ddce38d166ef325bbce6055d83fb0092619262c281a271bdc783a0aed9.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "REPLACE INTO addressobjects (principal, addressbook_id, id, vcf) VALUES (?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "98dba6ddce38d166ef325bbce6055d83fb0092619262c281a271bdc783a0aed9"
-}
--- a/.sqlx/query-9be5d6df7d30a9a85aece59be810bbbb203bab874860aa05eb311259e4baaf05.json
+++ b/.sqlx/query-9be5d6df7d30a9a85aece59be810bbbb203bab874860aa05eb311259e4baaf05.json
@@ -1,56 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT principal, id, synctoken, displayname, description, deleted_at, push_topic\n                FROM addressbooks\n                WHERE principal = ? AND deleted_at IS NULL",
-  "describe": {
-    "columns": [
-      {
-        "name": "principal",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "id",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "synctoken",
-        "ordinal": 2,
-        "type_info": "Integer"
-      },
-      {
-        "name": "displayname",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "description",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "deleted_at",
-        "ordinal": 5,
-        "type_info": "Datetime"
-      },
-      {
-        "name": "push_topic",
-        "ordinal": 6,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      false
-    ]
-  },
-  "hash": "9be5d6df7d30a9a85aece59be810bbbb203bab874860aa05eb311259e4baaf05"
-}
--- a/.sqlx/query-9f930775043a6d4571a8ffd5a981cadf7c51f3f11a189f8461505abec31076e6.json
+++ b/.sqlx/query-9f930775043a6d4571a8ffd5a981cadf7c51f3f11a189f8461505abec31076e6.json
@@ -1,104 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT *\n                FROM calendars\n                WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [
-      {
-        "name": "principal",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "id",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "synctoken",
-        "ordinal": 2,
-        "type_info": "Integer"
-      },
-      {
-        "name": "displayname",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "description",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "order",
-        "ordinal": 5,
-        "type_info": "Integer"
-      },
-      {
-        "name": "color",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "timezone",
-        "ordinal": 7,
-        "type_info": "Text"
-      },
-      {
-        "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": "push_topic",
-        "ordinal": 11,
-        "type_info": "Text"
-      },
-      {
-        "name": "comp_event",
-        "ordinal": 12,
-        "type_info": "Bool"
-      },
-      {
-        "name": "comp_todo",
-        "ordinal": 13,
-        "type_info": "Bool"
-      },
-      {
-        "name": "comp_journal",
-        "ordinal": 14,
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "9f930775043a6d4571a8ffd5a981cadf7c51f3f11a189f8461505abec31076e6"
-}
--- a/.sqlx/query-a4371f228f94afd8e6f4ac4b0f7d95b6bf86268b64e714fa7ca587eae9e5df15.json
+++ b/.sqlx/query-a4371f228f94afd8e6f4ac4b0f7d95b6bf86268b64e714fa7ca587eae9e5df15.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendars SET deleted_at = datetime() WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "a4371f228f94afd8e6f4ac4b0f7d95b6bf86268b64e714fa7ca587eae9e5df15"
-}
--- a/.sqlx/query-a8b4258868d238d9c226c44aec8c3c4d90d8e3ca526d4d60b340e868bbfd9ddb.json
+++ b/.sqlx/query-a8b4258868d238d9c226c44aec8c3c4d90d8e3ca526d4d60b340e868bbfd9ddb.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT INTO addressobjects (principal, addressbook_id, id, vcf) VALUES (?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "a8b4258868d238d9c226c44aec8c3c4d90d8e3ca526d4d60b340e868bbfd9ddb"
-}
--- a/.sqlx/query-ac0f9e29ea8079c6900ffb0ebde699309fe8db1ac9f95c58bc9ce051b7d70299.json
+++ b/.sqlx/query-ac0f9e29ea8079c6900ffb0ebde699309fe8db1ac9f95c58bc9ce051b7d70299.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE addressobjects SET deleted_at = datetime(), updated_at = datetime() WHERE (principal, addressbook_id, id) = (?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "ac0f9e29ea8079c6900ffb0ebde699309fe8db1ac9f95c58bc9ce051b7d70299"
-}
--- a/.sqlx/query-b89be55d6f76591f68520bbdf0ebb6d688b01ee63ae36936692cf1b4f434c7ee.json
+++ b/.sqlx/query-b89be55d6f76591f68520bbdf0ebb6d688b01ee63ae36936692cf1b4f434c7ee.json
@@ -1,20 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n        UPDATE addressbooks\n        SET synctoken = synctoken + 1\n        WHERE (principal, id) = (?1, ?2)\n        RETURNING synctoken",
-  "describe": {
-    "columns": [
-      {
-        "name": "synctoken",
-        "ordinal": 0,
-        "type_info": "Integer"
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "b89be55d6f76591f68520bbdf0ebb6d688b01ee63ae36936692cf1b4f434c7ee"
-}
--- a/.sqlx/query-c550dbf3d5ce7069f28d767ea9045e477ef8d29d6186851760757a06dec42339.json
+++ b/.sqlx/query-c550dbf3d5ce7069f28d767ea9045e477ef8d29d6186851760757a06dec42339.json
@@ -1,26 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT id, ics FROM calendarobjects\n                WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL\n                    AND (last_occurence IS NULL OR ? IS NULL OR last_occurence >= date(?))\n                    AND (first_occurence IS NULL OR ? IS NULL OR first_occurence <= date(?))\n            ",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "ics",
-        "ordinal": 1,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 6
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "c550dbf3d5ce7069f28d767ea9045e477ef8d29d6186851760757a06dec42339"
-}
--- a/.sqlx/query-cbe4be47b2ca1eba485de258f522dec14540a6a9bf383fcde294e8fe14160f22.json
+++ b/.sqlx/query-cbe4be47b2ca1eba485de258f522dec14540a6a9bf383fcde294e8fe14160f22.json
@@ -1,26 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n                SELECT DISTINCT object_id, max(0, synctoken) as \"synctoken!: i64\" from calendarobjectchangelog\n                WHERE synctoken > ?\n                ORDER BY synctoken ASC\n            ",
-  "describe": {
-    "columns": [
-      {
-        "name": "object_id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "synctoken!: i64",
-        "ordinal": 1,
-        "type_info": "Null"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      null
-    ]
-  },
-  "hash": "cbe4be47b2ca1eba485de258f522dec14540a6a9bf383fcde294e8fe14160f22"
-}
--- a/.sqlx/query-cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237.json
+++ b/.sqlx/query-cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237.json
@@ -1,104 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT *\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
-  "describe": {
-    "columns": [
-      {
-        "name": "principal",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "id",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "synctoken",
-        "ordinal": 2,
-        "type_info": "Integer"
-      },
-      {
-        "name": "displayname",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "description",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "order",
-        "ordinal": 5,
-        "type_info": "Integer"
-      },
-      {
-        "name": "color",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "timezone",
-        "ordinal": 7,
-        "type_info": "Text"
-      },
-      {
-        "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": "push_topic",
-        "ordinal": 11,
-        "type_info": "Text"
-      },
-      {
-        "name": "comp_event",
-        "ordinal": 12,
-        "type_info": "Bool"
-      },
-      {
-        "name": "comp_todo",
-        "ordinal": 13,
-        "type_info": "Bool"
-      },
-      {
-        "name": "comp_journal",
-        "ordinal": 14,
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237"
-}
--- a/.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json
+++ b/.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json
@@ -1,104 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT *\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NULL",
-  "describe": {
-    "columns": [
-      {
-        "name": "principal",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "id",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "synctoken",
-        "ordinal": 2,
-        "type_info": "Integer"
-      },
-      {
-        "name": "displayname",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "description",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "order",
-        "ordinal": 5,
-        "type_info": "Integer"
-      },
-      {
-        "name": "color",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "timezone",
-        "ordinal": 7,
-        "type_info": "Text"
-      },
-      {
-        "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": "push_topic",
-        "ordinal": 11,
-        "type_info": "Text"
-      },
-      {
-        "name": "comp_event",
-        "ordinal": 12,
-        "type_info": "Bool"
-      },
-      {
-        "name": "comp_todo",
-        "ordinal": 13,
-        "type_info": "Bool"
-      },
-      {
-        "name": "comp_journal",
-        "ordinal": 14,
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1"
-}
--- a/.sqlx/query-d2f7423e2e8f97607f6664200990dcadb927445880ec6edffba3b5aedf4e199b.json
+++ b/.sqlx/query-d2f7423e2e8f97607f6664200990dcadb927445880ec6edffba3b5aedf4e199b.json
@@ -1,26 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT id, ics FROM calendarobjects WHERE (principal, cal_id, id) = (?, ?, ?)",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "ics",
-        "ordinal": 1,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "d2f7423e2e8f97607f6664200990dcadb927445880ec6edffba3b5aedf4e199b"
-}
--- a/.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json
+++ b/.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json
@@ -1,12 +0,0 @@
-{
-  "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"
-}
--- a/.sqlx/query-e5cf59ade11c09d90899cc9f87754a78a0ca9f7781fd252ebdaf4d2180fca3ba.json
+++ b/.sqlx/query-e5cf59ade11c09d90899cc9f87754a78a0ca9f7781fd252ebdaf4d2180fca3ba.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM calendarobjects WHERE cal_id = ? AND id = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "e5cf59ade11c09d90899cc9f87754a78a0ca9f7781fd252ebdaf4d2180fca3ba"
-}
--- a/.sqlx/query-e5ded4814aae1fc033bb90d27c745f76d3799958d929e8e8d16aa3ceff98e72d.json
+++ b/.sqlx/query-e5ded4814aae1fc033bb90d27c745f76d3799958d929e8e8d16aa3ceff98e72d.json
@@ -1,56 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT principal, id, synctoken, displayname, description, deleted_at, push_topic\n                FROM addressbooks\n                WHERE principal = ? AND deleted_at IS NOT NULL",
-  "describe": {
-    "columns": [
-      {
-        "name": "principal",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "id",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "synctoken",
-        "ordinal": 2,
-        "type_info": "Integer"
-      },
-      {
-        "name": "displayname",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "description",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "deleted_at",
-        "ordinal": 5,
-        "type_info": "Datetime"
-      },
-      {
-        "name": "push_topic",
-        "ordinal": 6,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      false
-    ]
-  },
-  "hash": "e5ded4814aae1fc033bb90d27c745f76d3799958d929e8e8d16aa3ceff98e72d"
-}
--- a/.sqlx/query-e912be3352702bbf035b3ee6e9f239bf75a1ffef20211f1b1e895a67a2310960.json
+++ b/.sqlx/query-e912be3352702bbf035b3ee6e9f239bf75a1ffef20211f1b1e895a67a2310960.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM davpush_subscriptions WHERE id = ? ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": []
-  },
-  "hash": "e912be3352702bbf035b3ee6e9f239bf75a1ffef20211f1b1e895a67a2310960"
-}
--- a/.sqlx/query-e947709ba03b108765082d1c4cff3dd8cb485fba5819ac914e20cb8e97037da9.json
+++ b/.sqlx/query-e947709ba03b108765082d1c4cff3dd8cb485fba5819ac914e20cb8e97037da9.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "REPLACE INTO memberships (principal, member_of) VALUES (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "e947709ba03b108765082d1c4cff3dd8cb485fba5819ac914e20cb8e97037da9"
-}
--- a/.sqlx/query-ef6cf801df2237b82b55754f1b0a5da51089810fe7a0feb0d68ea801b4e2721c.json
+++ b/.sqlx/query-ef6cf801df2237b82b55754f1b0a5da51089810fe7a0feb0d68ea801b4e2721c.json
@@ -1,56 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT id, topic, expiration, push_resource, public_key, public_key_type, auth_secret\n                FROM davpush_subscriptions\n                WHERE (id) = (?)",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "topic",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "expiration",
-        "ordinal": 2,
-        "type_info": "Datetime"
-      },
-      {
-        "name": "push_resource",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "public_key",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "public_key_type",
-        "ordinal": 5,
-        "type_info": "Text"
-      },
-      {
-        "name": "auth_secret",
-        "ordinal": 6,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "ef6cf801df2237b82b55754f1b0a5da51089810fe7a0feb0d68ea801b4e2721c"
-}
--- a/.sqlx/query-fbd776efdbacf6ce039b5d9760b0de181a6f4e066c52bcac4c106118f5435fe7.json
+++ b/.sqlx/query-fbd776efdbacf6ce039b5d9760b0de181a6f4e066c52bcac4c106118f5435fe7.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE addressbooks SET deleted_at = datetime() WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "fbd776efdbacf6ce039b5d9760b0de181a6f4e066c52bcac4c106118f5435fe7"
-}
--- a/.sqlx/query-fcc493f5e491abdac2c2d7d5f636c770e449daf8f5ab4873950ab126edfcce7b.json
+++ b/.sqlx/query-fcc493f5e491abdac2c2d7d5f636c770e449daf8f5ab4873950ab126edfcce7b.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE addressbooks SET deleted_at = NULL WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "fcc493f5e491abdac2c2d7d5f636c770e449daf8f5ab4873950ab126edfcce7b"
-}
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2703,6 +2703,8 @@ dependencies = [
 "rustical_xml",
 "serde",
 "sha2",
+ "strum",
+ "strum_macros",
 "thiserror 2.0.12",
 "tokio",
 "tower",
@@ -2733,6 +2735,8 @@ dependencies = [
 "rustical_store",
 "rustical_xml",
 "serde",
+ "strum",
+ "strum_macros",
 "thiserror 2.0.12",
 "tokio",
 "tower",
@@ -2758,6 +2762,7 @@ dependencies = [
 "quick-xml",
 "rustical_xml",
 "serde",
+ "strum",
 "thiserror 2.0.12",
 "tokio",
 "tower",
@@ -3435,6 +3440,25 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"

+[[package]]
+name = "strum"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+
+[[package]]
+name = "strum_macros"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn",
+]
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
--- a/README.md
+++ b/README.md
@@ -29,4 +29,4 @@ a CalDAV/CardDAV server
 - DAVx5,
 - GNOME Accounts, GNOME Calendar, GNOME Contacts
 - Evolution
- Apple Calendar (known issue: If a user is member of multiple groups then Apple Calendar just randomly selects a calendar home)
+- Apple Calendar
--- a/crates/caldav/Cargo.toml
+++ b/crates/caldav/Cargo.toml
@@ -35,3 +35,5 @@ rustical_ical.workspace = true
 http.workspace = true
 headers.workspace = true
 tower-http.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
--- a/crates/caldav/src/calendar/prop.rs
+++ b/crates/caldav/src/calendar/prop.rs
@@ -1,6 +1,7 @@
 use derive_more::derive::{From, Into};
 use rustical_ical::CalendarObjectType;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
+use strum_macros::VariantArray;

 #[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, From, Into)]
 pub struct SupportedCalendarComponent {
@@ -58,39 +59,12 @@ pub struct SupportedCalendarData {
    calendar_data: CalendarData,
 }

-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, VariantArray)]
 pub enum ReportMethod {
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
    CalendarQuery,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
    CalendarMultiget,
+    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    SyncCollection,
 }
-
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
-pub struct ReportWrapper {
-    report: ReportMethod,
-}
-
-// RFC 3253 section-3.1.5
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
-pub struct SupportedReportSet {
-    #[xml(flatten)]
-    supported_report: Vec<ReportWrapper>,
-}
-
-impl Default for SupportedReportSet {
-    fn default() -> Self {
-        Self {
-            supported_report: vec![
-                ReportWrapper {
-                    report: ReportMethod::CalendarQuery,
-                },
-                ReportWrapper {
-                    report: ReportMethod::CalendarMultiget,
-                },
-                ReportWrapper {
-                    report: ReportMethod::SyncCollection,
-                },
-            ],
-        }
-    }
-}
--- a/crates/caldav/src/calendar/resource.rs
+++ b/crates/caldav/src/calendar/resource.rs
@@ -1,5 +1,6 @@
-use super::prop::{SupportedCalendarComponentSet, SupportedCalendarData, SupportedReportSet};
+use super::prop::{SupportedCalendarComponentSet, SupportedCalendarData};
 use crate::Error;
+use crate::calendar::prop::ReportMethod;
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
 use rustical_dav::extensions::{
@@ -7,7 +8,7 @@ use rustical_dav::extensions::{
 };
 use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
-use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
+use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner, SupportedReportSet};
 use rustical_dav_push::DavPushExtension;
 use rustical_ical::CalDateTime;
 use rustical_store::Calendar;
@@ -40,8 +41,8 @@ pub enum CalendarProp {
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    MaxResourceSize(i64),
    #[xml(skip_deserializing)]
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    SupportedReportSet(SupportedReportSet),
+    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
+    SupportedReportSet(SupportedReportSet<ReportMethod>),
    #[xml(ns = "rustical_dav::namespace::NS_CALENDARSERVER")]
    Source(Option<HrefElement>),
    #[xml(skip_deserializing)]
@@ -150,7 +151,7 @@ impl Resource for CalendarResource {
                }
                CalendarPropName::MaxResourceSize => CalendarProp::MaxResourceSize(10000000),
                CalendarPropName::SupportedReportSet => {
-                    CalendarProp::SupportedReportSet(SupportedReportSet::default())
+                    CalendarProp::SupportedReportSet(SupportedReportSet::all())
                }
                CalendarPropName::Source => CalendarProp::Source(
                    self.cal.subscription_url.to_owned().map(HrefElement::from),
--- a/crates/caldav/src/calendar/service.rs
+++ b/crates/caldav/src/calendar/service.rs
@@ -50,7 +50,7 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
    type Principal = User;
    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,
--- a/crates/caldav/src/principal/mod.rs
+++ b/crates/caldav/src/principal/mod.rs
@@ -2,7 +2,9 @@ use crate::Error;
 use rustical_dav::extensions::CommonPropertiesExtension;
 use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
-use rustical_dav::xml::{Resourcetype, ResourcetypeInner};
+use rustical_dav::xml::{
+    GroupMemberSet, GroupMembership, Resourcetype, ResourcetypeInner, SupportedReportSet,
+};
 use rustical_store::auth::User;

 mod service;
@@ -13,6 +15,7 @@ pub use prop::*;
 #[derive(Clone)]
 pub struct PrincipalResource {
    principal: User,
+    members: Vec<String>,
 }

 impl ResourceName for PrincipalResource {
@@ -32,6 +35,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",
+            ),
        ])
    }

@@ -43,14 +51,6 @@ impl Resource for PrincipalResource {
    ) -> Result<Self::Prop, Self::Error> {
        let principal_url = puri.principal_uri(&self.principal.id);

-        let home_set = CalendarHomeSet(
-            self.principal
-                .memberships()
-                .into_iter()
-                .map(|principal| puri.principal_uri(principal).into())
-                .collect(),
-        );
-
        Ok(match prop {
            PrincipalPropWrapperName::Principal(prop) => {
                PrincipalPropWrapper::Principal(match prop {
@@ -60,10 +60,20 @@ impl Resource for PrincipalResource {
                    PrincipalPropName::PrincipalUrl => {
                        PrincipalProp::PrincipalUrl(principal_url.into())
                    }
-                    PrincipalPropName::CalendarHomeSet => PrincipalProp::CalendarHomeSet(home_set),
+                    PrincipalPropName::CalendarHomeSet => {
+                        PrincipalProp::CalendarHomeSet(principal_url.into())
+                    }
                    PrincipalPropName::CalendarUserAddressSet => {
                        PrincipalProp::CalendarUserAddressSet(principal_url.into())
                    }
+                    PrincipalPropName::GroupMemberSet => {
+                        PrincipalProp::GroupMemberSet(GroupMemberSet(
+                            self.members
+                                .iter()
+                                .map(|principal| puri.principal_uri(principal).into())
+                                .collect(),
+                        ))
+                    }
                    PrincipalPropName::GroupMembership => {
                        PrincipalProp::GroupMembership(GroupMembership(
                            self.principal
@@ -74,10 +84,11 @@ impl Resource for PrincipalResource {
                        ))
                    }
                    PrincipalPropName::AlternateUriSet => PrincipalProp::AlternateUriSet,
-                    PrincipalPropName::PrincipalCollectionSet => {
-                        PrincipalProp::PrincipalCollectionSet(PrincipalCollectionSet(
-                            puri.principal_collection().into(),
-                        ))
+                    // PrincipalPropName::PrincipalCollectionSet => {
+                    //     PrincipalProp::PrincipalCollectionSet(puri.principal_collection().into())
+                    // }
+                    PrincipalPropName::SupportedReportSet => {
+                        PrincipalProp::SupportedReportSet(SupportedReportSet::all())
                    }
                })
            }
--- a/crates/caldav/src/principal/prop.rs
+++ b/crates/caldav/src/principal/prop.rs
@@ -1,6 +1,10 @@
-use rustical_dav::{extensions::CommonPropertiesProp, xml::HrefElement};
+use rustical_dav::{
+    extensions::CommonPropertiesProp,
+    xml::{GroupMemberSet, GroupMembership, HrefElement, SupportedReportSet},
+};
 use rustical_store::auth::user::PrincipalType;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
+use strum_macros::VariantArray;

 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropName")]
@@ -16,14 +20,18 @@ pub enum PrincipalProp {
    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 = b"alternate-URI-set")]
    AlternateUriSet,
-    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
-    PrincipalCollectionSet(PrincipalCollectionSet),
+    // #[xml(ns = "rustical_dav::namespace::NS_DAV")]
+    // PrincipalCollectionSet(HrefElement),
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", skip_deserializing)]
+    SupportedReportSet(SupportedReportSet<ReportMethod>),

    // CalDAV (RFC 4791)
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    CalendarHomeSet(CalendarHomeSet),
+    CalendarHomeSet(HrefElement),
 }

 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
@@ -33,11 +41,9 @@ pub enum PrincipalPropWrapper {
    Common(CommonPropertiesProp),
 }

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
-pub struct CalendarHomeSet(#[xml(ty = "untagged", flatten)] pub(super) Vec<HrefElement>);
-
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
-pub struct GroupMembership(#[xml(ty = "untagged", flatten)] pub(super) Vec<HrefElement>);
-
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
-pub struct PrincipalCollectionSet(#[xml(ty = "untagged")] pub(super) HrefElement);
+#[derive(XmlSerialize, PartialEq, Clone, VariantArray)]
+pub enum ReportMethod {
+    // We don't actually support principal-match
+    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
+    PrincipalMatch,
+}
--- a/crates/caldav/src/principal/service.rs
+++ b/crates/caldav/src/principal/service.rs
@@ -43,7 +43,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
    type Principal = User;
    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,
@@ -54,7 +54,10 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
            .get_principal(principal)
            .await?
            .ok_or(crate::Error::NotFound)?;
-        Ok(PrincipalResource { principal: user })
+        Ok(PrincipalResource {
+            members: self.auth_provider.list_members(&user.id).await?,
+            principal: user,
+        })
    }

    async fn get_members(
--- a/crates/carddav/Cargo.toml
+++ b/crates/carddav/Cargo.toml
@@ -32,3 +32,5 @@ http.workspace = true
 tower-http.workspace = true
 percent-encoding.workspace = true
 ical.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
--- a/crates/carddav/src/addressbook/prop.rs
+++ b/crates/carddav/src/addressbook/prop.rs
@@ -1,6 +1,10 @@
-use rustical_dav::extensions::{CommonPropertiesProp, SyncTokenExtensionProp};
+use rustical_dav::{
+    extensions::{CommonPropertiesProp, SyncTokenExtensionProp},
+    xml::SupportedReportSet,
+};
 use rustical_dav_push::DavPushExtensionProp;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
+use strum_macros::VariantArray;

 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressbookPropName")]
@@ -10,8 +14,8 @@ pub enum AddressbookProp {
    AddressbookDescription(Option<String>),
    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", skip_deserializing)]
    SupportedAddressData(SupportedAddressData),
-    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", skip_deserializing)]
-    SupportedReportSet(SupportedReportSet),
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", skip_deserializing)]
+    SupportedReportSet(SupportedReportSet<ReportMethod>),
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    MaxResourceSize(i64),
 }
@@ -56,37 +60,10 @@ impl Default for SupportedAddressData {
    }
 }

-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, VariantArray)]
 pub enum ReportMethod {
    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
    AddressbookMultiget,
+    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    SyncCollection,
 }
-
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
-pub struct SupportedReportWrapper {
-    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
-    report: ReportMethod,
-}
-
-// RFC 3253 section-3.1.5
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
-pub struct SupportedReportSet {
-    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", flatten)]
-    supported_report: &'static [SupportedReportWrapper],
-}
-
-impl Default for SupportedReportSet {
-    fn default() -> Self {
-        Self {
-            supported_report: &[
-                SupportedReportWrapper {
-                    report: ReportMethod::AddressbookMultiget,
-                },
-                SupportedReportWrapper {
-                    report: ReportMethod::SyncCollection,
-                },
-            ],
-        }
-    }
-}
--- a/crates/carddav/src/addressbook/resource.rs
+++ b/crates/carddav/src/addressbook/resource.rs
@@ -1,4 +1,4 @@
-use super::prop::{SupportedAddressData, SupportedReportSet};
+use super::prop::SupportedAddressData;
 use crate::Error;
 use crate::addressbook::prop::{
    AddressbookProp, AddressbookPropName, AddressbookPropWrapper, AddressbookPropWrapperName,
@@ -7,7 +7,7 @@ use derive_more::derive::{From, Into};
 use rustical_dav::extensions::{CommonPropertiesExtension, SyncTokenExtension};
 use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
-use rustical_dav::xml::{Resourcetype, ResourcetypeInner};
+use rustical_dav::xml::{Resourcetype, ResourcetypeInner, SupportedReportSet};
 use rustical_dav_push::DavPushExtension;
 use rustical_store::Addressbook;
 use rustical_store::auth::User;
@@ -60,7 +60,7 @@ impl Resource for AddressbookResource {
                        AddressbookProp::MaxResourceSize(10000000)
                    }
                    AddressbookPropName::SupportedReportSet => {
-                        AddressbookProp::SupportedReportSet(SupportedReportSet::default())
+                        AddressbookProp::SupportedReportSet(SupportedReportSet::all())
                    }
                    AddressbookPropName::AddressbookDescription => {
                        AddressbookProp::AddressbookDescription(self.0.description.to_owned())
--- a/crates/carddav/src/principal/mod.rs
+++ b/crates/carddav/src/principal/mod.rs
@@ -2,7 +2,9 @@ use crate::Error;
 use rustical_dav::extensions::CommonPropertiesExtension;
 use rustical_dav::privileges::UserPrivilegeSet;
 use rustical_dav::resource::{PrincipalUri, Resource, ResourceName};
-use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
+use rustical_dav::xml::{
+    GroupMemberSet, GroupMembership, HrefElement, Resourcetype, ResourcetypeInner,
+};
 use rustical_store::auth::User;

 mod service;
@@ -13,6 +15,7 @@ pub use prop::*;
 #[derive(Debug, Clone)]
 pub struct PrincipalResource {
    principal: User,
+    members: Vec<String>,
 }

 impl ResourceName for PrincipalResource {
@@ -41,23 +44,14 @@ impl Resource for PrincipalResource {
        user: &User,
        prop: &PrincipalPropWrapperName,
    ) -> Result<Self::Prop, Self::Error> {
-        let principal_href = HrefElement::new(puri.principal_uri(&user.id));
-
-        let home_set = AddressbookHomeSet(
-            self.principal
-                .memberships()
-                .into_iter()
-                .map(|principal| puri.principal_uri(principal))
-                .map(HrefElement::new)
-                .collect(),
-        );
+        let principal_href = HrefElement::new(puri.principal_uri(&self.principal.id));

        Ok(match prop {
            PrincipalPropWrapperName::Principal(prop) => {
                PrincipalPropWrapper::Principal(match prop {
                    PrincipalPropName::PrincipalUrl => PrincipalProp::PrincipalUrl(principal_href),
                    PrincipalPropName::AddressbookHomeSet => {
-                        PrincipalProp::AddressbookHomeSet(home_set)
+                        PrincipalProp::AddressbookHomeSet(principal_href)
                    }
                    PrincipalPropName::PrincipalAddress => PrincipalProp::PrincipalAddress(None),
                    PrincipalPropName::GroupMembership => {
@@ -69,11 +63,17 @@ impl Resource for PrincipalResource {
                                .collect(),
                        ))
                    }
+                    PrincipalPropName::GroupMemberSet => {
+                        PrincipalProp::GroupMemberSet(GroupMemberSet(
+                            self.members
+                                .iter()
+                                .map(|principal| puri.principal_uri(principal).into())
+                                .collect(),
+                        ))
+                    }
                    PrincipalPropName::AlternateUriSet => PrincipalProp::AlternateUriSet,
                    PrincipalPropName::PrincipalCollectionSet => {
-                        PrincipalProp::PrincipalCollectionSet(PrincipalCollectionSet(
-                            puri.principal_collection().into(),
-                        ))
+                        PrincipalProp::PrincipalCollectionSet(puri.principal_collection().into())
                    }
                })
            }
--- a/crates/carddav/src/principal/prop.rs
+++ b/crates/carddav/src/principal/prop.rs
@@ -1,4 +1,7 @@
-use rustical_dav::{extensions::CommonPropertiesProp, xml::HrefElement};
+use rustical_dav::{
+    extensions::CommonPropertiesProp,
+    xml::{GroupMemberSet, GroupMembership, HrefElement},
+};
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};

 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
@@ -10,14 +13,16 @@ pub enum PrincipalProp {
    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 = b"alternate-URI-set")]
    AlternateUriSet,
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
-    PrincipalCollectionSet(PrincipalCollectionSet),
+    PrincipalCollectionSet(HrefElement),

    // CardDAV (RFC 6352)
    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
-    AddressbookHomeSet(AddressbookHomeSet),
+    AddressbookHomeSet(HrefElement),
    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
    PrincipalAddress(Option<HrefElement>),
 }
@@ -28,12 +33,3 @@ pub enum PrincipalPropWrapper {
    Principal(PrincipalProp),
    Common(CommonPropertiesProp),
 }
-
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
-pub struct AddressbookHomeSet(#[xml(ty = "untagged", flatten)] pub(super) Vec<HrefElement>);
-
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
-pub struct GroupMembership(#[xml(ty = "untagged", flatten)] pub(super) Vec<HrefElement>);
-
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
-pub struct PrincipalCollectionSet(#[xml(ty = "untagged")] pub(super) HrefElement);
--- a/crates/carddav/src/principal/service.rs
+++ b/crates/carddav/src/principal/service.rs
@@ -65,7 +65,10 @@ impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> Reso
            .get_principal(principal)
            .await?
            .ok_or(crate::Error::NotFound)?;
-        Ok(PrincipalResource { principal: user })
+        Ok(PrincipalResource {
+            members: self.auth_provider.list_members(&user.id).await?,
+            principal: user,
+        })
    }

    async fn get_members(
--- a/crates/dav/Cargo.toml
+++ b/crates/dav/Cargo.toml
@@ -25,3 +25,4 @@ tracing.workspace = true
 tokio.workspace = true
 http.workspace = true
 headers.workspace = true
+strum.workspace = true
--- a/crates/dav/src/xml/group.rs
+++ b/crates/dav/src/xml/group.rs
@@ -0,0 +1,8 @@
+use crate::xml::HrefElement;
+use rustical_xml::{XmlDeserialize, XmlSerialize};
+
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
+pub struct GroupMembership(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
+
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
+pub struct GroupMemberSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
--- a/crates/dav/src/xml/mod.rs
+++ b/crates/dav/src/xml/mod.rs
@@ -11,3 +11,7 @@ pub use tag_list::TagList;
 mod error;
 pub mod sync_collection;
 pub use error::ErrorElement;
+mod report_set;
+pub use report_set::SupportedReportSet;
+mod group;
+pub use group::*;
--- a/crates/dav/src/xml/report_set.rs
+++ b/crates/dav/src/xml/report_set.rs
@@ -0,0 +1,34 @@
+use rustical_xml::XmlSerialize;
+use strum::VariantArray;
+
+// RFC 3253 section-3.1.5
+#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+pub struct SupportedReportSet<T: XmlSerialize + 'static> {
+    #[xml(flatten)]
+    #[xml(ns = "crate::namespace::NS_DAV")]
+    supported_report: Vec<ReportWrapper<T>>,
+}
+
+impl<T: XmlSerialize + Clone + 'static> SupportedReportSet<T> {
+    pub fn new(methods: Vec<T>) -> Self {
+        Self {
+            supported_report: methods
+                .into_iter()
+                .map(|method| ReportWrapper { report: method })
+                .collect(),
+        }
+    }
+
+    pub fn all() -> Self
+    where
+        T: VariantArray,
+    {
+        Self::new(T::VARIANTS.to_vec())
+    }
+}
+
+#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+pub struct ReportWrapper<T: XmlSerialize> {
+    #[xml(ns = "crate::namespace::NS_DAV")]
+    report: T,
+}
--- a/crates/store/src/auth/mod.rs
+++ b/crates/store/src/auth/mod.rs
@@ -24,6 +24,7 @@ pub trait AuthenticationProvider: Send + Sync + 'static {

    async fn add_membership(&self, principal: &str, member_of: &str) -> Result<(), Error>;
    async fn remove_membership(&self, principal: &str, member_of: &str) -> Result<(), Error>;
+    async fn list_members(&self, principal: &str) -> Result<Vec<String>, Error>;
 }

 pub use middleware::AuthenticationMiddleware;
--- a/crates/store_sqlite/src/principal_store.rs
+++ b/crates/store_sqlite/src/principal_store.rs
@@ -249,4 +249,18 @@ impl AuthenticationProvider for SqlitePrincipalStore {
        .map_err(crate::Error::from)?;
        Ok(())
    }
+
+    #[instrument]
+    async fn list_members(&self, principal: &str) -> Result<Vec<String>, Error> {
+        Ok(sqlx::query!(
+            r#"SELECT principal FROM memberships WHERE member_of = ?"#,
+            principal
+        )
+        .fetch_all(&self.db)
+        .await
+        .map_err(crate::Error::from)?
+        .into_iter()
+        .map(|record| record.principal)
+        .collect())
+    }
 }
--- a/crates/xml/derive/src/xml_enum/impl_se.rs
+++ b/crates/xml/derive/src/xml_enum/impl_se.rs
@@ -25,7 +25,11 @@ impl Enum {
                    let prefix = ns
                        .map(|ns| namespaces.get(&ns))
                        .unwrap_or(None)
-                        .map(|prefix| [*prefix, b":"].concat());
+                        .map(|prefix| if !prefix.is_empty() {
+                            [*prefix, b":"].concat()
+                        } else {
+                            vec![]
+                        });
                    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));
--- a/docs/index.md
+++ b/docs/index.md
@@ -25,4 +25,4 @@ If you still want to play around with it in its current state, absolutely feel f
 - DAVx5,
 - GNOME Accounts, GNOME Calendar, GNOME Contacts
 - Evolution
- Apple Calendar (known issue: If a user is member of multiple groups then Apple Calendar just randomly selects a calendar home)
+- Apple Calendar
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -29,8 +29,7 @@ docker run --rm -it -v YOUR_DATA_DIR:/var/lib/rustical/ ghcr.io/lennart-k/rustic
 This is also the place to set up **groups**.
 Groups and rooms are also just principals and you can specify them as such using the `--principal-type` parameter.
 To assign a user to a group you can use the `rustical membership` command. Being a member to a principal means that you can completely act on their behalf and see their collections.
-
-**Note:** Apple Calendar doesn't play well with the current membership implementation so you might not want to set up groups at the moment.
+**Note:** Many clients don't support autodiscovery of principals a user is a member of. In that case you'd have to set up multiple CalDAV profiles in your client with the respective principal URLs.

 ## Password vs app tokens
Author	SHA1	Message	Date
Lennart	b6ef2b4c05	Update documentation given the changes to memberships	2025-06-12 20:59:50 +02:00
Lennart	32bc8c707d	Add group-membership to both caldav and carddav and fix addressbook-home-set for shared principals	2025-06-12 20:55:22 +02:00
Lennart	1757bbee13	carddav: Remove members from addressbook-home-set	2025-06-12 20:12:17 +02:00
Lennart	4dbc316e64	Remove member principals from calendar-home-set	2025-06-12 20:10:14 +02:00
Lennart	4705170dbc	Update .sqlx files	2025-06-12 20:05:51 +02:00
Lennart	0e2f08d7f2	caldav: Add some access control-related properties and advertise calendar-proxy	2025-06-12 19:51:02 +02:00
Lennart	feb8b3ff09	Add member search to user store	2025-06-12 19:50:32 +02:00
Lennart	41d5c72e4e	Fix and simplify support-report-set	2025-06-12 17:39:42 +02:00
Lennart	89adbcf13f	xml: Fix default namespace prefixing for enum variants	2025-06-12 17:38:56 +02:00