Refactor parameter types: change some String parameters to traits (#61)

* Refactor parameter types: change some String parameters to traits
kanidm · Oct 31, 2024 · 2972cfd · 2972cfd
1 parent 3e0bd7d
commit 2972cfd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/cli/src/ldap_opt.rs b/cli/src/ldap_opt.rs
@@ -12,6 +12,8 @@ impl Default for SyncRequestMode {
 }
 */
 
+use url::Url;
+
 #[derive(Debug, clap::Subcommand)]
 enum LdapAction {
     /// Search a directory server
@@ -58,7 +60,7 @@ struct LdapOpt {
     verbose: bool,
 
     #[clap(short = 'H', long = "url")]
-    url: url::Url,
+    url: Url,
 
     #[clap(short = 'j', long = "json")]
     json: bool,

diff --git a/client/src/addirsync.rs b/client/src/addirsync.rs
@@ -18,17 +18,17 @@ pub struct LdapSyncRepl {
 
 impl LdapClient {
     #[tracing::instrument(level = "debug", skip_all)]
-    pub async fn ad_dirsync(
+    pub async fn ad_dirsync<S: Into<String>>(
         &mut self,
-        basedn: String,
+        basedn: S,
         cookie: Option<Vec<u8>>,
     ) -> crate::LdapResult<LdapSyncRepl> {
         let msgid = self.get_next_msgid();
 
         let msg = LdapMsg {
             msgid,
             op: LdapOp::SearchRequest(LdapSearchRequest {
-                base: basedn,
+                base: basedn.into(),
                 scope: LdapSearchScope::Subtree,
                 aliases: LdapDerefAliases::Never,
                 sizelimit: 0,

diff --git a/client/src/lib.rs b/client/src/lib.rs
@@ -487,15 +487,16 @@ impl LdapClient {
     }
 
     #[tracing::instrument(level = "debug", skip_all)]
-    pub async fn bind(&mut self, dn: String, pw: String) -> LdapResult<()> {
+    pub async fn bind<S: Into<String>>(&mut self, dn: S, pw: S) -> LdapResult<()> {
+        let dn = dn.into();
         info!(%dn);
         let msgid = self.get_next_msgid();
 
         let msg = LdapMsg {
             msgid,
             op: LdapOp::BindRequest(LdapBindRequest {
                 dn,
-                cred: LdapBindCred::Simple(pw),
+                cred: LdapBindCred::Simple(pw.into()),
             }),
             ctrl: vec![],
         };

diff --git a/client/src/search.rs b/client/src/search.rs
@@ -8,17 +8,17 @@ pub struct LdapSearchResult {
 
 impl LdapClient {
     #[tracing::instrument(level = "debug", skip_all)]
-    pub async fn search(
+    pub async fn search<S: Into<String>>(
         &mut self,
-        basedn: String,
+        basedn: S,
         filter: LdapFilter,
     ) -> crate::LdapResult<LdapSearchResult> {
         let msgid = self.get_next_msgid();
 
         let msg = LdapMsg {
             msgid,
             op: LdapOp::SearchRequest(LdapSearchRequest {
-                base: basedn,
+                base: basedn.into(),
                 scope: LdapSearchScope::Subtree,
                 aliases: LdapDerefAliases::Never,
                 sizelimit: 0,

diff --git a/client/src/syncrepl.rs b/client/src/syncrepl.rs
@@ -46,9 +46,9 @@ pub enum LdapSyncRepl {
 
 impl LdapClient {
     #[tracing::instrument(level = "debug", skip_all)]
-    pub async fn syncrepl(
+    pub async fn syncrepl<S: Into<String>>(
         &mut self,
-        basedn: String,
+        basedn: S,
         filter: LdapFilter,
         cookie: Option<Vec<u8>>,
         mode: SyncRequestMode,
@@ -58,7 +58,7 @@ impl LdapClient {
         let msg = LdapMsg {
             msgid,
             op: LdapOp::SearchRequest(LdapSearchRequest {
-                base: basedn,
+                base: basedn.into(),
                 scope: LdapSearchScope::Subtree,
                 aliases: LdapDerefAliases::Never,
                 sizelimit: 0,