Pass principal name to delivery hook (#6)

Author: apexskier

crates/email/src/hooks/mod.rs

@@ -34,7 +34,7 @@ pub struct Message {
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Request {
     pub user_id: String,
-    pub user_id_num: u32,
+    pub principal_name: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub envelope: Option<Envelope>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -79,10 +79,10 @@ pub enum Modification {
 }
 
 impl Request {
-    pub fn new(user_id: String, user_id_num: u32) -> Self {
+    pub fn new(user_id: String, principal_name: String) -> Self {
         Self {
             user_id,
-            user_id_num,
+            principal_name,
             envelope: None,
             message: None,
         }

crates/email/src/message/delivery_hooks.rs

@@ -68,9 +68,28 @@ pub async fn try_delivery_hook(
         })
         .collect();
 
+    let principal = match server
+        .directory()
+        .query(directory::QueryParams::id(user_id))
+        .await
+    {
+        Ok(principal) => match principal {
+            Some(principal) => principal,
+            None => {
+                return Err(
+                    trc::EventType::MessageIngest(trc::MessageIngestEvent::Error).ctx(
+                        trc::Key::Reason,
+                        "User principal not found for delivery hook",
+                    ),
+                );
+            }
+        },
+        Err(err) => return Err(err),
+    };
+
     let request = hooks::Request::new(
         jmap_proto::types::id::Id::from(user_id).as_string(),
-        user_id,
+        principal.name,
     )
     .with_envelope(envelope)
     .with_message(hooks::Message {