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

tsk-51: Changes made related to icarus_models

Browse Source
This commit is contained in:
phoenix
2025-08-06 18:51:14 -04:00
parent cd2b624e4c
commit 41796fd768
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/callers/login.rs
View File

@@ -78,7 +78,7 @@ pub mod endpoint {
if hashing::verify_password(&payload.password, user.password.clone()).unwrap() { if hashing::verify_password(&payload.password, user.password.clone()).unwrap() {
// Create token // Create token
let key = icarus_envy::environment::get_secret_key().await; let key = icarus_envy::environment::get_secret_key().await;
let (token_literal, duration) = token_stuff::create_token(&key).unwrap(); let (token_literal, duration) = token_stuff::create_token(&key, &user.id).unwrap();
if token_stuff::verify_token(&key, &token_literal) { if token_stuff::verify_token(&key, &token_literal) {
let current_time = time::OffsetDateTime::now_utc(); let current_time = time::OffsetDateTime::now_utc();
@@ -122,7 +122,7 @@ pub mod endpoint {
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, _passphrase, _date_created)) => {
let key = icarus_envy::environment::get_secret_key().await; let key = icarus_envy::environment::get_secret_key().await;
let (token_literal, duration) = token_stuff::create_service_token(&key).unwrap(); let (token_literal, duration) = token_stuff::create_service_token(&key, &id).unwrap();
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 {

6
src/token_stuff/mod.rs
View File

@@ -20,20 +20,22 @@ pub fn get_expiration(issued: &time::OffsetDateTime) -> Result<time::OffsetDateT
Ok(*issued + duration_expire) Ok(*issued + duration_expire)
} }
pub fn create_token(provided_key: &String) -> Result<(String, i64), josekit::JoseError> { pub fn create_token(provided_key: &String, id: &uuid::Uuid) -> Result<(String, i64), josekit::JoseError> {
let resource = icarus_models::token::TokenResource { let resource = icarus_models::token::TokenResource {
message: String::from(MESSAGE), message: String::from(MESSAGE),
issuer: String::from(ISSUER), issuer: String::from(ISSUER),
audiences: vec![String::from(AUDIENCE)], audiences: vec![String::from(AUDIENCE)],
id: *id,
}; };
icarus_models::token::create_token(provided_key, &resource, time::Duration::hours(4)) icarus_models::token::create_token(provided_key, &resource, time::Duration::hours(4))
} }
pub fn create_service_token(provided: &String) -> Result<(String, i64), josekit::JoseError> { pub fn create_service_token(provided: &String, id: &uuid::Uuid) -> Result<(String, i64), josekit::JoseError> {
let resource = icarus_models::token::TokenResource { let resource = icarus_models::token::TokenResource {
message: String::from("Service random"), message: String::from("Service random"),
issuer: String::from(ISSUER), issuer: String::from(ISSUER),
audiences: vec![String::from(AUDIENCE)], audiences: vec![String::from(AUDIENCE)],
id: *id,
}; };
icarus_models::token::create_token(provided, &resource, time::Duration::hours(1)) icarus_models::token::create_token(provided, &resource, time::Duration::hours(1))
} }