improvements

Author: indpurvesh

Cargo.lock

@@ -32,6 +32,7 @@ wasm-bindgen = { version = "0.2.106", optional = true }
 tonic = { version = "0.14", optional = true }
 jsonwebtoken = { version = "10.2.0", features = ["aws_lc_rs"], optional = true }
 chrono = { version = "0.4.42", features = [], optional = true }
+email_address = { version = "0.2.9", optional = false}
 prost = { version = "0.14", optional = true }
 prost-types = { version = "0.14", optional = true }
 tonic-prost = { version = "0.14", optional = true }

Cargo.toml

@@ -3,5 +3,6 @@
     "email_address": "Email address",
     "password": "Password",
     "forgot_your_password": "Forgot your password?",
-    "sign_in": "Sign in"
+    "sign_in": "Sign in",
+    "validation_required": "%{attribute} is required"
 }

resources/locales/en.json

@@ -1,5 +1,7 @@
 use crate::application::use_cases::login_user_use_case::LoginUserUseCase;
+use crate::domain::models::validation_error::{ErrorMessage, ErrorResponse, Validate};
 use crate::infra::grpc::auth_user::{auth_server::Auth, LoginRequest, LoginResponse};
+use rust_i18n::t;
 use tonic::{Request, Response, Status};
 
 pub struct AuthUserGrpcApi {
@@ -22,6 +24,8 @@ impl Auth for AuthUserGrpcApi {
     ) -> Result<Response<LoginResponse>, Status> {
         let req = request.into_inner();
 
+        req.validate().await?;
+
         let login_response_data = self
             .login_user_use_case
             .execute(&req.email, &req.password)
@@ -35,3 +39,59 @@ impl Auth for AuthUserGrpcApi {
         Ok(Response::new(response))
     }
 }
+
+
+
+
+impl LoginRequest {
+    /// validate
+    pub async fn validate(&self) -> crate::error::Result<()> {
+        let mut errors: Vec<ErrorMessage> = vec![];
+        let mut valid = true;
+        let locale = "en";
+
+        if !self.email.required()? {
+            let error_message = ErrorMessage {
+                key: String::from("email"),
+                message: t!("validation_required", locale = locale, attribute = t!("email", locale = locale)).to_string(),
+            };
+            valid = false;
+            errors.push(error_message);
+        }
+
+        if !self.email.validate_email()? {
+            let error_message = ErrorMessage {
+                key: String::from("email"),
+                message: t!("email_address_not_valid", locale = locale).to_string(),
+            };
+
+            valid = false;
+            errors.push(error_message);
+        }
+
+    
+
+        // if profile photo exist then certain type of photo is only allowed
+        if !self.password.required()? {
+            let error_message = ErrorMessage {
+                key: String::from("password"),
+                message: t!("validation_required", locale = locale, attribute = t!("password", locale = locale)).to_string(),
+            };
+
+            valid = false;
+            errors.push(error_message);
+        }
+
+
+        if !valid {
+            let error_response = ErrorResponse {
+                status: valid,
+                errors,
+            };
+            let error_string = serde_json::to_string(&error_response)?;
+            return Err(crate::error::Error::InvalidArgument(error_string));
+        }
+
+        Ok(())
+    }
+}

src/adapters/grpc_api/auth_user_api.rs

@@ -4,6 +4,7 @@ use surrealdb::types::{Datetime, RecordIdKey, Value};
 
 pub mod user;
 pub mod admin_user;
+pub mod validation_error;
 
 
 

src/domain/models/mod.rs

@@ -0,0 +1,51 @@
+use email_address::EmailAddress;
+use serde::Serialize;
+
+
+/// Represents an error message with a key and a message
+#[derive(Debug, Serialize, Clone)]
+pub struct ErrorMessage {
+
+    /// Key associated with the error message
+    pub key: String,
+    
+    /// The error message itself
+    pub message: String,
+}
+
+/// Represents a response containing errors
+#[derive(Debug, Serialize, Clone)]
+pub struct ErrorResponse {
+
+    /// Indicates whether the validation was successful
+    pub status: bool,
+
+    /// A list of error messages
+    pub errors: Vec<ErrorMessage>,
+}
+
+/// Trait for validating input data
+pub trait Validate {
+
+    /// Checks if the input is required
+    fn required(&self) -> crate::error::Result<bool>;
+
+    /// Validates if the input is a valid email address
+    fn validate_email(&self) -> crate::error::Result<bool>;
+}
+
+impl Validate for String {
+    fn required(&self) -> crate::error::Result<bool> {
+        if !self.is_empty() {
+            return Ok(true);
+        }
+        Ok(false)
+    }
+
+    fn validate_email(&self) -> crate::error::Result<bool> {
+        if !EmailAddress::is_valid(self) {
+            return Ok(false);
+        }
+        Ok(true)
+    }
+}

src/domain/models/validation_error.rs

@@ -1,7 +1,13 @@
-use leptos::{config::errors::LeptosConfigError};
+use axum::{
+    http::StatusCode,
+    response::{IntoResponse, Response},
+};
+use leptos::config::errors::LeptosConfigError;
 use tonic::Status;
 use tracing::error;
 
+use crate::domain::models::validation_error::ErrorResponse;
+
 /// This is custom Result type for the application.
 pub type Result<T> = core::result::Result<T, Error>;
 
@@ -13,6 +19,11 @@ pub enum Error {
     /// Error when the password encryption has some issue.
     Argon2(Box<argon2::password_hash::Error>),
 
+    /// Error when the request is bad.
+    BadRequest(ErrorResponse),
+
+    /// Error when the request is forbidden.
+    InvalidArgument(String),
 }
 
 impl core::fmt::Display for Error {
@@ -56,8 +67,25 @@ impl From<jsonwebtoken::errors::Error> for Error {
     }
 }
 
+impl From<std::io::Error> for Error {
+    fn from(error: std::io::Error) -> Self {
+        error!("IO error: {error:?}");
+        Self::Generic(format!("IO error: {error}"))
+    }
+}
+
+impl From<serde_json::Error> for Error {
+    fn from(error: serde_json::Error) -> Self {
+        error!("serde_json error: {error:?}");
+        Self::Generic(format!("serde_json error: {error}"))
+    }
+}
+
 // 
 
+
+//
+
 impl From<Error> for Status {
     fn from(val: Error) -> Self {
         match val {
@@ -69,19 +97,29 @@ impl From<Error> for Status {
             // Error::Unauthenticated(error_message) => {
             //     Self::unauthenticated(error_message)
             // },
-            Error::Argon2(boxed_error) => {
-                Self::internal(format!("Argon2 error: {boxed_error:?}"))
-            },
-            _ => Self::invalid_argument("500 Internal server error")
+            Error::Argon2(boxed_error) => Self::internal(format!("Argon2 error: {boxed_error:?}")),
+            Error::InvalidArgument(error_response) => Self::invalid_argument(error_response),
+            Error::BadRequest(str) => {
+                let validation_errors = match serde_json::to_string(&str) {
+                    Ok(str) => str,
+                    _ => "validation error 400.".to_string(),
+                };
+
+                Self::invalid_argument(validation_errors)
+            }
+            _ => Self::internal("500 Internal server error"),
         }
     }
 }
 
+impl IntoResponse for ErrorResponse {
+    fn into_response(self) -> Response {
+        let validation_errors = match serde_json::to_string(&self) {
+            Ok(str) => str,
+            _ => "validation error 400.".to_string(),
+        };
 
-impl From<std::io::Error> for Error {
-    fn from(error: std::io::Error) -> Self {
-        error!("IO error: {error:?}");
-        Self::Generic(format!("IO error: {error}"))
+        (StatusCode::BAD_REQUEST, validation_errors).into_response()
     }
 }
 

src/error.rs

@@ -62,6 +62,12 @@ pub fn AppLayout() -> impl IntoView {
                     <div class="pt-4 pb-2 px-3 text-xs font-semibold text-gray-500 uppercase tracking-wider">
                         "System"
                     </div>
+                    <a href="/admin/entity" class="flex items-center gap-3 px-3 py-2 rounded-lg text-gray-300 hover:bg-slate-800 hover:text-white transition-colors">
+                        <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 7.5l-9-5.25L3 7.5m18 0l-9 5.25m9-5.25v9l-9 5.25M3 7.5l9 5.25M3 7.5v9l9 5.25m0-9v9" />
+                        </svg>
+                        <span>"Entity"</span>
+                    </a>    
                     <a href="/admin/users" class="flex items-center gap-3 px-3 py-2 rounded-lg text-gray-300 hover:bg-slate-800 hover:text-white transition-colors">
                         <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4.354a4 4 0 110 5.292M15 21H3v-1a6 6 0 0112 0v1zm0 0h6v-1a6 6 0 00-9-5.197M13.471 14.172a4 4 0 015.658 0L21 17.5" />