refactor: combine crypto.rs with utils.rs
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
This commit is contained in:
parent
c2bface373
commit
77245e98c5
6 changed files with 20 additions and 19 deletions
|
@ -7,7 +7,7 @@ use log::error;
|
|||
use serde::Deserialize;
|
||||
|
||||
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;
|
||||
|
|
|
@ -3,7 +3,7 @@ use log::error;
|
|||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
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;
|
||||
|
|
|
@ -12,7 +12,7 @@ use uuid::Uuid;
|
|||
|
||||
use super::Response;
|
||||
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)]
|
||||
|
|
|
@ -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))
|
||||
}
|
|
@ -7,7 +7,7 @@ use std::time::SystemTime;
|
|||
mod config;
|
||||
use config::{Config, ConfigBuilder};
|
||||
mod api;
|
||||
pub mod crypto;
|
||||
|
||||
pub mod utils;
|
||||
|
||||
type Error = Box<dyn std::error::Error>;
|
||||
|
|
15
src/utils.rs
15
src/utils.rs
|
@ -1,4 +1,6 @@
|
|||
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> {
|
||||
let auth_token = headers.get(actix_web::http::header::AUTHORIZATION);
|
||||
|
@ -31,3 +33,16 @@ pub fn refresh_token_cookie(refresh_token: String) -> Cookie<'static> {
|
|||
.max_age(Duration::days(30))
|
||||
.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))
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue