Changes to token #21
@@ -42,23 +42,19 @@ 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 {
|
||||
match repo::user::get(&pool, &usr.username).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;
|
||||
|
||||
// Check if password is correct
|
||||
match hashing::hash_password(&usr.password, &salt_str) {
|
||||
match hashing::hash_password(&unhashed_password, &salt_str) {
|
||||
Ok(hash_password) => {
|
||||
if hashing::verify_password(&usr.password, hash_password.clone()).unwrap() {
|
||||
if hashing::verify_password(&unhashed_password, hash_password.clone())
|
||||
.unwrap()
|
||||
{
|
||||
// Create token
|
||||
let key = token_stuff::get_key().unwrap();
|
||||
let (token_literal, duration) =
|
||||
@@ -94,7 +90,5 @@ pub mod endpoint {
|
||||
return not_found(&err.to_string()).await;
|
||||
}
|
||||
}
|
||||
|
||||
// let user = repo::user::get(&pool, &usr.username).await.unwrap();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user