feat: More LabelIDs and Message Unread status in event

Author: LeanderBB

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "proton-api-rs"
 authors = ["Leander Beernaert <lbb-dev@pm.me>"]
-version = "0.7.2"
+version = "0.8.0"
 edition = "2021"
 license = "AGPL-3.0-only"
 description = "Unofficial implemention of proton REST API in rust"

src/domain/event.rs

@@ -1,3 +1,4 @@
+use crate::domain::Boolean;
 use serde::Deserialize;
 use serde_repr::Deserialize_repr;
 use std::fmt::{Display, Formatter};
@@ -41,15 +42,113 @@ pub enum MessageAction {
 #[derive(Debug, Deserialize, Eq, PartialEq, Hash, Clone)]
 pub struct MessageId(String);
 
+impl Display for MessageId {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
 /// Labels API ID. Note that label IDs are used interchangeably between what we would consider
 /// mail labels and mailboxes.
 #[derive(Debug, Deserialize, Eq, PartialEq, Hash, Clone)]
 pub struct LabelID(String);
 
+/// SysLabelID represents system label identifiers that are constant for every account.
+#[derive(Debug, Eq, PartialEq, Hash, Copy, Clone)]
+pub struct SysLabelID(&'static str);
+
+impl PartialEq<LabelID> for SysLabelID {
+    fn eq(&self, other: &LabelID) -> bool {
+        self.0 == other.0
+    }
+}
+
+impl PartialEq<SysLabelID> for LabelID {
+    fn eq(&self, other: &SysLabelID) -> bool {
+        self.0 == other.0
+    }
+}
+
+impl From<SysLabelID> for LabelID {
+    fn from(value: SysLabelID) -> Self {
+        Self(value.0.into())
+    }
+}
+
+impl SysLabelID {
+    pub const INBOX: SysLabelID = SysLabelID("0");
+    pub const ALL_DRAFTS: SysLabelID = SysLabelID("1");
+    pub const ALL_SENT: SysLabelID = SysLabelID("1");
+    pub const TRASH: SysLabelID = SysLabelID("3");
+    pub const SPAM: SysLabelID = SysLabelID("4");
+    pub const ALL_MAIL: SysLabelID = SysLabelID("5");
+    pub const ARCHIVE: SysLabelID = SysLabelID("5");
+    pub const SENT: SysLabelID = SysLabelID("7");
+    pub const DRAFTS: SysLabelID = SysLabelID("8");
+    pub const OUTBOX: SysLabelID = SysLabelID("9");
+    pub const STARRED: SysLabelID = SysLabelID("10");
+    pub const ALL_SCHEDULED: SysLabelID = SysLabelID("12");
+}
+
 impl LabelID {
-    /// Default LabelID for the `INBOX` mailbox.
     pub fn inbox() -> Self {
-        Self("0".to_string())
+        SysLabelID::INBOX.into()
+    }
+
+    pub fn all_drafts() -> Self {
+        SysLabelID::ALL_DRAFTS.into()
+    }
+
+    pub fn all_sent() -> Self {
+        SysLabelID::ALL_SENT.into()
+    }
+
+    pub fn trash() -> Self {
+        SysLabelID::TRASH.into()
+    }
+
+    pub fn spam() -> Self {
+        SysLabelID::SPAM.into()
+    }
+
+    pub fn all_mail() -> Self {
+        SysLabelID::ALL_MAIL.into()
+    }
+
+    pub fn archive() -> Self {
+        SysLabelID::ARCHIVE.into()
+    }
+
+    pub fn sent() -> Self {
+        SysLabelID::SENT.into()
+    }
+
+    pub fn drafts() -> Self {
+        SysLabelID::DRAFTS.into()
+    }
+
+    pub fn outbox() -> Self {
+        SysLabelID::OUTBOX.into()
+    }
+
+    pub fn starred() -> Self {
+        SysLabelID::STARRED.into()
+    }
+
+    pub fn all_scheduled() -> Self {
+        SysLabelID::ALL_SCHEDULED.into()
+    }
+}
+
+impl Display for LabelID {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl Display for SysLabelID {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
     }
 }
 
@@ -74,4 +173,5 @@ pub struct Message {
     pub subject: String,
     pub sender_address: String,
     pub sender_name: Option<String>,
+    pub unread: Boolean,
 }

src/domain/mod.rs

@@ -6,6 +6,7 @@ mod user;
 pub use event::*;
 pub use user::*;
 
+use serde_repr::Deserialize_repr;
 use std::fmt::{Display, Formatter};
 
 pub type SecretString = secrecy::SecretString;
@@ -28,3 +29,10 @@ impl Display for TwoFactorAuth {
         }
     }
 }
+
+#[derive(Debug, Deserialize_repr, Eq, PartialEq, Copy, Clone)]
+#[repr(u8)]
+pub enum Boolean {
+    False = 0,
+    True = 1,
+}

src/requests/auth.rs

@@ -245,7 +245,6 @@ impl<'a> http::Request for AuthRefreshRequest<'a> {
     fn build_request(&self, factory: &dyn RequestFactory) -> RequestData {
         factory
             .new_request(http::Method::Post, "auth/v4/refresh")
-            .header(http::X_PM_UID_HEADER, &self.uid.0)
             .json(AuthRefresh {
                 uid: &self.uid.0,
                 refresh_token: self.token,