gorb/backend
5
0
Fork 1
Code Issues 13 Pull requests Projects Releases Packages 1 Wiki Activity Actions

style: use const generic for token length instead of multiple functions
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
Details
ci/woodpecker/push/publish-docs Pipeline was successful
Details

Browse source 
Simplifies codebase a bit and avoids having to add another function in future if we need another length of token
This commit is contained in:
Radical 2025-06-25 13:25:39 +02:00
parent f752cddd73
commit 407460d2aa
6 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/v1/auth/login.rs
View file

@ -11,7 +11,7 @@ use crate::{
error::Error,
schema::*,
utils::{
PASSWORD_REGEX, generate_access_token, generate_refresh_token, new_refresh_token_cookie,
PASSWORD_REGEX, generate_token, new_refresh_token_cookie,
user_uuid_from_identifier,
},
};
@ -59,8 +59,8 @@ pub async fn response(
));
}
let refresh_token = generate_refresh_token()?;
let access_token = generate_access_token()?;
let refresh_token = generate_token::<32>()?;
let access_token = generate_token::<16>()?;
let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;

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

@ -11,7 +11,7 @@ use crate::{
access_tokens::{self, dsl},
refresh_tokens::{self, dsl as rdsl},
},
utils::{generate_access_token, generate_refresh_token, new_refresh_token_cookie},
utils::{generate_token, new_refresh_token_cookie},
};
use super::Response;
@ -55,7 +55,7 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;
if lifetime > 1987200 {
let new_refresh_token = generate_refresh_token()?;
let new_refresh_token = generate_token::<32>()?;
match update(refresh_tokens::table)
.filter(rdsl::token.eq(&refresh_token))
@ -75,7 +75,7 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
}
}
let access_token = generate_access_token()?;
let access_token = generate_token::<16>()?;
update(access_tokens::table)
.filter(dsl::refresh_token.eq(&refresh_token))

6
src/api/v1/auth/register.rs
View file

@ -20,7 +20,7 @@ use crate::{
users::{self, dsl as udsl},
},
utils::{
EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX, generate_access_token, generate_refresh_token,
EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX, generate_token,
new_refresh_token_cookie,
},
};
@ -120,8 +120,8 @@ pub async fn res(
.execute(&mut conn)
.await?;
let refresh_token = generate_refresh_token()?;
let access_token = generate_access_token()?;
let refresh_token = generate_token::<32>()?;
let access_token = generate_token::<16>()?;
let current_time = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() as i64;