h3cx/RustyMine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converted domain/user.rs to use uuid

Browse Source
This commit is contained in:
Hector van der Aa
2025-11-30 20:31:04 +01:00
parent 646776eec7
commit e5d935ec85
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/src/domain/user.rs
View File

@@ -4,6 +4,7 @@ use axum::response::IntoResponse;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use uuid::Uuid;
use validator::Validate; use validator::Validate;
use crate::domain::validation; use crate::domain::validation;
@@ -29,6 +30,7 @@ pub struct NewUser {
#[derive(Debug, Clone, Deserialize)] #[derive(Debug, Clone, Deserialize)]
pub struct InternalNewUser { pub struct InternalNewUser {
uuid: Uuid,
username: String, username: String,
email: Option<String>, email: Option<String>,
password_hash: String, password_hash: String,
@@ -38,7 +40,7 @@ pub struct InternalNewUser {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct InternalUser { pub struct InternalUser {
id: i64, uuid: Uuid,
username: String, username: String,
email: Option<String>, email: Option<String>,
password_hash: String, password_hash: String,
@@ -48,7 +50,7 @@ pub struct InternalUser {
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct User { pub struct User {
id: i64, uuid: Uuid,
username: String, username: String,
email: Option<String>, email: Option<String>,
first_name: Option<String>, first_name: Option<String>,
@@ -65,7 +67,9 @@ impl TryFrom<NewUser> for InternalNewUser {
fn try_from(value: NewUser) -> Result<Self, Self::Error> { fn try_from(value: NewUser) -> Result<Self, Self::Error> {
let password_hash = let password_hash =
auth::hash_password(&value.password).map_err(|e| UserConversionError::HashFailed(e))?; auth::hash_password(&value.password).map_err(|e| UserConversionError::HashFailed(e))?;
let uuid = Uuid::new_v4();
Ok(Self { Ok(Self {
uuid: uuid,
username: value.username, username: value.username,
email: value.email, email: value.email,
password_hash: password_hash, password_hash: password_hash,
@@ -78,7 +82,7 @@ impl TryFrom<NewUser> for InternalNewUser {
impl From<InternalUser> for User { impl From<InternalUser> for User {
fn from(value: InternalUser) -> Self { fn from(value: InternalUser) -> Self {
Self { Self {
id: value.id, uuid: value.uuid,
username: value.username, username: value.username,
email: value.email, email: value.email,
first_name: value.first_name, first_name: value.first_name,