Code refactoriing
All checks were successful
Rust Build / Check (pull_request) Successful in 42s
Rust Build / Test Suite (pull_request) Successful in 55s
Rust Build / Rustfmt (pull_request) Successful in 27s
Rust Build / Clippy (pull_request) Successful in 48s
Rust Build / build (pull_request) Successful in 1m16s

This commit is contained in:
2025-04-06 20:11:14 -04:00
parent 784ffbb335
commit 3b2a9a0cd7
2 changed files with 72 additions and 5 deletions

View File

@@ -28,11 +28,11 @@ pub mod endpoint {
use super::request; use super::request;
use super::response; use super::response;
async fn not_found(message: &String) -> (StatusCode, Json<response::Response>) { async fn not_found(message: &str) -> (StatusCode, Json<response::Response>) {
( (
StatusCode::NOT_FOUND, StatusCode::NOT_FOUND,
Json(response::Response { Json(response::Response {
message: message.clone(), message: String::from(message),
data: Vec::new(), data: Vec::new(),
}), }),
) )
@@ -52,7 +52,7 @@ pub mod endpoint {
match repo::user::exists(&pool, &usr.username).await { match repo::user::exists(&pool, &usr.username).await {
Ok(exists) => { Ok(exists) => {
if !exists { if !exists {
return not_found(&"Not Found".to_string()).await; return not_found("Not Found").await;
} }
} }
Err(err) => { Err(err) => {
@@ -88,10 +88,10 @@ pub mod endpoint {
}), }),
) )
} else { } else {
return not_found(&"Could not verify password".to_string()).await; return not_found("Could not verify password").await;
} }
} else { } else {
return not_found(&"Error Hashing".to_string()).await; return not_found("Error Hashing").await;
} }
} }
Err(err) => { Err(err) => {

67
src/token_stuff/mod.rs Normal file
View File

@@ -0,0 +1,67 @@
use josekit::{
self,
jws::{JwsHeader, alg::hmac::HmacJwsAlgorithm::Hs256},
jwt::{self, JwtPayload},
};
pub const TOKENTYPE: &str = "JWT";
pub const KEY_ENV: &str = "SECRET_KEY";
pub const MESSAGE: &str = "Something random";
pub const ISSUER: &str = "icarus_auth";
pub const AUDIENCE: &str = "icarus";
pub fn get_key() -> Result<String, dotenvy::Error> {
dotenvy::dotenv().ok();
let key = std::env::var(KEY_ENV).expect("SECRET_KEY_NOT_FOUND");
Ok(key)
}
pub fn create_token(provided_key: &String) -> Result<String, josekit::JoseError> {
let mut header = JwsHeader::new();
header.set_token_type(TOKENTYPE);
let mut payload = JwtPayload::new();
payload.set_subject(MESSAGE);
payload.set_issuer(ISSUER);
payload.set_audience(vec![AUDIENCE]);
let key: String = if provided_key.is_empty() {
get_key().unwrap()
} else {
provided_key.to_owned()
};
let signer = Hs256.signer_from_bytes(key.as_bytes()).unwrap();
let jwt = josekit::jwt::encode_with_signer(&payload, &header, &signer).unwrap();
Ok(jwt)
}
pub fn verify_token(key: &String, token: &String) -> bool {
let ver = Hs256.verifier_from_bytes(key.as_bytes()).unwrap();
let (payload, _header) = jwt::decode_with_verifier(token, &ver).unwrap();
match payload.subject() {
Some(_sub) => true,
None => false,
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_tokenize() {
let special_key = get_key().unwrap();
match create_token(&special_key) {
Ok(token) => {
let result = verify_token(&special_key, &token);
assert!(result, "Token not verified");
}
Err(err) => {
assert!(false, "Error: {:?}", err.to_string());
}
};
}
}