improvements

indpurvesh · indpurvesh · commit e8c5d78dab61 · 2026-03-08T10:23:19.000+13:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,6 +33,7 @@ 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 }
 prost = { version = "0.14", optional = true }
+prost-types = { version = "0.14", optional = true }
 tonic-prost = { version = "0.14", optional = true }
 tracing = { version = "0.1", optional = true }
 gloo-storage = "0.3.0"
@@ -44,7 +45,11 @@ surrealdb = { version = "3.0.0", features = [
     "kv-rocksdb",
     "kv-mem",
 ], optional = true }
-web-sys = { version = "0.3.77", features = ["Window", "Storage"], optional = true }
+web-sys = { version = "0.3.77", features = [
+    "Window",
+    "Storage",
+], optional = true }
+pbjson-types = { version = "0.9.0", optional = false }
 
 
 [build-dependencies]
@@ -53,13 +58,19 @@ tonic-prost-build = "0.14"
 
 [features]
 default = ["ssr"]
-hydrate = ["leptos/hydrate", "dep:console_error_panic_hook", "dep:wasm-bindgen", "dep:web-sys"]
+hydrate = [
+    "leptos/hydrate",
+    "dep:console_error_panic_hook",
+    "dep:wasm-bindgen",
+    "dep:web-sys",
+]
 ssr = [
     "dep:axum",
     "dep:tokio",
     "dep:leptos_axum",
     "dep:tonic",
     "dep:prost",
+    "dep:prost-types",
     "dep:tonic-prost",
     "dep:tracing",
     "dep:tracing-subscriber",
@@ -70,7 +81,7 @@ ssr = [
     "leptos_router/ssr",
     "dep:surrealdb",
     "dep:jsonwebtoken",
-    "dep:chrono"
+    "dep:chrono",
 ]
 
 # Defines a size-optimized profile for the WASM bundle in release mode
diff --git a/build.rs b/build.rs
@@ -2,6 +2,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let proto_root = "./proto";
     let proto_files = &[
+        "admin_user_message.proto",
         "helloworld.proto",
         "misc.proto",
         "auth_user.proto",
@@ -18,6 +19,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let proto_out_dir = "src/infra/grpc";
 
     tonic_prost_build::configure()
+            .type_attribute(".", "#[derive(serde::Serialize)]")
+            .extern_path(".google.protobuf.Timestamp", "::pbjson_types::Timestamp")
             .out_dir(proto_out_dir)
             .build_server(true)
             .compile_protos(proto_files, &[proto_root])?;
diff --git a/proto/admin_user_message.proto b/proto/admin_user_message.proto
@@ -0,0 +1,19 @@
+syntax = "proto3";
+package admin_user_message;
+
+
+import "google/protobuf/timestamp.proto";
+
+
+
+message AdminUserMessage {
+    string full_name = 1;
+    string email = 2;
+    // password_hash is not included in the message for now
+    string profile_image = 3;
+    bool is_super_admin = 4;
+    string created_by = 5;
+    string updated_by = 6;
+    google.protobuf.Timestamp created_at = 7;
+    google.protobuf.Timestamp updated_at = 8;
+}
diff --git a/proto/auth_user.proto b/proto/auth_user.proto
@@ -1,15 +1,22 @@
 syntax = "proto3";
 package auth_user;
 
+import "admin_user_message.proto";
 
 // Login Service
 message LoginRequest {
   string email = 1;
   string password = 2;
 }
+
+message LoginResponseData {
+    admin_user_message.AdminUserMessage admin_user = 1;
+    string token = 2;
+}
+
 message LoginResponse {
   bool status = 1;
-  string data = 2;
+  LoginResponseData data = 2;
 }
 
 service Auth {
diff --git a/src/adapters/grpc_api/auth_user_api.rs b/src/adapters/grpc_api/auth_user_api.rs
@@ -22,14 +22,14 @@ impl Auth for AuthUserGrpcApi {
     ) -> Result<Response<LoginResponse>, Status> {
         let req = request.into_inner();
 
-        let token = self
+        let login_response_data = self
             .login_user_use_case
             .execute(&req.email, &req.password)
             .await?;
 
         let response = LoginResponse {
             status: true,
-            data: token,
+            data: Some(login_response_data),
         };
 
         Ok(Response::new(response))
diff --git a/src/application/use_cases/login_user_use_case.rs b/src/application/use_cases/login_user_use_case.rs
@@ -1,5 +1,7 @@
 use crate::domain::models::admin_user::TokenClaims;
 use crate::error::Result;
+use crate::infra::grpc::admin_user_message::AdminUserMessage;
+use crate::infra::grpc::auth_user::LoginResponseData;
 use crate::infra::setup::get_env;
 use crate::{
     application::extensions::string_extension::StringExtension,
@@ -17,25 +19,35 @@ impl LoginUserUseCase {
         Self { user_repository }
     }
 
-    pub async fn execute(&self, email: &str, password: &str) -> Result<String> {
+    pub async fn execute(&self, email: &str, password: &str) -> Result<LoginResponseData> {
         if let Some(admin_user_model) = self.user_repository.find_by_email(email).await {
             let raw_password = String::from(password);
             let is_valid = raw_password.verify_password_hash(&admin_user_model.password_hash)?;
 
             if is_valid {
                 let jwt_secret_key = get_env("AVORED_JWT_SECRET")?;
 
-                let claims: TokenClaims = admin_user_model.try_into()?;
+                let claims: TokenClaims = admin_user_model.clone().try_into()?;
 
                 let token = encode(
                     &Header::default(),
                     &claims,
                     &EncodingKey::from_secret(jwt_secret_key.as_bytes()),
                 )?;
 
-                return Ok(token);
+                let grpc_admin_user: AdminUserMessage = admin_user_model.try_into()?;
+
+                let login_response_data = LoginResponseData {
+                    admin_user: Some(grpc_admin_user),
+                    token,
+                };
+
+                return Ok(login_response_data);
             }
         }
-        Ok(String::from(""))
+        Ok(LoginResponseData {
+            admin_user: None,
+            token: String::from(""),
+        })
     }
 }
diff --git a/src/domain/models/admin_user.rs b/src/domain/models/admin_user.rs
@@ -1,5 +1,7 @@
 use crate::domain::models::BaseModel;
 use crate::error::{Error, Result};
+use crate::infra::grpc::admin_user_message::AdminUserMessage;
+use pbjson_types::Timestamp;
 use serde::{Deserialize, Serialize};
 use surrealdb::types::Datetime;
 use surrealdb::types::Value;
@@ -109,3 +111,27 @@ impl TryFrom<AdminUserModel> for TokenClaims {
         Ok(claims)
     }
 }
+
+
+
+impl TryFrom<AdminUserModel> for AdminUserMessage {
+    type Error = Error;
+
+    fn try_from(val: AdminUserModel) -> Result<Self> {
+        let created_at = Timestamp::from(val.created_at.to_utc());
+        let updated_at = Timestamp::from(val.updated_at.to_utc());
+        
+        let admin_user_message: Self = Self {
+            full_name: val.full_name,
+            email: val.email,
+            profile_image: val.profile_image,
+            is_super_admin: val.is_super_admin,
+            created_by: val.created_by,
+            updated_by: val.updated_by,
+            created_at: Some(created_at),
+            updated_at: Some(updated_at),
+        };
+
+        Ok(admin_user_message)
+    }
+}
diff --git a/src/infra/grpc/admin_user_message.rs b/src/infra/grpc/admin_user_message.rs
@@ -0,0 +1,22 @@
+// This file is @generated by prost-build.
+#[derive(serde::Serialize)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct AdminUserMessage {
+    #[prost(string, tag = "1")]
+    pub full_name: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub email: ::prost::alloc::string::String,
+    /// password_hash is not included in the message for now
+    #[prost(string, tag = "3")]
+    pub profile_image: ::prost::alloc::string::String,
+    #[prost(bool, tag = "4")]
+    pub is_super_admin: bool,
+    #[prost(string, tag = "5")]
+    pub created_by: ::prost::alloc::string::String,
+    #[prost(string, tag = "6")]
+    pub updated_by: ::prost::alloc::string::String,
+    #[prost(message, optional, tag = "7")]
+    pub created_at: ::core::option::Option<::pbjson_types::Timestamp>,
+    #[prost(message, optional, tag = "8")]
+    pub updated_at: ::core::option::Option<::pbjson_types::Timestamp>,
+}
diff --git a/src/infra/grpc/auth_user.rs b/src/infra/grpc/auth_user.rs
@@ -1,18 +1,28 @@
 // This file is @generated by prost-build.
 /// Login Service
+#[derive(serde::Serialize)]
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct LoginRequest {
     #[prost(string, tag = "1")]
     pub email: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
     pub password: ::prost::alloc::string::String,
 }
+#[derive(serde::Serialize)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct LoginResponseData {
+    #[prost(message, optional, tag = "1")]
+    pub admin_user: ::core::option::Option<super::admin_user_message::AdminUserMessage>,
+    #[prost(string, tag = "2")]
+    pub token: ::prost::alloc::string::String,
+}
+#[derive(serde::Serialize)]
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct LoginResponse {
     #[prost(bool, tag = "1")]
     pub status: bool,
-    #[prost(string, tag = "2")]
-    pub data: ::prost::alloc::string::String,
+    #[prost(message, optional, tag = "2")]
+    pub data: ::core::option::Option<LoginResponseData>,
 }
 /// Generated client implementations.
 pub mod auth_client {
diff --git a/src/infra/grpc/helloworld.rs b/src/infra/grpc/helloworld.rs
@@ -1,9 +1,11 @@
 // This file is @generated by prost-build.
+#[derive(serde::Serialize)]
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct HelloRequest {
     #[prost(string, tag = "1")]
     pub name: ::prost::alloc::string::String,
 }
+#[derive(serde::Serialize)]
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct HelloReply {
     #[prost(string, tag = "1")]
diff --git a/src/infra/grpc/misc.rs b/src/infra/grpc/misc.rs
@@ -1,11 +1,14 @@
 // This file is @generated by prost-build.
+#[derive(serde::Serialize)]
 #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct HealthCheckRequest {}
+#[derive(serde::Serialize)]
 #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct HealthCheckResponse {
     #[prost(bool, tag = "1")]
     pub status: bool,
 }
+#[derive(serde::Serialize)]
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct SetupRequest {
     #[prost(string, tag = "1")]
@@ -15,6 +18,7 @@ pub struct SetupRequest {
     #[prost(string, tag = "3")]
     pub password: ::prost::alloc::string::String,
 }
+#[derive(serde::Serialize)]
 #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct SetupResponse {
     #[prost(bool, tag = "1")]
diff --git a/src/infra/grpc/mod.rs b/src/infra/grpc/mod.rs
@@ -1,3 +1,4 @@
 pub mod misc;
 pub mod helloworld;
 pub mod auth_user;
+pub mod admin_user_message;
diff --git a/src/infra/mod.rs b/src/infra/mod.rs
@@ -1,4 +1,5 @@
 pub mod app;
+#[cfg(feature = "ssr")]
 pub mod grpc;
 pub mod repositories;
 pub mod setup;
diff --git a/src/pages/auth/login_page.rs b/src/pages/auth/login_page.rs
@@ -3,11 +3,14 @@ use rust_i18n::t;
 #[cfg(target_arch = "wasm32")]
 use crate::pages::protected_routes::AuthContext;
 
+
+
 #[cfg(feature = "ssr")]
 pub mod ssr {
     use crate::infra::grpc::auth_user::{auth_client::AuthClient, LoginRequest};
     use leptos::prelude::ServerFnError;
 
+
     pub async fn login_user_grpc(email: String, password: String) -> Result<String, ServerFnError> {
         let mut client = AuthClient::connect("http://127.0.0.1:3000")
             .await
@@ -22,9 +25,11 @@ pub mod ssr {
 
         let inner = response.into_inner();
         if inner.status {
-            Ok(inner.data)
+            let grpc_login_user_response = inner.data.unwrap_or_default();
+            let json = serde_json::to_string(&grpc_login_user_response).map_err(|e| ServerFnError::new(format!("JSON error: {}", e)))?;
+            Ok(json)
         } else {
-            Err(ServerFnError::new(inner.data))
+            Err(ServerFnError::new("Login failed: invalid response status"))
         }
     }
 }
