Raven/osirose-new
SHA256
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 6 Releases Wiki Activity

- update: auth system to work with the website auth

Browse Source
This commit is contained in:
raven
2025-03-16 01:35:44 -04:00
parent cbd71d1ab1
commit cf9efc9866
11 changed files with 93 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
auth-service/src/database_client.rs
View File

@@ -1,6 +1,5 @@
use crate::database::{
user_service_client::UserServiceClient, CreateUserRequest, CreateUserResponse,
GetUserByEmailRequest, GetUserByUsernameRequest, GetUserRequest, GetUserResponse,
user_service_client::UserServiceClient, GetUserByEmailRequest, GetUserByUsernameRequest, GetUserRequest, GetUserResponse,
};
use async_trait::async_trait;
use chrono::{DateTime, Utc};
@@ -22,12 +21,6 @@ pub trait DatabaseClientTrait: Sized {
&mut self,
email: &str,
) -> Result<GetUserResponse, Box<dyn std::error::Error>>;
async fn create_user(
&mut self,
username: &str,
email: &str,
password: &str,
) -> Result<CreateUserResponse, Box<dyn std::error::Error>>;
async fn store_password_reset(
&mut self,
email: &str,
@@ -94,22 +87,7 @@ impl DatabaseClientTrait for DatabaseClient {
let response = self.client.get_user_by_email(request).await?;
Ok(response.into_inner())
}
async fn create_user(
&mut self,
username: &str,
email: &str,
password: &str,
) -> Result<CreateUserResponse, Box<dyn Error>> {
let request = tonic::Request::new(CreateUserRequest {
username: username.to_string(),
email: email.to_string(),
hashed_password: password.to_string(),
});
let response = self.client.create_user(request).await?;
Ok(response.into_inner())
}
async fn store_password_reset(
&mut self,
_email: &str,

93
auth-service/src/grpc.rs
View File

@@ -27,51 +27,7 @@ impl AuthService for MyAuthService {
&self,
request: Request<LoginRequest>,
) -> Result<Response<LoginResponse>, Status> {
let req = request.into_inner();
info!("Login attempt for username: {}", req.username);
if let Some(user) = verify_user(
self.db_client.as_ref().clone(),
&req.username,
&req.password,
)
.await
{
let user_id = user.user_id.to_string();
let session_id = uuid::Uuid::new_v4().to_string();
let response = self
.session_client
.as_ref()
.clone()
.create_session(CreateSessionRequest {
session_id: session_id.clone(),
user_id: user.user_id,
username: req.username.to_string(),
character_id: 0,
ip_address: req.ip_address.to_string(),
})
.await;
let session = match response {
Ok(session) => session,
Err(_) => return Err(Status::internal("Session creation failed")),
};
let session_id = session.into_inner().session_id;
let token = generate_token(&user_id, &&session_id.clone(), user.roles)
.map_err(|_| Status::internal("Token generation failed"))?;
info!("Login successful for username: {}", req.username);
Ok(Response::new(LoginResponse {
token,
user_id,
session_id,
}))
} else {
warn!("Invalid login attempt for username: {}", req.username);
Err(Status::unauthenticated("Invalid credentials"))
}
Err(Status::unimplemented("login not implemented due to changes"))
}
async fn logout(&self, request: Request<LogoutRequest>) -> Result<Response<Empty>, Status> {
@@ -188,29 +144,30 @@ impl AuthService for MyAuthService {
&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"))
}
}
// 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(

3
auth-service/src/mocks/database_client_mock.rs
View File

@@ -1,4 +1,4 @@
use crate::database::{CreateUserResponse, GetUserResponse};
use crate::database::GetUserResponse;
use crate::database_client::{DatabaseClientTrait, PasswordReset};
use async_trait::async_trait;
use chrono::{DateTime, Utc};
@@ -15,7 +15,6 @@ mock! {
async fn get_user_by_userid(&mut self, user_id: i32) -> Result<GetUserResponse, Box<dyn std::error::Error>>;
async fn get_user_by_username(&mut self, user_id: &str) -> Result<GetUserResponse, Box<dyn std::error::Error>>;
async fn get_user_by_email(&mut self, email: &str) -> Result<GetUserResponse, Box<dyn Error>>;
async fn create_user(&mut self, username: &str, email: &str, password: &str) -> Result<CreateUserResponse, Box<dyn std::error::Error>>;
async fn store_password_reset(&mut self, email: &str, reset_token: &str, expires_at: DateTime<Utc>) -> Result<(), Box<dyn Error>>;
async fn get_password_reset(&self, reset_token: &str) -> Result<Option<PasswordReset>, Box<dyn Error>>;
async fn delete_password_reset(&self, reset_token: &str) -> Result<(), Box<dyn Error>>;

15
auth-service/src/users.rs
View File

@@ -27,11 +27,12 @@ pub async fn verify_user<T: DatabaseClientTrait>(
username: &str,
password: &str,
) -> Option<GetUserResponse> {
let user = db_client.get_user_by_username(username).await.ok()?;
if verify_password(password, &user.hashed_password) {
Some(user)
} else {
None
}
// let user = db_client.get_user_by_username(username).await.ok()?;
//
// if verify_password(password, &user.hashed_password) {
// Some(user)
// } else {
// None
// }
None
}