pve: add_totp anda dd_yubico cannot error, drop Result type

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/pve-rs/src/tfa/proxmox_tfa_api/api.rs b/pve-rs/src/tfa/proxmox_tfa_api/api.rs
index 6be520576e222bb8616abc6ca559127a522564c6..031aaf306e1dac1788a75c6ceed133446689fd23 100644 (file)
--- a/pve-rs/src/tfa/proxmox_tfa_api/api.rs
+++ b/pve-rs/src/tfa/proxmox_tfa_api/api.rs
@@ -388,9 +388,11 @@ fn add_totp(
     {
         bail!("failed to verify TOTP challenge");
     }
-    config
-        .add_totp(userid, description, totp)
-        .map(TfaUpdateInfo::id)
+    Ok(TfaUpdateInfo::id(config.add_totp(
+        userid,
+        description,
+        totp,
+    )))
 }
 
 fn add_yubico(
@@ -400,9 +402,11 @@ fn add_yubico(
     value: Option<String>,
 ) -> Result<TfaUpdateInfo, Error> {
     let key = value.ok_or_else(|| format_err!("missing 'value' parameter for 'yubico' entry"))?;
-    config
-        .add_yubico(userid, description, key)
-        .map(TfaUpdateInfo::id)
+    Ok(TfaUpdateInfo::id(config.add_yubico(
+        userid,
+        description,
+        key,
+    )))
 }
 
 fn add_u2f<A: OpenUserChallengeData>(

diff --git a/pve-rs/src/tfa/proxmox_tfa_api/mod.rs b/pve-rs/src/tfa/proxmox_tfa_api/mod.rs
index bd5ab277406a39b629f95d07a3f608b30dba60a6..0a6dfd02ae0a7d02da01d09ac9d7dba30dd92829 100644 (file)
--- a/pve-rs/src/tfa/proxmox_tfa_api/mod.rs
+++ b/pve-rs/src/tfa/proxmox_tfa_api/mod.rs
@@ -167,34 +167,22 @@ impl TfaConfig {
     ///
     /// Unlike U2F/WA, this does not require a challenge/response. The user can choose their secret
     /// themselves.
-    pub fn add_totp(
-        &mut self,
-        userid: &str,
-        description: String,
-        value: Totp,
-    ) -> Result<String, Error> {
-        Ok(self
-            .users
+    pub fn add_totp(&mut self, userid: &str, description: String, value: Totp) -> String {
+        self.users
             .entry(userid.to_owned())
             .or_default()
-            .add_totp(description, value))
+            .add_totp(description, value)
     }
 
     /// Add a Yubico key to a user.
     ///
     /// Unlike U2F/WA, this does not require a challenge/response. The user can choose their secret
     /// themselves.
-    pub fn add_yubico(
-        &mut self,
-        userid: &str,
-        description: String,
-        key: String,
-    ) -> Result<String, Error> {
-        Ok(self
-            .users
+    pub fn add_yubico(&mut self, userid: &str, description: String, key: String) -> String {
+        self.users
             .entry(userid.to_owned())
             .or_default()
-            .add_yubico(description, key))
+            .add_yubico(description, key)
     }
 
     /// Add a new set of recovery keys. There can only be 1 set of keys at a time.