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

tsk-69: Retrieve username from the db #76

Merged
phoenix merged 7 commits from tsk-69 into main 2025-10-22 15:35:29 +00:00
Conversation 0 Commits 7 Files Changed 7 +7 -7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 99bd43fb8c - Show all commits

14
src/callers/login.rs
View File

@@ -118,7 +118,7 @@ pub mod endpoint {
}), }),
) )
} else { } else {
return not_found("Could not verify password").await; return not_found("Could not verify token").await;
} }
} else { } else {
return not_found("Error Hashing").await; return not_found("Error Hashing").await;
@@ -154,7 +154,7 @@ pub mod endpoint {
let mut response = response::service_login::Response::default(); let mut response = response::service_login::Response::default();
match repo::service::valid_passphrase(&pool, &payload.passphrase).await { match repo::service::valid_passphrase(&pool, &payload.passphrase).await {
Ok((id, _passphrase, _date_created)) => { Ok((id, username, _date_created)) => {
let key = icarus_envy::environment::get_secret_key().await.value; let key = icarus_envy::environment::get_secret_key().await.value;
let (token_literal, duration) = let (token_literal, duration) =
token_stuff::create_service_token(&key, &id).unwrap(); token_stuff::create_service_token(&key, &id).unwrap();
@@ -162,7 +162,7 @@ pub mod endpoint {
if token_stuff::verify_token(&key, &token_literal) { if token_stuff::verify_token(&key, &token_literal) {
let login_result = icarus_models::login_result::LoginResult { let login_result = icarus_models::login_result::LoginResult {
id, id,
username: String::from(SERVICE_USERNAME), username,
token: token_literal, token: token_literal,
token_type: String::from(icarus_models::token::TOKEN_TYPE), token_type: String::from(icarus_models::token::TOKEN_TYPE),
expiration: duration, expiration: duration,
@@ -216,15 +216,15 @@ pub mod endpoint {
// Get passphrase record with id // Get passphrase record with id
match token_stuff::extract_id_from_token(&key, &payload.access_token) { match token_stuff::extract_id_from_token(&key, &payload.access_token) {
Ok(id) => match repo::service::get_passphrase(&pool, &id).await { Ok(id) => match repo::service::get_passphrase(&pool, &id).await {
Ok((returned_id, _, _)) => { Ok((username, _, _)) => {
match token_stuff::create_service_refresh_token(&key, &returned_id) { match token_stuff::create_service_refresh_token(&key, &id) {
Ok((access_token, exp_dur)) => { Ok((access_token, exp_dur)) => {
let login_result = icarus_models::login_result::LoginResult { let login_result = icarus_models::login_result::LoginResult {
id: returned_id, id,
token: access_token, token: access_token,
expiration: exp_dur, expiration: exp_dur,
token_type: String::from(icarus_models::token::TOKEN_TYPE), token_type: String::from(icarus_models::token::TOKEN_TYPE),
username: String::from(SERVICE_USERNAME), username,
}; };
response.message = String::from("Successful"); response.message = String::from("Successful");
response.data.push(login_result); response.data.push(login_result);