CLI account management + Directory refactoring

3 files changed, 6 insertions, 7 deletions

diff --git a/crates/smtp/src/config/mod.rs b/crates/smtp/src/config/mod.rs
index c5cff22a..92da2458 100644
--- a/crates/smtp/src/config/mod.rs
+++ b/crates/smtp/src/config/mod.rs
@@ -223,7 +223,7 @@ pub struct Extensions {
 }
 
 pub struct Auth {
-    pub directory: IfBlock<Option<MaybeDynValue<dyn Directory>>>,
+    pub directory: IfBlock<Option<MaybeDynValue<Directory>>>,
     pub mechanisms: IfBlock<u64>,
     pub require: IfBlock<bool>,
     pub allow_plain_text: IfBlock<bool>,
@@ -239,7 +239,7 @@ pub struct Mail {
 pub struct Rcpt {
     pub script: IfBlock<Option<Arc<Sieve>>>,
     pub relay: IfBlock<bool>,
-    pub directory: IfBlock<Option<MaybeDynValue<dyn Directory>>>,
+    pub directory: IfBlock<Option<MaybeDynValue<Directory>>>,
     pub rewrite: IfBlock<Option<DynValue<EnvelopeKey>>>,
 
     // Errors
@@ -347,7 +347,7 @@ pub struct QueueConfig {
     // Throttle and Quotas
     pub throttle: QueueThrottle,
     pub quota: QueueQuotas,
-    pub management_lookup: Arc<dyn Directory>,
+    pub management_lookup: Arc<Directory>,
 }
 
 pub struct QueueOutboundSourceIp {
diff --git a/crates/smtp/src/config/queue.rs b/crates/smtp/src/config/queue.rs
index de950842..93a1c668 100644
--- a/crates/smtp/src/config/queue.rs
+++ b/crates/smtp/src/config/queue.rs
@@ -23,7 +23,6 @@
 
 use std::time::Duration;
 
-use directory::backend::memory::MemoryDirectory;
 use mail_send::Credentials;
 
 use super::{
@@ -213,7 +212,7 @@ impl ConfigQueue for Config {
                     })?
                     .clone()
             } else {
-                Arc::new(MemoryDirectory::default())
+                Arc::new(Directory::default())
             },
         };
 
diff --git a/crates/smtp/src/core/mod.rs b/crates/smtp/src/core/mod.rs
index db50c672..b01eb2c9 100644
--- a/crates/smtp/src/core/mod.rs
+++ b/crates/smtp/src/core/mod.rs
@@ -117,7 +117,7 @@ pub struct SieveCore {
     pub from_name: String,
     pub return_path: String,
     pub sign: Vec<Arc<DkimSigner>>,
-    pub directories: AHashMap<String, Arc<dyn Directory>>,
+    pub directories: AHashMap<String, Arc<Directory>>,
     pub lookup_stores: AHashMap<String, LookupStore>,
     pub lookup: AHashMap<String, Lookup>,
 }
@@ -229,7 +229,7 @@ pub struct SessionParameters {
     pub ehlo_reject_non_fqdn: bool,
 
     // Auth parameters
-    pub auth_directory: Option<Arc<dyn Directory>>,
+    pub auth_directory: Option<Arc<Directory>>,
     pub auth_require: bool,
     pub auth_errors_max: usize,
     pub auth_errors_wait: Duration,