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

Changes to token #21

Merged
phoenix merged 7 commits from login_endpoint-changes into devel 2025-04-07 17:35:48 +00:00
Conversation 0 Commits 7 Files Changed 2 +6 -12
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7cac6d5aae - Show all commits

18
src/callers/login.rs
View File

@@ -42,23 +42,19 @@ pub mod endpoint {
axum::Extension(pool): axum::Extension<sqlx::PgPool>, axum::Extension(pool): axum::Extension<sqlx::PgPool>,
Json(payload): Json<request::Request>, Json(payload): Json<request::Request>,
) -> (StatusCode, Json<response::Response>) { ) -> (StatusCode, Json<response::Response>) {
let usr = icarus_models::user::User {
username: payload.username,
password: payload.password,
..Default::default()
};
// Check if user exists // Check if user exists
// match repo::user::exists(&pool, &usr.username).await { match repo::user::get(&pool, &payload.username).await {
match repo::user::get(&pool, &usr.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;
// Check if password is correct // Check if password is correct
match hashing::hash_password(&usr.password, &salt_str) { match hashing::hash_password(&unhashed_password, &salt_str) {
Ok(hash_password) => { 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 // Create token
let key = token_stuff::get_key().unwrap(); let key = token_stuff::get_key().unwrap();
let (token_literal, duration) = let (token_literal, duration) =
@@ -94,7 +90,5 @@ pub mod endpoint {
return not_found(&err.to_string()).await; return not_found(&err.to_string()).await;
} }
} }
// let user = repo::user::get(&pool, &usr.username).await.unwrap();
} }
} }