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

login_endpoint-bug_fix #22

Closed
phoenix wants to merge 13 commits from login_endpoint-bug_fix into devel
pull from: login_endpoint-bug_fix
merge into: phoenix:devel
Conversation 0 Commits 13 Files Changed 5 +30 -30
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6b7fa86f59 - Show all commits

20
src/callers/login.rs
View File

@@ -45,20 +45,14 @@ 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;
// Check if password is correct if hashing::verify_password(&unhashed_password, user.password.clone()).unwrap() {
match hashing::hash_password(&unhashed_password, &salt_str) {
Ok(hash_password) => {
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) = token_stuff::create_token(&key).unwrap();
token_stuff::create_token(&key).unwrap();
if token_stuff::verify_token(&key, &token_literal) { if token_stuff::verify_token(&key, &token_literal) {
( (
@@ -80,11 +74,17 @@ pub mod endpoint {
} else { } else {
return not_found("Error Hashing").await; return not_found("Error Hashing").await;
} }
// Check if password is correct
/*
match hashing::hash_password(&unhashed_password, &salt_str) {
Ok(hash_password) => {
} }
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;