Reimplemented access and refresh tokens.

This commit is contained in:
2026-10-18 13:21:48 +02:00
parent 4343959c74
commit 26999d690f
28 changed files with 1510 additions and 480 deletions
+117 -9
View File
@@ -1,16 +1,124 @@
use chrono::{DateTime, Utc};
use chrono::{DateTime, Duration, Utc};
use uuid::Uuid;
use super::DomainError;
use crate::domain::{HashedSecret, Secret};
#[derive(Clone, PartialEq, Eq)]
pub struct Token {
pub struct AccessToken {
pub id: Uuid,
pub user_id: Uuid,
pub user_app_id: Option<Uuid>,
pub access_token_hash: Vec<u8>,
pub refresh_token_hash: Vec<u8>,
pub access_expires_at: DateTime<Utc>,
pub refresh_expires_at: DateTime<Utc>,
pub refreshed_at: Option<DateTime<Utc>>,
pub revoked_at: Option<DateTime<Utc>>,
pub created_at: DateTime<Utc>,
pub secret: Secret,
pub expires_at: DateTime<Utc>,
pub issued_at: DateTime<Utc>,
}
impl AccessToken {
pub fn new(
user_id: Uuid,
user_app_id: Option<Uuid>,
lifetime: Duration,
) -> Result<Self, DomainError> {
let now = Utc::now();
Ok(Self {
id: Uuid::new_v4(),
user_id,
user_app_id,
secret: Secret::generate()?,
expires_at: now + lifetime,
issued_at: now,
})
}
}
#[derive(Clone, PartialEq, Eq)]
pub struct HashedAccessToken {
pub id: Uuid,
pub user_id: Uuid,
pub user_app_id: Option<Uuid>,
pub secret_hash: HashedSecret,
pub expires_at: DateTime<Utc>,
pub issued_at: DateTime<Utc>,
}
impl HashedAccessToken {
pub fn refresh(self, lifetime: Duration) -> Result<AccessToken, DomainError> {
Ok(AccessToken {
id: self.id,
user_id: self.user_id,
user_app_id: self.user_app_id,
secret: Secret::generate()?,
expires_at: Utc::now() + lifetime,
issued_at: Utc::now(),
})
}
}
impl From<AccessToken> for HashedAccessToken {
fn from(value: AccessToken) -> Self {
Self {
id: value.id,
user_id: value.user_id,
user_app_id: value.user_app_id,
secret_hash: value.secret.hash(),
expires_at: value.expires_at,
issued_at: value.issued_at,
}
}
}
#[derive(Clone, PartialEq, Eq)]
pub struct RefreshToken {
pub id: Uuid,
pub token_id: Uuid,
pub secret: Secret,
pub expires_at: DateTime<Utc>,
pub issued_at: DateTime<Utc>,
}
impl RefreshToken {
// pub fn generate(token_id: Uuid, lifetime: Duration) -> Result<Self, DomainError> {
// let now = Utc::now();
// Ok(Self {
// id: Uuid::new_v4(),
// token_id,
// secret: Secret::generate()?,
// expires_at: now + lifetime,
// issued_at: now,
// })
// }
}
#[derive(Clone, PartialEq, Eq)]
pub struct HashedRefreshToken {
pub id: Uuid,
pub token_id: Uuid,
pub secret_hash: HashedSecret,
pub expires_at: DateTime<Utc>,
pub issued_at: DateTime<Utc>,
}
impl HashedRefreshToken {
pub fn refresh(self, lifetime: Duration) -> Result<RefreshToken, DomainError> {
Ok(RefreshToken {
id: self.id,
token_id: self.token_id,
secret: Secret::generate()?,
expires_at: Utc::now() + lifetime,
issued_at: Utc::now(),
})
}
}
impl From<RefreshToken> for HashedRefreshToken {
fn from(value: RefreshToken) -> Self {
Self {
id: value.id,
token_id: value.token_id,
secret_hash: value.secret.hash(),
expires_at: value.expires_at,
issued_at: value.issued_at,
}
}
}