Refactor users management (#2)

* Create UserBackend trait

src/actors/users_actor.rs

@@ -1,8 +1,23 @@
 use actix::{Actor, Context, Handler, Message, MessageResult};
 use std::net::IpAddr;
 
-use crate::data::entity_manager::EntityManager;
 use crate::data::user::{User, UserID};
+use crate::utils::err::Res;
+
+/// User storage interface
+pub trait UsersBackend {
+    fn find_by_username_or_email(&self, u: &str) -> Option<User>;
+    fn find_by_user_id(&self, id: &UserID) -> Option<User>;
+    fn get_entire_users_list(&self) -> Vec<User>;
+    fn change_user_password(&mut self, id: &UserID, password: &str, temporary: bool) -> bool;
+    fn verify_user_password(&self, user: &UserID, password: &str) -> bool;
+    fn save_new_successful_2fa_authentication(&mut self, id: &UserID, ip: IpAddr) -> bool;
+    fn clear_2fa_login_history(&mut self, id: &UserID) -> bool;
+    fn delete_account(&mut self, id: &UserID) -> bool;
+
+    // FIXME : remove this
+    fn update_or_insert_user(&mut self, user: User) -> Res;
+}
 
 #[derive(Debug)]
 pub enum LoginResult {
@@ -69,12 +84,17 @@ pub struct UpdateUserRequest(pub User);
 pub struct DeleteUserRequest(pub UserID);
 
 pub struct UsersActor {
-    manager: EntityManager<User>,
+    manager: Box<dyn UsersBackend>,
 }
 
 impl UsersActor {
-    pub fn new(manager: EntityManager<User>) -> Self {
-        Self { manager }
+    pub fn new<E>(manager: E) -> Self
+    where
+        E: UsersBackend + 'static,
+    {
+        Self {
+            manager: Box::new(manager),
+        }
     }
 }
 
@@ -158,7 +178,7 @@ impl Handler<GetAllUsersRequest> for UsersActor {
     type Result = MessageResult<GetAllUsersRequest>;
 
     fn handle(&mut self, _msg: GetAllUsersRequest, _ctx: &mut Self::Context) -> Self::Result {
-        MessageResult(GetAllUsersResult(self.manager.cloned()))
+        MessageResult(GetAllUsersResult(self.manager.get_entire_users_list()))
     }
 }
 
@@ -166,7 +186,7 @@ impl Handler<UpdateUserRequest> for UsersActor {
     type Result = <UpdateUserRequest as actix::Message>::Result;
 
     fn handle(&mut self, msg: UpdateUserRequest, _ctx: &mut Self::Context) -> Self::Result {
-        match self.manager.update_or_push(msg.0) {
+        match self.manager.update_or_insert_user(msg.0) {
             Ok(_) => true,
             Err(e) => {
                 log::error!("Failed to update user information! {:?}", e);
@@ -180,23 +200,6 @@ impl Handler<DeleteUserRequest> for UsersActor {
     type Result = <DeleteUserRequest as actix::Message>::Result;
 
     fn handle(&mut self, msg: DeleteUserRequest, _ctx: &mut Self::Context) -> Self::Result {
-        let user = match self.manager.find_by_user_id(&msg.0) {
-            None => {
-                log::warn!(
-                    "Could not delete account {:?} because it was not found!",
-                    msg.0
-                );
-                return false;
-            }
-            Some(s) => s,
-        };
-
-        match self.manager.remove(&user) {
-            Ok(_) => true,
-            Err(e) => {
-                log::error!("Failed to update delete account! {:?}", e);
-                false
-            }
-        }
+        self.manager.delete_account(&msg.0)
     }
 }