From cc41fbbaa4fbfa4af0c27e0323ec62fd1e3a6af3 Mon Sep 17 00:00:00 2001 From: StNicolay Date: Sun, 4 Jun 2023 18:19:54 +0300 Subject: [PATCH] Updated DecryptedAccount::validate to use an all method of the iterators --- src/models.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/models.rs b/src/models.rs index 0b53b98..0940c66 100644 --- a/src/models.rs +++ b/src/models.rs @@ -4,6 +4,8 @@ use cryptography::prelude::*; use entity::prelude::*; use serde::{Deserialize, Serialize}; +use crate::utils::validate_field; + #[derive(Serialize, Deserialize)] pub struct DecryptedAccount { pub name: String, @@ -43,15 +45,9 @@ impl DecryptedAccount { /// Returns true if the account's fields are valid #[inline] pub fn validate(&self) -> bool { - for string in [&self.name, &self.login, &self.password] { - let is_invalid = string - .chars() - .any(|char| char == '`' || char == '\\' || char == '\n'); - if is_invalid { - return false; - } - } - true + [&self.name, &self.login, &self.password] + .into_iter() + .all(|field| validate_field(field)) } }