WIP refactor

4 files changed, 130 insertions, 77 deletions

diff --git a/src/imap/command/anonymous.rs b/src/imap/command/anonymous.rs
index e4222f7..55e701b 100644
--- a/src/imap/command/anonymous.rs
+++ b/src/imap/command/anonymous.rs
@@ -1,23 +1,28 @@
 
-use boitalettres::proto::{Request, Response};
-use crate::login::ArcLoginProvider;
-use crate::imap::Context;
+use anyhow::{Result, Error};
+use boitalettres::proto::Response;
+use imap_codec::types::command::CommandBody;
+use imap_codec::types::core::AString;
+use imap_codec::types::response::{Capability, Data, Response as ImapRes, Status};
+
+use crate::imap::flow;
+use crate::imap::session::InnerContext;
 
 //--- dispatching
 
-pub async fn dispatch(ctx: Context) -> Result<Response> {
+pub async fn dispatch<'a>(ctx: &'a InnerContext<'a>) -> Result<Response> {
     match ctx.req.body {
-        CommandBody::Capability => anonymous::capability(ctx).await,
-        CommandBody::Login { username, password } => anonymous::login(ctx, username, password).await,
+        CommandBody::Capability => capability(ctx).await,
+        CommandBody::Login { username, password } => login(ctx, username, password).await,
         _ => Status::no(Some(ctx.req.tag.clone()), None, "This command is not available in the ANONYMOUS state.")
             .map(|s| vec![ImapRes::Status(s)])
             .map_err(Error::msg),
     }
 }
 
-//--- Command controllers
+//--- Command controllers, private
 
