Refactor users management (#7)

* Improve general settings management by admin

src/data/user.rs

@@ -11,6 +11,18 @@ use crate::utils::time::{fmt_time, time};
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize, serde::Deserialize)]
 pub struct UserID(pub String);
 
+#[derive(Debug, Clone)]
+pub struct GeneralSettings {
+    pub uid: UserID,
+    pub username: String,
+    pub first_name: String,
+    pub last_name: String,
+    pub email: String,
+    pub enabled: bool,
+    pub two_factor_exemption_after_successful_login: bool,
+    pub is_admin: bool,
+}
+
 #[derive(Eq, PartialEq, Clone, Debug)]
 pub enum GrantedClients {
     AllClients,
@@ -177,6 +189,17 @@ impl User {
                 > time()
     }
 
+    pub fn update_general_settings(&mut self, settings: GeneralSettings) {
+        self.username = settings.username;
+        self.first_name = settings.first_name;
+        self.last_name = settings.last_name;
+        self.email = settings.email;
+        self.enabled = settings.enabled;
+        self.two_factor_exemption_after_successful_login =
+            settings.two_factor_exemption_after_successful_login;
+        self.admin = settings.is_admin;
+    }
+
     pub fn add_factor(&mut self, factor: TwoFactor) {
         self.two_factor.push(factor);
     }
@@ -256,7 +279,7 @@ impl Eq for User {}
 impl Default for User {
     fn default() -> Self {
         Self {
-            uid: UserID(uuid::Uuid::new_v4().to_string()),
+            uid: UserID("".to_string()),
             first_name: "".to_string(),
             last_name: "".to_string(),
             username: "".to_string(),

src/data/users_file_entity.rs

@@ -1,7 +1,7 @@
-use crate::actors::users_actor::UsersBackend;
+use crate::actors::users_actor::UsersSyncBackend;
 use crate::data::entity_manager::EntityManager;
-use crate::data::user::{FactorID, GrantedClients, TwoFactor, User, UserID};
-use crate::utils::err::Res;
+use crate::data::user::{FactorID, GeneralSettings, GrantedClients, TwoFactor, User, UserID};
+use crate::utils::err::{new_error, Res};
 use crate::utils::time::time;
 use std::net::IpAddr;
 
@@ -39,7 +39,7 @@ fn verify_password<P: AsRef<[u8]>>(pwd: P, hash: &str) -> bool {
     }
 }
 
-impl UsersBackend for EntityManager<User> {
+impl UsersSyncBackend for EntityManager<User> {
     fn find_by_username_or_email(&self, u: &str) -> Option<User> {
         for entry in self.iter() {
             if entry.username.eq(u) || entry.email.eq(u) {
@@ -62,6 +62,28 @@ impl UsersBackend for EntityManager<User> {
         self.cloned()
     }
 
+    fn create_user_account(&mut self, settings: GeneralSettings) -> Res<UserID> {
+        let mut user = User {
+            uid: UserID(uuid::Uuid::new_v4().to_string()),
+            ..Default::default()
+        };
+        user.update_general_settings(settings);
+        self.insert(user.clone())?;
+        Ok(user.uid)
+    }
+
+    fn set_general_user_settings(&mut self, settings: GeneralSettings) -> Res {
+        let res = self.update_user(&settings.uid.clone(), |mut user| {
+            user.update_general_settings(settings);
+            user
+        });
+
+        match res {
+            true => Ok(()),
+            false => new_error("Failed to update user general settings!".to_string()),
+        }
+    }
+
     fn change_user_password(&mut self, id: &UserID, password: &str, temporary: bool) -> bool {
         let new_hash = match hash_password(password) {
             Ok(h) => h,
@@ -144,8 +166,4 @@ impl UsersBackend for EntityManager<User> {
             user
         })
     }
-
-    fn update_or_insert_user(&mut self, user: User) -> Res {
-        self.update_or_push(user)
-    }
 }