radical/backend-ci-testing
1
0
Fork 0
forked from gorb/backend
Code Pull requests Activity

style: rename refresh_token_cookie() to new_refresh_token_cookie() and fix error message when no refresh_token is found on refresh

Browse source
This commit is contained in:
Radical 2025-05-31 14:41:29 +02:00
parent d615f1392e
commit 38aab46534
4 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/api/v1/auth/refresh.rs
View file

@ -11,20 +11,16 @@ use crate::{
access_tokens::{self, dsl},
refresh_tokens::{self, dsl as rdsl},
},
utils::{generate_access_token, generate_refresh_token, refresh_token_cookie},
utils::{generate_access_token, generate_refresh_token, new_refresh_token_cookie},
};
use super::Response;
#[post("/refresh")]
pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let recv_refresh_token_cookie = req.cookie("refresh_token");
let mut refresh_token_cookie = req.cookie("refresh_token").ok_or(Error::Unauthorized("request has no refresh token".to_string()))?;
if recv_refresh_token_cookie.is_none() {
return Ok(HttpResponse::Unauthorized().finish());
}
let mut refresh_token = String::from(recv_refresh_token_cookie.unwrap().value());
let mut refresh_token = String::from(refresh_token_cookie.value());
let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;
@ -47,8 +43,6 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
error!("{}", error);
}
let mut refresh_token_cookie = refresh_token_cookie(refresh_token);
refresh_token_cookie.make_removal();
return Ok(HttpResponse::Unauthorized()
@ -91,12 +85,10 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
.await?;
return Ok(HttpResponse::Ok()
.cookie(refresh_token_cookie(refresh_token))
.cookie(new_refresh_token_cookie(refresh_token))
.json(Response { access_token }));
}
let mut refresh_token_cookie = refresh_token_cookie(refresh_token);
refresh_token_cookie.make_removal();
Ok(HttpResponse::Unauthorized()