server: update clap and mockall

server/src/infra/cli.rs

@@ -1,4 +1,4 @@
-use clap::Parser;
+use clap::{builder::EnumValueParser, Parser};
 use lettre::message::Mailbox;
 use serde::{Deserialize, Serialize};
 
@@ -95,7 +95,7 @@ pub struct TestEmailOpts {
 }
 
 #[derive(Debug, Parser, Clone)]
-#[clap(next_help_heading = Some("LDAPS"), setting = clap::AppSettings::DeriveDisplayOrder)]
+#[clap(next_help_heading = Some("LDAPS"))]
 pub struct LdapsOpts {
     /// Enable LDAPS. Default: false.
     #[clap(long, env = "LLDAP_LDAPS_OPTIONS__ENABLED")]
@@ -114,17 +114,16 @@ pub struct LdapsOpts {
     pub ldaps_key_file: Option<String>,
 }
 
-clap::arg_enum! {
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, clap::ValueEnum)]
+#[serde(rename_all = "UPPERCASE")]
 pub enum SmtpEncryption {
-    NONE,
-    TLS,
-    STARTTLS,
-}
+    None,
+    Tls,
+    StartTls,
 }
 
 #[derive(Debug, Parser, Clone)]
-#[clap(next_help_heading = Some("SMTP"), setting = clap::AppSettings::DeriveDisplayOrder)]
+#[clap(next_help_heading = Some("SMTP"))]
 pub struct SmtpOpts {
     /// Sender email address.
     #[clap(long, env = "LLDAP_SMTP_OPTIONS__FROM")]
@@ -151,10 +150,10 @@ pub struct SmtpOpts {
     pub smtp_password: Option<String>,
 
     /// Whether TLS should be used to connect to SMTP.
-    #[clap(long, env = "LLDAP_SMTP_OPTIONS__TLS_REQUIRED", setting=clap::ArgSettings::Hidden)]
+    #[clap(long, env = "LLDAP_SMTP_OPTIONS__TLS_REQUIRED", hide = true)]
     pub smtp_tls_required: Option<bool>,
 
-    #[clap(long, env = "LLDAP_SMTP_OPTIONS__ENCRYPTION", possible_values = SmtpEncryption::variants(), case_insensitive = true)]
+    #[clap(long, env = "LLDAP_SMTP_OPTIONS__ENCRYPTION", value_parser = EnumValueParser::<SmtpEncryption>::new(), ignore_case = true)]
     pub smtp_encryption: Option<SmtpEncryption>,
 }
 

server/src/infra/configuration.rs

@@ -29,7 +29,7 @@ pub struct MailOptions {
     pub user: String,
     #[builder(default = r#"SecUtf8::from("")"#)]
     pub password: SecUtf8,
-    #[builder(default = "SmtpEncryption::TLS")]
+    #[builder(default = "SmtpEncryption::Tls")]
     pub smtp_encryption: SmtpEncryption,
     /// Deprecated.
     #[builder(default = "None")]

server/src/infra/mail.rs

@@ -27,11 +27,11 @@ async fn send_email(to: Mailbox, subject: &str, body: String, options: &MailOpti
                 .body(body),
         )?;
     let mut mailer = match options.smtp_encryption {
-        SmtpEncryption::NONE => {
+        SmtpEncryption::None => {
             AsyncSmtpTransport::<Tokio1Executor>::builder_dangerous(&options.server)
         }
-        SmtpEncryption::TLS => AsyncSmtpTransport::<Tokio1Executor>::relay(&options.server)?,
-        SmtpEncryption::STARTTLS => {
+        SmtpEncryption::Tls => AsyncSmtpTransport::<Tokio1Executor>::relay(&options.server)?,
+        SmtpEncryption::StartTls => {
             AsyncSmtpTransport::<Tokio1Executor>::starttls_relay(&options.server)?
         }
     };

server/src/infra/tcp_backend_handler.rs

@@ -20,44 +20,3 @@ pub trait TcpBackendHandler: Sync {
 
     async fn delete_password_reset_token(&self, token: &str) -> Result<()>;
 }
-
-#[cfg(test)]
-use crate::domain::{handler::*, types::*};
-#[cfg(test)]
-mockall::mock! {
-    pub TestTcpBackendHandler{}
-    impl Clone for TestTcpBackendHandler {
-        fn clone(&self) -> Self;
-    }
-    #[async_trait]
-    impl LoginHandler for TestTcpBackendHandler {
-        async fn bind(&self, request: BindRequest) -> Result<()>;
-    }
-    #[async_trait]
-    impl GroupListerBackendHandler for TestTcpBackendHandler {
-        async fn list_groups(&self, filters: Option<GroupRequestFilter>) -> Result<Vec<Group>>;
-    }
-    #[async_trait]
-    impl GroupBackendHandler for TestTcpBackendHandler {
-        async fn get_group_details(&self, group_id: GroupId) -> Result<GroupDetails>;
-        async fn update_group(&self, request: UpdateGroupRequest) -> Result<()>;
-        async fn create_group(&self, group_name: &str) -> Result<GroupId>;
-        async fn delete_group(&self, group_id: GroupId) -> Result<()>;
-    }
-    #[async_trait]
-    impl UserListerBackendHandler for TestBackendHandler {
-        async fn list_users(&self, filters: Option<UserRequestFilter>, get_groups: bool) -> Result<Vec<UserAndGroups>>;
-    }
-    #[async_trait]
-    impl UserBackendHandler for TestBackendHandler {
-        async fn get_user_details(&self, user_id: &UserId) -> Result<User>;
-        async fn create_user(&self, request: CreateUserRequest) -> Result<()>;
-        async fn update_user(&self, request: UpdateUserRequest) -> Result<()>;
-        async fn delete_user(&self, user_id: &UserId) -> Result<()>;
-        async fn get_user_groups(&self, user_id: &UserId) -> Result<HashSet<GroupDetails>>;
-        async fn add_user_to_group(&self, user_id: &UserId, group_id: GroupId) -> Result<()>;
-        async fn remove_user_from_group(&self, user_id: &UserId, group_id: GroupId) -> Result<()>;
-    }
-    #[async_trait]
-    impl BackendHandler for TestTcpBackendHandler {}
-}