phoenix/icarus_auth
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 46 Wiki Activity

Bug fix
All checks were successful
Rust Build / Check (pull_request) Successful in 42s
Details
Rust Build / Test Suite (pull_request) Successful in 1m1s
Details
Rust Build / Rustfmt (pull_request) Successful in 31s
Details
Rust Build / Clippy (pull_request) Successful in 45s
Details
Rust Build / build (pull_request) Successful in 1m12s
Details

Browse Source
This commit is contained in:
phoenix
2025-04-07 13:46:23 -04:00
parent 905a06111c
commit 6b7fa86f59
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/callers/login.rs
View File

@@ -45,46 +45,46 @@ pub mod endpoint {
// Check if user exists // Check if user exists
match repo::user::get(&pool, &payload.username).await { match repo::user::get(&pool, &payload.username).await {
Ok(user) => { Ok(user) => {
let salt = repo::salt::get(&pool, &user.salt_id).await.unwrap(); // let salt = repo::salt::get(&pool, &user.salt_id).await.unwrap();
let salt_str = hashing::get_salt(&salt.salt).unwrap(); // let salt_str = hashing::get_salt(&salt.salt).unwrap();
let unhashed_password = payload.password; let unhashed_password = payload.password;
if hashing::verify_password(&unhashed_password, user.password.clone()).unwrap() {
// Create token
let key = token_stuff::get_key().unwrap();
let (token_literal, duration) = token_stuff::create_token(&key).unwrap();
if token_stuff::verify_token(&key, &token_literal) {
(
StatusCode::OK,
Json(response::Response {
message: String::from("Successful"),
data: vec![icarus_models::login_result::LoginResult {
id: user.id,
username: user.username,
token: token_literal,
token_type: String::from(token_stuff::TOKENTYPE),
expiration: duration,
}],
}),
)
} else {
return not_found("Could not verify password").await;
}
} else {
return not_found("Error Hashing").await;
}
// Check if password is correct // Check if password is correct
/*
match hashing::hash_password(&unhashed_password, &salt_str) { match hashing::hash_password(&unhashed_password, &salt_str) {
Ok(hash_password) => { Ok(hash_password) => {
if hashing::verify_password(&unhashed_password, hash_password.clone())
.unwrap()
{
// Create token
let key = token_stuff::get_key().unwrap();
let (token_literal, duration) =
token_stuff::create_token(&key).unwrap();
if token_stuff::verify_token(&key, &token_literal) {
(
StatusCode::OK,
Json(response::Response {
message: String::from("Successful"),
data: vec![icarus_models::login_result::LoginResult {
id: user.id,
username: user.username,
token: token_literal,
token_type: String::from(token_stuff::TOKENTYPE),
expiration: duration,
}],
}),
)
} else {
return not_found("Could not verify password").await;
}
} else {
return not_found("Error Hashing").await;
}
} }
Err(err) => { Err(err) => {
return not_found(&err.to_string()).await; return not_found(&err.to_string()).await;
} }
} }
*/
} }
Err(err) => { Err(err) => {
return not_found(&err.to_string()).await; return not_found(&err.to_string()).await;