fix: Misc OTP Uri import changes (#425)

Author: replydev

src/args.rs

@@ -36,6 +36,10 @@ enum CotpSubcommands {
 
 #[derive(Args)]
 pub struct AddArgs {
+    /// Add OTP code via an OTP URI
+    #[arg(short = 'u', long = "otpuri", required_unless_present = "label")]
+    pub otp_uri: bool,
+
     /// Specify the OTP code type
     #[arg(short = 't', long = "type", default_value = "totp")]
     pub otp_type: OTPType,
@@ -45,7 +49,7 @@ pub struct AddArgs {
     pub issuer: String,
 
     /// Code label
-    #[arg(short, long, required = true)]
+    #[arg(short, long, required_unless_present = "otp_uri")]
     pub label: Option<String>,
 
     /// OTP Algorithm

src/argument_functions.rs

@@ -7,6 +7,7 @@ use crate::importers::authy_remote_debug::AuthyExportedList;
 use crate::importers::converted::ConvertedJsonList;
 use crate::importers::freeotp_plus::FreeOTPPlusJson;
 use crate::importers::importer::import_from_path;
+use crate::otp::from_otp_uri::FromOtpUri;
 use crate::otp::otp_element::{OTPDatabase, OTPElement};
 use crate::{clipboard, utils};
 use color_eyre::eyre::{eyre, ErrReport};
@@ -48,8 +49,14 @@ pub fn import(matches: ImportArgs, mut database: OTPDatabase) -> color_eyre::Res
 }
 
 pub fn add(matches: AddArgs, mut database: OTPDatabase) -> color_eyre::Result<OTPDatabase> {
-    let otp_element = get_from_args(matches)?;
-
+    let otp_element = if matches.otp_uri {
+        let mut otp_uri = rpassword::prompt_password("Insert the otp uri: ").unwrap();
+        let result = OTPElement::from_otp_uri(otp_uri.as_str());
+        otp_uri.zeroize();
+        result?
+    } else {
+        get_from_args(matches)?
+    };
     if !otp_element.valid_secret() {
         return Err(ErrReport::msg("Invalid secret."));
     }

src/importers/importer.rs

@@ -1,17 +1,27 @@
-use std::{error::Error, fmt::Debug, fs::read_to_string, path::PathBuf};
+use std::{fmt::Debug, fs::read_to_string, path::PathBuf};
 
+use color_eyre::eyre::{eyre, Result};
 use serde::Deserialize;
 
 use crate::otp::otp_element::OTPElement;
 
 /// Common flow for all the importers
-pub fn import_from_path<T>(path: PathBuf) -> Result<Vec<OTPElement>, Box<dyn Error>>
+pub fn import_from_path<T>(path: PathBuf) -> Result<Vec<OTPElement>>
 where
     T: for<'a> Deserialize<'a> + TryInto<Vec<OTPElement>>,
     <T as TryInto<Vec<OTPElement>>>::Error: Debug,
 {
     let json = read_to_string(path)?;
-    let deserialized: T = serde_json::from_str(json.as_str()).map_err(|e| e.to_string())?;
-    let mapped: Vec<OTPElement> = deserialized.try_into().map_err(|e| format!("{:?}", e))?;
+    let deserialized: T = serde_json::from_str(json.as_str()).map_err(|e| {
+        eyre!(
+            "Invalid JSON import format.
+            Please check the file you are trying to import. For further information please check these guidelines:
+            https://github.com/replydev/cotp?tab=readme-ov-file#migration-from-other-apps
+            
+            Specific error: {:?}",
+            e
+        )
+    })?;
+    let mapped: Vec<OTPElement> = deserialized.try_into().map_err(|e| eyre!("{:?}", e))?;
     Ok(mapped)
 }

src/importers/otp_uri.rs

@@ -14,3 +14,39 @@ impl TryFrom<OtpUriList> for Vec<OTPElement> {
             .collect()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::path::PathBuf;
+
+    use crate::{
+        exporters::otp_uri::OtpUriList, importers::importer::import_from_path,
+        otp::otp_element::OTPElement,
+    };
+
+    #[test]
+    fn test_conversion() {
+        //Arrange
+        let expected_element = OTPElement {
+            secret: String::from("AA"),
+            issuer: String::default(),
+            label: String::from("test"),
+            digits: 6,
+            type_: crate::otp::otp_type::OTPType::Totp,
+            algorithm: crate::otp::otp_algorithm::OTPAlgorithm::Sha1,
+            period: 30,
+            counter: None,
+            pin: None,
+        };
+
+        // Act
+        let mut imported = import_from_path::<OtpUriList>(PathBuf::from(
+            "test_samples/otp_uri/input_otp_uri.json",
+        ))
+        .unwrap();
+
+        // Assert
+        assert_eq!(1, imported.len());
+        assert_eq!(expected_element, imported.pop().unwrap())
+    }
+}

test_samples/otp_uri/input_otp_uri.json

@@ -0,0 +1,5 @@
+{
+    "items": [
+        "otpauth://totp/:test?secret=AA&algorithm=SHA1&digits=6&period=30&lock=false"
+    ]
+}