dan/Portfolio
1
0
Fork 0
mirror of https://github.com/danbulant/Portfolio synced 2026-06-19 14:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: delete candidate jwt

Browse source
This commit is contained in:
Sebastian Pravda 2022-10-29 12:27:15 +02:00
parent 98110dcf96
commit 196632a094
No known key found for this signature in database
GPG key ID: F3BC84F08EFA3F57
2 changed files with 2 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
api/src/guard/candidate_jwt.rs
View file

@ -1,33 +0,0 @@
use rocket::http::Status;
use rocket::outcome::Outcome;
use rocket::request::{FromRequest, Request};
use portfolio_core::token::candidate_token::CandidateToken;
use portfolio_core::token::decode_candidate_token;
pub struct TokenRequest(CandidateToken);
impl TokenRequest {
pub fn to_token(self) -> CandidateToken {
self.0
}
}
#[rocket::async_trait]
impl<'r> FromRequest<'r> for TokenRequest {
type Error = Status;
async fn from_request(req: &'r Request<'_>) -> Outcome<TokenRequest, (Status, Status), ()> {
if let Some(auth) = req.headers().get_one("Authorization") {
let auth_string = auth.to_string();
if auth_string.starts_with("Bearer") {
let token = auth_string[6..auth_string.len()].trim();
let token_data = decode_candidate_token(token.to_string());
if token_data.is_ok() {
return Outcome::Success(TokenRequest(token_data.ok().unwrap().claims));
}
}
}
return Outcome::Failure((Status::Unauthorized, Status::Unauthorized));
}
}

33
api/src/lib.rs
View file

@ -1,7 +1,6 @@
#[macro_use]
extern crate rocket;
use guard::candidate_jwt::TokenRequest;
use portfolio_core::error::ServiceError;
use portfolio_core::services::candidate_service::CandidateService;
use requests::LoginRequest;
@ -47,17 +46,7 @@ async fn create(conn: Connection<'_, Db>, post_form: Json<candidate::Model>) ->
Ok(plain_text_password)
}
/* #[get("/refresh")]
async fn refresh_token(conn: Connection<'_, Db>, token_req: Result<TokenRequest, Status>) -> Result<String, Custom<String>> {
let db = conn.into_inner();
let jwt = token_req.ok().unwrap().to_token();
let refresh_token = SessionService::login_user(db, jwt.application_id).await;
Ok(refresh_token.ok().unwrap())
} */
#[get("/validate_refresh")]
#[get("/whoami")]
async fn validate(conn: Connection<'_, Db>, uuid_cookie: Result<UUIDCookie, Status>) -> Result<String, Custom<String>> {
let db = conn.into_inner();
let user = CandidateService::auth_user_session(db, uuid_cookie.ok().unwrap().value()).await;
@ -90,24 +79,6 @@ async fn login(conn: Connection<'_, Db>, login_form: Json<LoginRequest>) -> Resu
}
}
#[get("/whoami")]
async fn whoami(conn: Connection<'_, Db>, token_req: Result<TokenRequest, Status>) -> Result<String, Custom<String>> {
let db = conn.into_inner();
let token = token_req.ok().unwrap().to_token();
let user = CandidateService::authenticate_candidate(db, token).await;
match user {
Ok(user) => Ok(
format!("{} {} {}",
user.application,
user.name.unwrap_or("".to_owned()),
user.surname.unwrap_or("".to_owned())
)
),
Err(e) => Err(custom_err_from_service_err(e)),
}
}
#[get("/hello")]
async fn hello() -> &'static str {
"Hello, world!"
@ -125,7 +96,7 @@ async fn start() -> Result<(), rocket::Error> {
.attach(Db::init())
.attach(AdHoc::try_on_ignite("Migrations", run_migrations))
//.mount("/", FileServer::from(relative!("/static")))
.mount("/", routes![create, login, hello, whoami, validate])
.mount("/", routes![create, login, hello, validate])
.register("/", catchers![])
.launch()
.await