-pub async fn capability(ctx: Context) -> Result<Response> {
+async fn capability<'a>(ctx: InnerContext<'a>) -> Result<Response> {
     let capabilities = vec![Capability::Imap4Rev1, Capability::Idle];
     let res = vec![
         ImapRes::Data(Data::Capability(capabilities)),
@@ -29,7 +34,7 @@ pub async fn capability(ctx: Context) -> Result<Response> {
     Ok(res)
 }
 
-pub async fn login(ctx: Context, username: AString, password: AString) -> Result<Response> {
+async fn login<'a>(ctx: InnerContext<'a>, username: AString, password: AString) -> Result<Response> {
     let (u, p) = (String::try_from(username)?, String::try_from(password)?);
     tracing::info!(user = %u, "command.login");
 
diff --git a/src/imap/command/authenticated.rs b/src/imap/command/authenticated.rs
index 188fc56..49bfa9c 100644
--- a/src/imap/command/authenticated.rs
+++ b/src/imap/command/authenticated.rs
@@ -1,91 +1,101 @@
-pub async fn dispatch(ctx: Context) -> Result<Response> {
-    match req.body {
-        CommandBody::Capability => anonymous::capability().await, // we use the same implem for now
-        CommandBody::Lsub { reference, mailbox_wildcard, } => authenticated::lsub(reference, mailbox_wildcard).await,
-        CommandBody::List { reference, mailbox_wildcard, } => authenticated::list(reference, mailbox_wildcard).await,
-        CommandBody::Select { mailbox } => authenticated::select(user, mailbox).await.and_then(|(mailbox, response)| {
-            self.state.select(mailbox);
-            Ok(response)
-        }),
-        _ => Status::no(Some(msg.req.tag.clone()), None, "This command is not available in the AUTHENTICATED state.")
-            .map(|s| vec![ImapRes::Status(s)])
-            .map_err(Error::msg),
-    },
+
+use anyhow::{Result, Error};
+use boitalettres::proto::Response;
+use imap_codec::types::command::CommandBody;
+use imap_codec::types::core::Tag;
+use imap_codec::types::mailbox::{ListMailbox, Mailbox as MailboxCodec};
+use imap_codec::types::response::{Code, Data, Response as ImapRes, Status};
+
+use crate::imap::command::anonymous;
+use crate::imap::session::InnerContext;
+use crate::imap::flow::User;
+use crate::mailbox::Mailbox;
+
+pub async fn dispatch<'a>(inner: &'a InnerContext<'a>, user: &'a User) -> Result<Response> {
+    let ctx = StateContext { inner, user, tag: &inner.req.tag };
+
+    match ctx.req.body.as_ref() {
+        CommandBody::Lsub { reference, mailbox_wildcard, } => ctx.lsub(reference, mailbox_wildcard).await,
+        CommandBody::List { reference, mailbox_wildcard, } => ctx.list(reference, mailbox_wildcard).await,
+        CommandBody::Select { mailbox } => ctx.select(mailbox).await,
+        _ => anonymous::dispatch(ctx.inner).await,
+    }
+}
+
+// --- PRIVATE ---
+
+struct StateContext<'a> {
+    inner: InnerContext<'a>,
+    user: &'a User,
+    tag: &'a Tag,
 }
 
-    pub async fn lsub(
+impl<'a> StateContext<'a> {
+    async fn lsub(
         &self,
         reference: MailboxCodec,
         mailbox_wildcard: ListMailbox,
-    ) -> Result<Response> {
+        ) -> Result<Response> {
         Ok(vec![ImapRes::Status(
-            Status::bad(Some(self.tag.clone()), None, "Not implemented").map_err(Error::msg)?,
-        )])
+                Status::bad(Some(self.tag.clone()), None, "Not implemented").map_err(Error::msg)?,
+                )])
     }
 
-    pub async fn list(
+    async fn list(
         &self,
         reference: MailboxCodec,
         mailbox_wildcard: ListMailbox,
-    ) -> Result<Response> {
-        Ok(vec![ImapRes::Status(
-            Status::bad(Some(self.tag.clone()), None, "Not implemented").map_err(Error::msg)?,
-        )])
+        ) -> Result<Response> {
+        Ok(vec![
+           ImapRes::Status(Status::bad(Some(self.tag.clone()), None, "Not implemented").map_err(Error::msg)?),
+        ])
     }
 
     /*
-      * TRACE BEGIN ---
-
-
-    Example:    C: A142 SELECT INBOX
-                S: * 172 EXISTS
-                S: * 1 RECENT
-                S: * OK [UNSEEN 12] Message 12 is first unseen
-                S: * OK [UIDVALIDITY 3857529045] UIDs valid
-                S: * OK [UIDNEXT 4392] Predicted next UID
-                S: * FLAGS (\Answered \Flagged \Deleted \Seen \Draft)
-                S: * OK [PERMANENTFLAGS (\Deleted \Seen \*)] Limited
-                S: A142 OK [READ-WRITE] SELECT completed
-
-      * TRACE END ---
-      */
-    pub async fn select(&mut self, mailbox: MailboxCodec) -> Result<Response> {
+     * TRACE BEGIN ---
+
+
+     Example:    C: A142 SELECT INBOX
+     S: * 172 EXISTS
+     S: * 1 RECENT
+     S: * OK [UNSEEN 12] Message 12 is first unseen
+     S: * OK [UIDVALIDITY 3857529045] UIDs valid
+     S: * OK [UIDNEXT 4392] Predicted next UID
+     S: * FLAGS (\Answered \Flagged \Deleted \Seen \Draft)
+     S: * OK [PERMANENTFLAGS (\Deleted \Seen \*)] Limited
+     S: A142 OK [READ-WRITE] SELECT completed
+
+     * TRACE END ---
+     */
+    async fn select(&self, mailbox: MailboxCodec) -> Result<Response> {
         let name = String::try_from(mailbox)?;
-        let user = match self.session.user.as_ref() {
-            Some(u) => u,
-            _ => {
-                return Ok(vec![ImapRes::Status(
-                    Status::no(Some(self.tag.clone()), None, "Not implemented")
-                        .map_err(Error::msg)?,
-                )])
-            }
-        };
 
-        let mut mb = Mailbox::new(&user.creds, name.clone())?;
-        tracing::info!(username=%user.name, mailbox=%name, "mailbox.selected");
+        let mut mb = Mailbox::new(self.user.creds, name.clone())?;
+        tracing::info!(username=%self.user.name, mailbox=%name, "mailbox.selected");
 
         let sum = mb.summary().await?;
         tracing::trace!(summary=%sum, "mailbox.summary");
 
         let body = vec![Data::Exists(sum.exists.try_into()?), Data::Recent(0)];
 
-        self.session.selected = Some(mb);
+        self.inner.state.select(mb)?;
 
         let r_unseen = Status::ok(None, Some(Code::Unseen(0)), "").map_err(Error::msg)?;
-        let r_permanentflags = Status::ok(None, Some(Code::
+        //let r_permanentflags = Status::ok(None, Some(Code::
 
         Ok(vec![
-            ImapRes::Data(Data::Exists(0)),
-            ImapRes::Data(Data::Recent(0)),
-            ImapRes::Data(Data::Flags(vec![]),
-            ImapRes::Status(),
-            ImapRes::Status(),
-            ImapRes::Status()
-                Status::ok(
-                    Some(self.tag.clone()),
-                    Some(Code::ReadWrite),
-                    "Select completed",
-                )
-                .map_err(Error::msg)?,
-        )])
+           ImapRes::Data(Data::Exists(0)),
+           ImapRes::Data(Data::Recent(0)),
+           ImapRes::Data(Data::Flags(vec![])),
+           /*ImapRes::Status(),
+             ImapRes::Status(),
+             ImapRes::Status(),*/
+           Status::ok(
+               Some(self.tag.clone()),
+               Some(Code::ReadWrite),
+               "Select completed",
+               )
+           .map_err(Error::msg)?,
+        ])
     }
+}
diff --git a/src/imap/command/mod.rs b/src/imap/command/mod.rs
new file mode 100644
index 0000000..c4fa4d8
--- /dev/null
+++ b/src/imap/command/mod.rs
@@ -0,0 +1,3 @@
+pub mod anonymous;
+pub mod authenticated;
+pub mod selected;
diff --git a/src/imap/command/selected.rs b/src/imap/command/selected.rs
index b320ec2..61e9c1a 100644
--- a/src/imap/command/selected.rs
+++ b/src/imap/command/selected.rs
@@ -1,10 +1,45 @@
+
+use anyhow::{Result, Error};
+use boitalettres::proto::Response;
+use imap_codec::types::command::CommandBody;
+use imap_codec::types::core::Tag;
+use imap_codec::types::fetch_attributes::MacroOrFetchAttributes;
+use imap_codec::types::response::{Response as ImapRes, Status};
+use imap_codec::types::sequence::SequenceSet;
+
+use crate::imap::command::authenticated;
+use crate::imap::session::InnerContext;
+use crate::imap::flow::User;
+use crate::mailbox::Mailbox;
+
+pub async fn dispatch<'a>(inner: &'a InnerContext<'a>, user: &'a User, mailbox: &'a Mailbox) -> Result<Response> {
+    let ctx = StateContext { inner, user, mailbox, tag: &inner.req.tag };
+
+    match ctx.inner.req.body {
+        CommandBody::Fetch { sequence_set, attributes, uid, } => ctx.fetch(sequence_set, attributes, uid).await,
+        _ => authenticated::dispatch(inner, user).await,
+    }
+}
+
+// --- PRIVATE ---
+
+struct StateContext<'a> {
+    inner: InnerContext<'a>,
+    user: &'a User,
+    mailbox: &'a Mailbox,
+    tag: &'a Tag,
+}
+
+
+impl<'a> StateContext<'a> {
     pub async fn fetch(
         &self,
         sequence_set: SequenceSet,
         attributes: MacroOrFetchAttributes,
         uid: bool,
-    ) -> Result<Response> {
-        Ok(vec![ImapRes::Status(
-            Status::bad(Some(self.tag.clone()), None, "Not implemented").map_err(Error::msg)?,
-        )])
+        ) -> Result<Response> {
+        Ok(vec![
+           ImapRes::Status(Status::bad(Some(self.tag.clone()), None, "Not implemented").map_err(Error::msg)?),
+        ])
     }
+}