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

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(