diff options
| author | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-06-28 09:34:24 +0200 |
|---|---|---|
| committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-06-28 09:34:24 +0200 |
| commit | 927b461f25e8202a33fadc1f823d4feed6282f60 (patch) | |
| tree | d40739209d2d6693c85e5888e0e3f14e4ccd1ce4 /src/imap/command/authenticated.rs | |
| parent | 390bad0ec451a571e119903054b581a9d9a00cbe (diff) | |
| download | aerogramme-927b461f25e8202a33fadc1f823d4feed6282f60.tar.gz aerogramme-927b461f25e8202a33fadc1f823d4feed6282f60.zip | |
Switching to upstream boitalettres
Diffstat (limited to 'src/imap/command/authenticated.rs')
| -rw-r--r-- | src/imap/command/authenticated.rs | 59 |
1 files changed, 18 insertions, 41 deletions
diff --git a/src/imap/command/authenticated.rs b/src/imap/command/authenticated.rs index 0b1f01e..85c1c82 100644 --- a/src/imap/command/authenticated.rs +++ b/src/imap/command/authenticated.rs @@ -1,7 +1,7 @@ use anyhow::{anyhow, Error, Result}; -use boitalettres::proto::Response; +use boitalettres::proto::{Response, res::body::Data as Body}; use imap_codec::types::command::CommandBody; -use imap_codec::types::core::{Atom, Tag}; +use imap_codec::types::core::Atom; use imap_codec::types::flag::Flag; use imap_codec::types::mailbox::{ListMailbox, Mailbox as MailboxCodec}; use imap_codec::types::response::{Code, Data, Response as ImapRes, Status}; @@ -23,13 +23,9 @@ pub async fn dispatch<'a>( inner: InnerContext<'a>, user: &'a flow::User, ) -> Result<(Response, flow::Transition)> { - let ctx = StateContext { - user, - tag: &inner.req.tag, - inner, - }; + let ctx = StateContext { user, inner }; - match &ctx.inner.req.body { + match &ctx.inner.req.command.body { CommandBody::Lsub { reference, mailbox_wildcard, @@ -48,7 +44,6 @@ pub async fn dispatch<'a>( struct StateContext<'a> { inner: InnerContext<'a>, user: &'a flow::User, - tag: &'a Tag, } impl<'a> StateContext<'a> { @@ -58,9 +53,7 @@ impl<'a> StateContext<'a> { mailbox_wildcard: &ListMailbox, ) -> Result<(Response, flow::Transition)> { Ok(( - vec![ImapRes::Status( - Status::bad(Some(self.tag.clone()), None, "Not implemented").map_err(Error::msg)?, - )], + Response::bad("Not implemented")?, flow::Transition::No, )) } @@ -71,9 +64,7 @@ impl<'a> StateContext<'a> { mailbox_wildcard: &ListMailbox, ) -> Result<(Response, flow::Transition)> { Ok(( - vec![ImapRes::Status( - Status::bad(Some(self.tag.clone()), None, "Not implemented").map_err(Error::msg)?, - )], + Response::bad("Not implemented")?, flow::Transition::No, )) } @@ -115,20 +106,11 @@ impl<'a> StateContext<'a> { let sum = mb.summary().await?; tracing::trace!(summary=%sum, "mailbox.summary"); - let r_unseen = Status::ok( - None, - Some(Code::Unseen( - std::num::NonZeroU32::new(1).ok_or(anyhow!("Invalid message identifier"))?, - )), - "First unseen UID", - ) - .map_err(Error::msg)?; - - let mut res = Vec::<ImapRes>::new(); + let mut res = Vec::<Body>::new(); - res.push(ImapRes::Data(Data::Exists(sum.exists))); + res.push(Body::Data(Data::Exists(sum.exists))); - res.push(ImapRes::Data(Data::Recent(sum.recent))); + res.push(Body::Data(Data::Recent(sum.recent))); let mut flags: Vec<Flag> = sum.flags.map(|f| match f.chars().next() { Some('\\') => None, @@ -144,7 +126,7 @@ impl<'a> StateContext<'a> { }).flatten().collect(); flags.extend_from_slice(&DEFAULT_FLAGS); - res.push(ImapRes::Data(Data::Flags(flags.clone()))); + res.push(Body::Data(Data::Flags(flags.clone()))); let uid_validity = Status::ok( None, @@ -152,14 +134,14 @@ impl<'a> StateContext<'a> { "UIDs valid" ) .map_err(Error::msg)?; - res.push(ImapRes::Status(uid_validity)); + res.push(Body::Status(uid_validity)); let next_uid = Status::ok( None, Some(Code::UidNext(sum.next)), "Predict next UID" ).map_err(Error::msg)?; - res.push(ImapRes::Status(next_uid)); + res.push(Body::Status(next_uid)); if let Some(unseen) = sum.unseen { let status_unseen = Status::ok( @@ -168,7 +150,7 @@ impl<'a> StateContext<'a> { "First unseen UID", ) .map_err(Error::msg)?; - res.push(ImapRes::Status(status_unseen)); + res.push(Body::Status(status_unseen)); } flags.push(Flag::Permanent); @@ -177,16 +159,11 @@ impl<'a> StateContext<'a> { Some(Code::PermanentFlags(flags)), "Flags permitted", ).map_err(Error::msg)?; - res.push(ImapRes::Status(permanent_flags)); - - let last = Status::ok( - Some(self.tag.clone()), - Some(Code::ReadWrite), - "Select completed", - ).map_err(Error::msg)?; - res.push(ImapRes::Status(last)); + res.push(Body::Status(permanent_flags)); - let tr = flow::Transition::Select(mb); - Ok((res, tr)) + Ok(( + Response::ok("Select completed")?.with_body(res), + flow::Transition::Select(mb), + )) } } |