Add comprehensive documentation and unit tests
Documentation: - Add detailed README files for all services (auth, character, database, launcher, packet, utils, world) - Create API documentation for the database service with detailed endpoint specifications - Document database schema and relationships - Add service architecture overviews and configuration instructions Unit Tests: - Implement comprehensive test suite for database repositories (user, character, session) - Add gRPC service tests for database interactions - Create tests for packet service components (bufferpool, connection, packets) - Add utility service tests (health check, logging, load balancer, redis cache, service discovery) - Implement auth service user tests - Add character service tests Code Structure: - Reorganize test files into a more consistent structure - Create a dedicated tests crate for integration testing - Add test helpers and mock implementations for easier testing
This commit is contained in:
@@ -1,16 +1,12 @@
|
||||
use crate::auth::auth_service_server::AuthService;
|
||||
use crate::auth::{
|
||||
LoginRequest, LoginResponse, LogoutRequest, PasswordResetRequest, PasswordResetResponse,
|
||||
RefreshSessionResponse, RegisterRequest, RegisterResponse, ResetPasswordRequest,
|
||||
ResetPasswordResponse, ValidateSessionRequest, ValidateSessionResponse, ValidateTokenRequest, ValidateTokenResponse,
|
||||
LoginRequest, LoginResponse, LogoutRequest, RefreshSessionResponse, ValidateSessionRequest,
|
||||
ValidateSessionResponse, ValidateTokenRequest, ValidateTokenResponse,
|
||||
};
|
||||
use crate::common::Empty;
|
||||
use crate::database_client::{DatabaseClient, DatabaseClientTrait};
|
||||
use crate::database_client::{DatabaseClient};
|
||||
use crate::session::session_service_client::SessionServiceClient;
|
||||
use crate::session::{GetSessionRequest, RefreshSessionRequest};
|
||||
use crate::users::{hash_password, verify_user};
|
||||
use chrono::{Duration, Utc};
|
||||
use rand::Rng;
|
||||
use std::sync::Arc;
|
||||
use tonic::{Request, Response, Status};
|
||||
use tracing::{debug, error, info, warn};
|
||||
@@ -22,22 +18,19 @@ pub struct MyAuthService {
|
||||
|
||||
#[tonic::async_trait]
|
||||
impl AuthService for MyAuthService {
|
||||
async fn login(
|
||||
&self,
|
||||
request: Request<LoginRequest>,
|
||||
) -> Result<Response<LoginResponse>, Status> {
|
||||
async fn login(&self, _request: Request<LoginRequest>) -> Result<Response<LoginResponse>, Status> {
|
||||
Err(Status::unimplemented("login not implemented due to changes"))
|
||||
}
|
||||
|
||||
async fn logout(&self, request: Request<LogoutRequest>) -> Result<Response<Empty>, Status> {
|
||||
let req = request.into_inner();
|
||||
let _req = request.into_inner();
|
||||
|
||||
Ok(Response::new(Empty {}))
|
||||
}
|
||||
|
||||
async fn validate_token(
|
||||
&self,
|
||||
request: Request<ValidateTokenRequest>,
|
||||
_request: Request<ValidateTokenRequest>,
|
||||
) -> Result<Response<ValidateTokenResponse>, Status> {
|
||||
Ok(Response::new(ValidateTokenResponse {
|
||||
valid: false,
|
||||
@@ -51,20 +44,32 @@ impl AuthService for MyAuthService {
|
||||
request: Request<ValidateSessionRequest>,
|
||||
) -> Result<Response<ValidateSessionResponse>, Status> {
|
||||
let req = request.into_inner();
|
||||
let response = self.session_client.as_ref().clone()
|
||||
let response = self
|
||||
.session_client
|
||||
.as_ref()
|
||||
.clone()
|
||||
.get_session(GetSessionRequest {
|
||||
session_id: req.session_id,
|
||||
}).await;
|
||||
})
|
||||
.await;
|
||||
|
||||
match response {
|
||||
Ok(res) => {
|
||||
let res = res.into_inner();
|
||||
debug!("Session valid: {:?}", res);
|
||||
Ok(Response::new(ValidateSessionResponse { valid: true, session_id: res.session_id.to_string(), user_id: res.user_id.to_string() }))
|
||||
Ok(Response::new(ValidateSessionResponse {
|
||||
valid: true,
|
||||
session_id: res.session_id.to_string(),
|
||||
user_id: res.user_id.to_string(),
|
||||
}))
|
||||
}
|
||||
Err(error) => {
|
||||
debug!("Session invalid or not found: {error}");
|
||||
Ok(Response::new(ValidateSessionResponse { valid: false, session_id: "".to_string(), user_id: "".to_string() }))
|
||||
Ok(Response::new(ValidateSessionResponse {
|
||||
valid: false,
|
||||
session_id: "".to_string(),
|
||||
user_id: "".to_string(),
|
||||
}))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -95,126 +100,4 @@ impl AuthService for MyAuthService {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn register(
|
||||
&self,
|
||||
request: Request<RegisterRequest>,
|
||||
) -> Result<Response<RegisterResponse>, Status> {
|
||||
// let req = request.into_inner();
|
||||
//
|
||||
// // Hash the password
|
||||
// let hashed_password = hash_password(&req.password);
|
||||
//
|
||||
// // Create user in the database
|
||||
// let result = self
|
||||
// .db_client
|
||||
// .as_ref()
|
||||
// .clone()
|
||||
// .create_user(&req.username, &req.email, &hashed_password)
|
||||
// .await;
|
||||
//
|
||||
// match result {
|
||||
// Ok(user) => Ok(Response::new(RegisterResponse {
|
||||
// user_id: user.user_id,
|
||||
// message: "User registered successfully".into(),
|
||||
// })),
|
||||
// Err(e) => {
|
||||
// error!("Failed to register user: {:?}", e);
|
||||
// Err(Status::internal("Failed to register user"))
|
||||
// }
|
||||
// }
|
||||
Err(Status::unimplemented("register not implemented"))
|
||||
}
|
||||
|
||||
async fn request_password_reset(
|
||||
&self,
|
||||
request: Request<PasswordResetRequest>,
|
||||
) -> Result<Response<PasswordResetResponse>, Status> {
|
||||
let email = request.into_inner().email;
|
||||
|
||||
let user = self
|
||||
.db_client
|
||||
.as_ref()
|
||||
.clone()
|
||||
.get_user_by_email(&email)
|
||||
.await;
|
||||
|
||||
// Check if the email exists
|
||||
if user.ok().is_some() {
|
||||
// Generate a reset token
|
||||
let reset_token: String = rand::thread_rng()
|
||||
.sample_iter(&rand::distributions::Alphanumeric)
|
||||
.take(32)
|
||||
.map(char::from)
|
||||
.collect();
|
||||
|
||||
// Set token expiration (e.g., 1 hour)
|
||||
let expires_at = Utc::now() + Duration::hours(1);
|
||||
|
||||
// Store the reset token in the database
|
||||
self.db_client
|
||||
.as_ref()
|
||||
.clone()
|
||||
.store_password_reset(&email, &reset_token, expires_at)
|
||||
.await
|
||||
.map_err(|e| Status::internal(format!("Database error: {}", e)))?;
|
||||
|
||||
// Send the reset email
|
||||
// send_email(&email, "Password Reset Request", &format!(
|
||||
// "Click the link to reset your password: https://azgstudio.com/reset?token={}",
|
||||
// reset_token
|
||||
// ))
|
||||
// .map_err(|e| Status::internal(format!("Email error: {}", e)))?;
|
||||
|
||||
Ok(Response::new(PasswordResetResponse {
|
||||
message: "Password reset email sent".to_string(),
|
||||
}))
|
||||
} else {
|
||||
// Respond with a generic message to avoid information leaks
|
||||
Ok(Response::new(PasswordResetResponse {
|
||||
message: "If the email exists, a reset link has been sent.".to_string(),
|
||||
}))
|
||||
}
|
||||
}
|
||||
|
||||
async fn reset_password(
|
||||
&self,
|
||||
request: Request<ResetPasswordRequest>,
|
||||
) -> Result<Response<ResetPasswordResponse>, Status> {
|
||||
let req = request.into_inner();
|
||||
|
||||
// Validate the reset token
|
||||
if let Some(password_reset) = self
|
||||
.db_client
|
||||
.clone()
|
||||
.get_password_reset(&req.reset_token)
|
||||
.await
|
||||
.map_err(|e| Status::internal(format!("Database error: {}", e)))?
|
||||
{
|
||||
if password_reset.expires_at < Utc::now() {
|
||||
return Err(Status::unauthenticated("Token expired"));
|
||||
}
|
||||
|
||||
// Hash the new password
|
||||
let hashed_password = hash_password(&req.new_password);
|
||||
|
||||
// Update the user's password
|
||||
self.db_client
|
||||
.update_user_password(&password_reset.email, &hashed_password)
|
||||
.await
|
||||
.map_err(|e| Status::internal(format!("Database error: {}", e)))?;
|
||||
|
||||
// Delete the reset token
|
||||
self.db_client
|
||||
.delete_password_reset(&req.reset_token)
|
||||
.await
|
||||
.map_err(|e| Status::internal(format!("Database error: {}", e)))?;
|
||||
|
||||
Ok(Response::new(ResetPasswordResponse {
|
||||
message: "Password successfully reset".to_string(),
|
||||
}))
|
||||
} else {
|
||||
Err(Status::unauthenticated("Invalid reset token"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user