From 282731d2603716f26a56ac1998525ab554f1db0f Mon Sep 17 00:00:00 2001
From: MedzikUser <medzik@duck.com>
Date: Wed, 13 Jul 2022 11:20:30 +0200
Subject: [PATCH] fix(server): `auth/register` handle panic

---
 database/src/sqlite.rs      | 2 +-
 server/src/auth/register.rs | 5 +++--
 server/src/fs/delete.rs     | 1 -
 types/src/errors/server.rs  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/database/src/sqlite.rs b/database/src/sqlite.rs
index ea974ab..975c840 100644
--- a/database/src/sqlite.rs
+++ b/database/src/sqlite.rs
@@ -40,7 +40,7 @@ impl Database {
         options.log_statements(LevelFilter::Debug);
 
         // create a database pool
-        let conn = SqlitePool::connect_with(options.clone())
+        let conn = SqlitePool::connect_with(options)
             .await
             .map_err(Error::ConnectDatabase)?;
 
diff --git a/server/src/auth/register.rs b/server/src/auth/register.rs
index 17336cf..e451935 100644
--- a/server/src/auth/register.rs
+++ b/server/src/auth/register.rs
@@ -5,7 +5,7 @@ use homedisk_database::{Database, User};
 use homedisk_types::{
     auth::login::{Request, Response},
     config::Config,
-    errors::{AuthError, ServerError},
+    errors::{AuthError, FsError, ServerError},
 };
 
 use crate::middleware::{create_token, validate_json};
@@ -62,7 +62,8 @@ pub async fn handle(
         storage = config.storage.path,
         username = user.username,
     );
-    fs::create_dir_all(&user_dir).unwrap();
+    fs::create_dir_all(&user_dir)
+        .map_err(|e| ServerError::FsError(FsError::CreateDirectory(e.to_string())))?;
 
     Ok(Json(response))
 }
diff --git a/server/src/fs/delete.rs b/server/src/fs/delete.rs
index 1672b8e..6a1be6e 100644
--- a/server/src/fs/delete.rs
+++ b/server/src/fs/delete.rs
@@ -44,7 +44,6 @@ pub async fn handle(
     // delete file
     if path.is_file() {
         fs::remove_file(&path)
-            // return error
             .map_err(|err| ServerError::FsError(FsError::DeleteFile(err.to_string())))?;
     }
     // delete directory
diff --git a/types/src/errors/server.rs b/types/src/errors/server.rs
index fb2304a..f2f982f 100644
--- a/types/src/errors/server.rs
+++ b/types/src/errors/server.rs
@@ -28,7 +28,7 @@ pub enum Error {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 enum ResponseError {
-    Error(String)
+    Error(String),
 }
 
 impl Error {