Fix cotp database import

Author: replydev

src/argument_functions.rs

@@ -10,7 +10,9 @@ use zeroize::Zeroize;
 pub fn import(matches: &ArgMatches, database: &mut OTPDatabase) -> Result<String, String> {
     let path = matches.get_one::<String>("path").unwrap();
 
-    let result = if matches.get_flag("cotp") || matches.get_flag("andotp") {
+    let result = if matches.get_flag("cotp") {
+        importers::cotp::import(path)
+    } else if matches.get_flag("andotp") {
         importers::and_otp::import(path)
     } else if matches.get_flag("aegis") {
         importers::aegis::import(path)

src/importers/and_otp.rs

@@ -1,18 +1,16 @@
-use std::fs::read_to_string;
-
-use crate::otp::otp_element::OTPElement;
-
-//no need to declare andOTP json struct cause it's the same as OTP element
-
-pub fn import(filepath: &str) -> Result<Vec<OTPElement>, String> {
-    let file_to_import_contents = match read_to_string(filepath) {
-        Ok(result) => result,
-        Err(e) => return Err(format!("Error during file reading: {:?}", e)),
-    };
-    let result: Result<Vec<OTPElement>, serde_json::Error> =
-        serde_json::from_str(&file_to_import_contents);
-    match result {
-        Ok(element) => Ok(element),
-        Err(e) => Err(format!("Failed to serialize file: {}", e)),
-    }
-}
+use std::fs::read_to_string;
+
+use crate::otp::otp_element::OTPElement;
+
+//no need to declare andOTP json struct cause it's the same as OTP element
+pub fn import(filepath: &str) -> Result<Vec<OTPElement>, String> {
+    let file_to_import_contents = match read_to_string(filepath) {
+        Ok(result) => result,
+        Err(e) => return Err(format!("Error during file reading: {:?}", e)),
+    };
+
+    match serde_json::from_str::<Vec<OTPElement>>(&file_to_import_contents) {
+        Ok(elements) => Ok(elements),
+        Err(e) => Err(format!("Failed to serialize file: {}", e)),
+    }
+}

src/importers/cotp.rs

@@ -0,0 +1,18 @@
+use std::fs::read_to_string;
+
+use crate::otp::otp_element::{OTPDatabase, OTPElement};
+
+pub fn import(filepath: &str) -> Result<Vec<OTPElement>, String> {
+    let file_to_import_contents = match read_to_string(filepath) {
+        Ok(result) => result,
+        Err(e) => return Err(format!("Error during file reading: {:?}", e)),
+    };
+
+    match serde_json::from_str::<OTPDatabase>(&file_to_import_contents) {
+        Ok(database) => Ok(database.elements),
+        Err(_e) => match serde_json::from_str::<Vec<OTPElement>>(&file_to_import_contents) {
+            Ok(elements) => Ok(elements),
+            Err(e) => Err(format!("Failed to serialize file: {}", e)),
+        },
+    }
+}

src/importers/mod.rs

@@ -3,4 +3,5 @@ pub mod aegis_encrypted;
 pub mod and_otp;
 pub mod authy_remote_debug;
 pub mod converted;
+pub mod cotp;
 pub mod freeotp_plus;