Creating a mailbox in a shared folder results in wrong hierarchy (fixes

#1128)
stalwartlabs · Jan 28, 2025 · c394fa6 · c394fa6
1 parent 84d3c82
commit c394fa6
Show file tree

Hide file tree

Showing 22 changed files with 60 additions and 61 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stalwart Labs Ltd. <[email protected]>"]
 license = "AGPL-3.0-only OR LicenseRef-SEL"
 repository = "https://github.com/stalwartlabs/cli"
 homepage = "https://github.com/stalwartlabs/cli"
-version = "0.11.2"
+version = "0.11.4"
 edition = "2021"
 readme = "README.md"
 resolver = "2"

diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.11.2"
+version = "0.11.4"
 edition = "2021"
 resolver = "2"
 

diff --git a/crates/directory/Cargo.toml b/crates/directory/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "directory"
-version = "0.11.2"
+version = "0.11.4"
 edition = "2021"
 resolver = "2"
 

diff --git a/crates/email/Cargo.toml b/crates/email/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "email"
-version = "0.11.2"
+version = "0.11.4"
 edition = "2021"
 resolver = "2"
 

diff --git a/crates/imap-proto/Cargo.toml b/crates/imap-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "imap_proto"
-version = "0.11.2"
+version = "0.11.4"
 edition = "2021"
 resolver = "2"
 

diff --git a/crates/imap/Cargo.toml b/crates/imap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "imap"
-version = "0.11.2"
+version = "0.11.4"
 edition = "2021"
 resolver = "2"
 

diff --git a/crates/imap/src/op/create.rs b/crates/imap/src/op/create.rs
@@ -297,16 +297,15 @@ impl<T: SessionStream> SessionData<T> {
         let mut parent_mailbox_name = None;
         let (account_id, path) = {
             let mailboxes = self.mailboxes.lock();
-            let first_path_item = path.first().unwrap();
-            let account = if first_path_item == &self.server.core.jmap.shared_folder {
+            let account = if path.first() == Some(&self.server.core.jmap.shared_folder.as_str()) {
                 // Shared Folders/<username>/<folder>
                 if path.len() < 3 {
                     return Err(trc::ImapEvent::Error
                         .into_err()
                         .details("Mailboxes under root shared folders are not allowed.")
                         .code(ResponseCode::Cannot));
                 }
-                let prefix = Some(format!("{}/{}", first_path_item, path[1]));
+                let prefix = Some(format!("{}/{}", path.remove(0), path.remove(0)));
 
                 // Locate account
                 if let Some(account) = mailboxes

diff --git a/crates/jmap-proto/Cargo.toml b/crates/jmap-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jmap_proto"
-version = "0.11.2"
+version = "0.11.4"
 edition = "2021"
 resolver = "2"
 

diff --git a/crates/jmap/Cargo.toml b/crates/jmap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jmap"
-version = "0.11.2"
+version = "0.11.4"
 edition = "2021"
 resolver = "2"