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

refactor: combine crypto.rs with utils.rs
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
Details

Browse source
This commit is contained in:
Radical 2025-05-04 23:50:38 +02:00
parent c2bface373
commit 77245e98c5
6 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ use log::error;
use serde::Deserialize; use serde::Deserialize;
use crate::{ use crate::{
api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX}, crypto::{generate_access_token, generate_refresh_token}, utils::refresh_token_cookie, Data api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX}, utils::{generate_access_token, generate_refresh_token, refresh_token_cookie}, Data
}; };
use super::Response; use super::Response;

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

@ -3,7 +3,7 @@ use log::error;
use std::time::{SystemTime, UNIX_EPOCH}; use std::time::{SystemTime, UNIX_EPOCH};
use crate::{ use crate::{
crypto::{generate_access_token, generate_refresh_token}, utils::refresh_token_cookie, Data utils::{generate_access_token, generate_refresh_token, refresh_token_cookie}, Data
}; };
use super::Response; use super::Response;

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

@ -12,7 +12,7 @@ use uuid::Uuid;
use super::Response; use super::Response;
use crate::{ use crate::{
api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX}, crypto::{generate_access_token, generate_refresh_token}, utils::refresh_token_cookie, Data api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX}, utils::{generate_access_token, generate_refresh_token, refresh_token_cookie}, Data
}; };
#[derive(Deserialize)] #[derive(Deserialize)]

14
src/crypto.rs
View file

@ -1,14 +0,0 @@
use getrandom::fill;
use hex::encode;
pub fn generate_access_token() -> Result<String, getrandom::Error> {
let mut buf = [0u8; 16];
fill(&mut buf)?;
Ok(encode(buf))
}
pub fn generate_refresh_token() -> Result<String, getrandom::Error> {
let mut buf = [0u8; 32];
fill(&mut buf)?;
Ok(encode(buf))
}

2
src/main.rs
View file

@ -7,7 +7,7 @@ use std::time::SystemTime;
mod config; mod config;
use config::{Config, ConfigBuilder}; use config::{Config, ConfigBuilder};
mod api; mod api;
pub mod crypto;
pub mod utils; pub mod utils;
type Error = Box<dyn std::error::Error>; type Error = Box<dyn std::error::Error>;

17
src/utils.rs
View file

@ -1,4 +1,6 @@
use actix_web::{cookie::{time::Duration, Cookie, SameSite}, http::header::HeaderMap, HttpResponse}; use actix_web::{cookie::{time::Duration, Cookie, SameSite}, http::header::HeaderMap, HttpResponse};
use getrandom::fill;
use hex::encode;
pub fn get_auth_header(headers: &HeaderMap) -> Result<&str, HttpResponse> { pub fn get_auth_header(headers: &HeaderMap) -> Result<&str, HttpResponse> {
let auth_token = headers.get(actix_web::http::header::AUTHORIZATION); let auth_token = headers.get(actix_web::http::header::AUTHORIZATION);
@ -30,4 +32,17 @@ pub fn refresh_token_cookie(refresh_token: String) -> Cookie<'static> {
.path("/api") .path("/api")
.max_age(Duration::days(30)) .max_age(Duration::days(30))
.finish() .finish()
} }
pub fn generate_access_token() -> Result<String, getrandom::Error> {
let mut buf = [0u8; 16];
fill(&mut buf)?;
Ok(encode(buf))
}
pub fn generate_refresh_token() -> Result<String, getrandom::Error> {
let mut buf = [0u8; 32];
fill(&mut buf)?;
Ok(encode(buf))
}