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

Changes to token (#21)
All checks were successful
Release Tagging / release (push) Successful in 31s
Details
Rust Build / Check (push) Successful in 43s
Details
Rust Build / Clippy (push) Successful in 48s
Details
Rust Build / build (push) Successful in 1m17s
Details
Rust Build / Test Suite (push) Successful in 1m0s
Details
Rust Build / Rustfmt (push) Successful in 27s
Details
Rust Build / Check (pull_request) Successful in 42s
Details
Rust Build / Test Suite (pull_request) Successful in 57s
Details
Rust Build / Rustfmt (pull_request) Successful in 28s
Details
Rust Build / Clippy (pull_request) Successful in 44s
Details
Rust Build / build (pull_request) Successful in 1m11s
Details

Browse Source 
Reviewed-on: #21
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
phoenix
2025-04-07 17:35:47 +00:00
committed by phoenix
parent 3424d31151
commit a58b0cb40b
2 changed files with 60 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/callers/login.rs
View File

@@ -42,55 +42,48 @@ pub mod endpoint {
axum::Extension(pool): axum::Extension<sqlx::PgPool>,
Json(payload): Json<request::Request>,
) -> (StatusCode, Json<response::Response>) {
let usr = icarus_models::user::User {
username: payload.username,
password: payload.password,
..Default::default()
};
// Check if user exists
match repo::user::exists(&pool, &usr.username).await {
Ok(exists) => {
if !exists {
return not_found("Not Found").await;
}
}
Err(err) => {
return not_found(&err.to_string()).await;
}
};
match repo::user::get(&pool, &payload.username).await {
Ok(user) => {
let salt = repo::salt::get(&pool, &user.salt_id).await.unwrap();
let salt_str = hashing::get_salt(&salt.salt).unwrap();
let unhashed_password = payload.password;
let user = repo::user::get(&pool, &usr.username).await.unwrap();
let salt = repo::salt::get(&pool, &user.salt_id).await.unwrap();
let salt_str = hashing::get_salt(&salt.salt).unwrap();
// Check if password is correct
match hashing::hash_password(&unhashed_password, &salt_str) {
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();
// Check if password is correct
match hashing::hash_password(&usr.password, &salt_str) {
Ok(hash_password) => {
if hashing::verify_password(&usr.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;
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) => {
return not_found(&err.to_string()).await;
}
} else {
return not_found("Error Hashing").await;
}
}
Err(err) => {