diff --git a/api/src/guards/request/session_auth.rs b/api/src/guards/request/session_auth.rs index b73e73d..b7a7f8f 100644 --- a/api/src/guards/request/session_auth.rs +++ b/api/src/guards/request/session_auth.rs @@ -7,18 +7,18 @@ use rocket::request::{FromRequest, Request}; use crate::pool::Db; -pub struct SessionAuth(Candidate); +pub struct CandidateAuth(Candidate); -impl Into for SessionAuth { +impl Into for CandidateAuth { fn into(self) -> Candidate { self.0 } } #[rocket::async_trait] -impl<'r> FromRequest<'r> for SessionAuth { +impl<'r> FromRequest<'r> for CandidateAuth { type Error = Option; - async fn from_request(req: &'r Request<'_>) -> Outcome { + async fn from_request(req: &'r Request<'_>) -> Outcome { let session_id = req.cookies().get("id").unwrap().name_value().1; let conn = &req.rocket().state::().unwrap().conn; @@ -30,7 +30,7 @@ impl<'r> FromRequest<'r> for SessionAuth { let session = CandidateService::auth(conn, uuid).await; match session { - Ok(model) => Outcome::Success(SessionAuth(model)), + Ok(model) => Outcome::Success(CandidateAuth(model)), Err(_) => Outcome::Failure((Status::Unauthorized, None)), } diff --git a/api/src/lib.rs b/api/src/lib.rs index 12acf8b..442ee50 100644 --- a/api/src/lib.rs +++ b/api/src/lib.rs @@ -3,7 +3,7 @@ extern crate rocket; use std::net::SocketAddr; -use guards::request::session_auth::SessionAuth; +use guards::request::session_auth::CandidateAuth; use portfolio_core::services::candidate_service::CandidateService; use requests::{LoginRequest, RegisterRequest}; use rocket::http::Status; @@ -47,7 +47,7 @@ async fn create(conn: Connection<'_, Db>, post_form: Json) -> R } #[get("/whoami")] -async fn validate(session: SessionAuth) -> Result> { +async fn validate(session: CandidateAuth) -> Result> { let candidate: entity::candidate::Model = session.into(); Ok(candidate.application.to_string()) }