Improved error messages. Added README.md

src/backend/user.rs

@@ -105,9 +105,10 @@ cfg_if! { if #[cfg(feature = "ssr")] {
 pub async fn login(username: String, password: String) -> Result<ApiResponse<()>, ServerFnError> {
     use actix_session::*;
     use leptos_actix::extract;
-    use actix_web::http::StatusCode;
-    use leptos_actix::ResponseOptions;
+    //use actix_web::http::StatusCode;
+    //use leptos_actix::ResponseOptions;
     use crate::backend::get_pool;
+    use crate::locales::trl;
 
     let pool = get_pool().await?;
     let user = user_from_login(&pool, &username).await.unwrap_or(User::default());
@@ -123,10 +124,10 @@ pub async fn login(username: String, password: String) -> Result<ApiResponse<()>
     }
 
     warn!("Login failed for user {}", username);
-    let response = expect_context::<ResponseOptions>();
-    response.set_status(StatusCode::UNAUTHORIZED);
+    //let response = expect_context::<ResponseOptions>();
+    //response.set_status(StatusCode::UNAUTHORIZED);
 
-    return Ok(ApiResponse::Error("Bad username or password".to_string()))
+    Ok(ApiResponse::Error(trl("Bad username or password")()))
 }
 
 #[server]
@@ -173,15 +174,16 @@ pub async fn get_users() -> Result<ApiResponse<Vec<User>>, ServerFnError> {
 pub async fn update_profile(user: UserProfile) -> Result<ApiResponse<()>, ServerFnError> {
     use crate::user_check;
     use crate::backend::get_pool;
+    use crate::locales::trl;
 
     user_check!(user.login());
     let usr = logged_in_user().await.unwrap_or(User::default());
 
     if !usr.admin && user.admin() {
-        let response = expect_context::<ResponseOptions>();
-        response.set_status(StatusCode::FORBIDDEN);
+        //let response = expect_context::<ResponseOptions>();
+        //response.set_status(StatusCode::FORBIDDEN);
 
-        return Ok(ApiResponse::Error("You can't escalate your privileges".to_string()))
+        return Ok(ApiResponse::Error(trl("You can't escalate your privileges")()))
     }
 
     let pool = get_pool().await?;
@@ -213,6 +215,7 @@ impl ForValidation for UpdateProfile {
 pub async fn change_pwd(new_pw: PwdChange) -> Result<ApiResponse<()>, ServerFnError> {
     use crate::user_check;
     use crate::backend::get_pool;
+    use crate::locales::trl;
 
     user_check!(new_pw.login());
 
@@ -222,10 +225,10 @@ pub async fn change_pwd(new_pw: PwdChange) -> Result<ApiResponse<()>, ServerFnEr
 
     if (!user.admin || user.login == new_pw.login())
         && !pwhash::bcrypt::verify(new_pw.old_password(), &usr.password) {
-        let response = expect_context::<ResponseOptions>();
-        response.set_status(StatusCode::UNAUTHORIZED);
+        //let response = expect_context::<ResponseOptions>();
+        //response.set_status(StatusCode::UNAUTHORIZED);
 
-        return Ok(ApiResponse::Error("Invalid old password".to_string()))
+        return Ok(ApiResponse::Error(trl("Invalid old password")()))
     }
 
     sqlx::query(r#"UPDATE "user" SET password = $1 WHERE login = $2"#)
@@ -249,6 +252,7 @@ impl ForValidation for ChangePwd {
 pub async fn create_user(user: UserProfile) -> Result<ApiResponse<()>, ServerFnError> {
     use crate::perm_check;
     use crate::backend::get_pool;
+    use crate::locales::trl;
 
     perm_check!(is_admin);
 
@@ -259,10 +263,10 @@ pub async fn create_user(user: UserProfile) -> Result<ApiResponse<()>, ServerFnE
         .await?;
 
     if count.0 != 0 {
-        let response = expect_context::<ResponseOptions>();
-        response.set_status(StatusCode::CONFLICT);
+        //let response = expect_context::<ResponseOptions>();
+        //response.set_status(StatusCode::CONFLICT);
 
-        return Ok(ApiResponse::Error("Username already exists".to_string()));
+        return Ok(ApiResponse::Error(trl("Username already exists")()));
     }
 
     let usr_pw = user.password().clone();
@@ -292,15 +296,16 @@ impl ForValidation for CreateUser {
 pub async fn delete_user(id: i32) -> Result<ApiResponse<()>, ServerFnError> {
     use crate::perm_check;
     use crate::backend::get_pool;
+    use crate::locales::trl;
 
     perm_check!(is_admin);
     let user = logged_in_user().await.unwrap_or_default();
 
     if user.id() == id {
-        let response = expect_context::<ResponseOptions>();
-        response.set_status(StatusCode::NOT_ACCEPTABLE);
+        //let response = expect_context::<ResponseOptions>();
+        //response.set_status(StatusCode::NOT_ACCEPTABLE);
 
-        return Ok(ApiResponse::Error("You can't delete yourself".to_string()))
+        return Ok(ApiResponse::Error(trl("You can't delete yourself")()))
     }
 
     sqlx::query(r#"DELETE FROM "user" WHERE id=$1"#)
@@ -317,5 +322,9 @@ pub async fn delete_user(id: i32) -> Result<ApiResponse<()>, ServerFnError> {
 pub async fn get_pow() -> Result<String, ServerFnError> {
     use leptos_captcha::spow::pow::Pow;
 
-    Ok(Pow::new(10)?.to_string())
+    if !cfg!(debug_assertions) {
+        Ok(Pow::with_difficulty(10, 10)?.to_string())
+    } else {
+        Ok(Pow::new(10)?.to_string())
+    }
 }