Code refactor
Some checks failed
Rust Build / Check (pull_request) Successful in 41s
Rust Build / Test Suite (pull_request) Successful in 53s
Rust Build / Rustfmt (pull_request) Successful in 33s
Rust Build / Clippy (pull_request) Failing after 58s
Rust Build / build (pull_request) Successful in 1m12s
Some checks failed
Rust Build / Check (pull_request) Successful in 41s
Rust Build / Test Suite (pull_request) Successful in 53s
Rust Build / Rustfmt (pull_request) Successful in 33s
Rust Build / Clippy (pull_request) Failing after 58s
Rust Build / build (pull_request) Successful in 1m12s
This commit is contained in:
@@ -28,6 +28,16 @@ pub mod endpoint {
|
||||
use super::request;
|
||||
use super::response;
|
||||
|
||||
async fn not_found(message: &String) -> (StatusCode, Json<response::Response>) {
|
||||
(
|
||||
StatusCode::NOT_FOUND,
|
||||
Json(response::Response {
|
||||
message: message.clone(),
|
||||
data: Vec::new(),
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
pub async fn login(
|
||||
axum::Extension(pool): axum::Extension<sqlx::PgPool>,
|
||||
Json(payload): Json<request::Request>,
|
||||
@@ -37,53 +47,56 @@ pub mod endpoint {
|
||||
password: payload.password,
|
||||
..Default::default()
|
||||
};
|
||||
// usr.username = payload.username;
|
||||
// usr.password = payload.password;
|
||||
|
||||
// Check if user exists
|
||||
let user_exists = repo::user::exists(&pool, &usr.username).await.unwrap();
|
||||
if !user_exists {
|
||||
// End
|
||||
}
|
||||
match repo::user::exists(&pool, &usr.username).await {
|
||||
Ok(exists) => {
|
||||
if !exists {
|
||||
return not_found(&"Not Found".to_string()).await;
|
||||
}
|
||||
}
|
||||
Err(err) => {
|
||||
return not_found(&err.to_string()).await;
|
||||
}
|
||||
};
|
||||
|
||||
// End
|
||||
let user = repo::user::get(&pool, &usr.username).await.unwrap();
|
||||
let salt = repo::salt::get(&pool, &user.salt_id).await.unwrap();
|
||||
let salt_literal = salt.salt.clone();
|
||||
let salt_str = hashing::get_salt(&salt_literal).unwrap();
|
||||
let salt_str = hashing::get_salt(&salt.salt).unwrap();
|
||||
|
||||
// Check if password is correct
|
||||
let hash_password = hashing::hash_password(&usr.password, &salt_str).unwrap();
|
||||
if hashing::verify_password(&usr.password, hash_password.clone()).unwrap() {
|
||||
println!("Do work");
|
||||
}
|
||||
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 = token_stuff::create_token(&key).unwrap();
|
||||
|
||||
// Create token
|
||||
let key = token_stuff::get_key().unwrap();
|
||||
let token_literal = token_stuff::create_token(&key).unwrap();
|
||||
|
||||
let result = token_stuff::verify_token(&key, &token_literal);
|
||||
|
||||
if result {
|
||||
(
|
||||
StatusCode::OK,
|
||||
Json(response::Response {
|
||||
message: String::from("Not implemented"),
|
||||
data: vec![icarus_models::login_result::LoginResult {
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
token: token_literal,
|
||||
token_type: String::from("JWT"),
|
||||
expiration: -1,
|
||||
}],
|
||||
}),
|
||||
)
|
||||
} else {
|
||||
(
|
||||
StatusCode::BAD_REQUEST,
|
||||
Json(response::Response {
|
||||
message: String::from("Not implemented"),
|
||||
data: vec![icarus_models::login_result::LoginResult::default()],
|
||||
}),
|
||||
)
|
||||
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: -1,
|
||||
}],
|
||||
}),
|
||||
)
|
||||
} else {
|
||||
return not_found(&"Could not verify password".to_string()).await;
|
||||
}
|
||||
} else {
|
||||
return not_found(&"Error Hashing".to_string()).await;
|
||||
}
|
||||
}
|
||||
Err(err) => {
|
||||
return not_found(&err.to_string()).await;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user