Some preparations for supporting principal memberships

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

@@ -48,7 +48,7 @@ pub async fn route_mkcol<AS: AddressbookStore>(
     root_span: RootSpan,
 ) -> Result<HttpResponse, Error> {
     let (principal, addressbook_id) = path.into_inner();
-    if principal != user.id {
+    if !user.is_principal(&principal) {
         return Err(Error::Unauthorized);
     }
 

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

@@ -20,7 +20,7 @@ pub async fn route_post<A: AddressbookStore, S: SubscriptionStore>(
     req: HttpRequest,
 ) -> Result<HttpResponse, Error> {
     let (principal, addressbook_id) = path.into_inner();
-    if principal != user.id {
+    if !user.is_principal(&principal) {
         return Err(Error::Unauthorized);
     }
 

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

@@ -30,7 +30,7 @@ pub async fn route_report_addressbook<AS: AddressbookStore>(
     addr_store: Data<AS>,
 ) -> Result<impl Responder, Error> {
     let (principal, addressbook_id) = path.into_inner();
-    if principal != user.id {
+    if !user.is_principal(&principal) {
         return Err(Error::Unauthorized);
     }
 

crates/carddav/src/addressbook/resource.rs

@@ -185,7 +185,9 @@ impl Resource for AddressbookResource {
     }
 
     fn get_user_privileges(&self, user: &User) -> Result<UserPrivilegeSet, Self::Error> {
-        Ok(UserPrivilegeSet::owner_only(self.0.principal == user.id))
+        Ok(UserPrivilegeSet::owner_only(
+            user.is_principal(&self.0.principal),
+        ))
     }
 }