Skip to content

Update validation logic for validator v0.17+ compatibility #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update validation logic for validator v0.17+ compatibility #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 7 additions & 24 deletions src/dtos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ pub struct RegisterUserDto {
email(message = "Email is invalid")
)]
pub email: String,
#[validate(
length(min = 1, message = "Password is required"),
length(min = 6, message = "Password must be at least 6 characters")
)]
#[validate(length(min = 6, message = "Password must be at least 6 characters"))]
pub password: String,

#[validate(
Expand All @@ -32,10 +29,7 @@ pub struct RegisterUserDto {
pub struct LoginUserDto {
#[validate(length(min = 1, message = "Email is required"), email(message = "Email is invalid"))]
pub email: String,
#[validate(
length(min = 1, message = "Password is required"),
length(min = 6, message = "Password must be at least 6 characters")
)]
#[validate(length(min = 6, message = "Password must be at least 6 characters"))]
pub password: String,
}

Expand All @@ -50,7 +44,7 @@ pub struct RequestQueryDto {
#[derive(Debug, Serialize, Deserialize)]
pub struct FilterUserDto {
pub id: String,
pub name: String,
pub name: String, // This should be 'username' to match models.rs
pub email: String,
pub role: String,
pub verified: bool,
Expand All @@ -64,7 +58,7 @@ impl FilterUserDto {
pub fn filter_user(user: &User) -> Self {
FilterUserDto {
id: user.id.to_string(),
name: user.name.to_owned(),
name: user.name.to_owned(), // This should be 'user.username'
email: user.email.to_owned(),
verified: user.verified,
role: user.role.to_str().to_string(),
Expand Down Expand Up @@ -129,23 +123,16 @@ fn validate_user_role(role: &UserRole) -> Result<(), validator::ValidationError>

#[derive(Debug, Validate, Default, Clone, Serialize, Deserialize)]
pub struct UserPasswordUpdateDto {
#[validate(
length(min = 1, message = "New password is required."),
length(min = 6, message = "new password must be at least 6 characters")
)]
#[validate(length(min = 6, message = "new password must be at least 6 characters"))]
pub new_password: String,

#[validate(
length(min = 1, message = "New password confirm is required."),
length(min = 6, message = "new password confirm must be at least 6 characters"),
must_match(other = "new_password", message="new passwords do not match")
)]
pub new_password_confirm: String,

#[validate(
length(min = 1, message = "Old password is required."),
length(min = 6, message = "Old password must be at least 6 characters")
)]
#[validate(length(min = 6, message = "Old password must be at least 6 characters"))]
pub old_password: String,
}

Expand All @@ -166,14 +153,10 @@ pub struct ResetPasswordRequestDto {
#[validate(length(min = 1, message = "Token is required."),)]
pub token: String,

#[validate(
length(min = 1, message = "New password is required."),
length(min = 6, message = "new password must be at least 6 characters")
)]
#[validate(length(min = 6, message = "new password must be at least 6 characters"))]
pub new_password: String,

#[validate(
length(min = 1, message = "New password confirm is required."),
length(min = 6, message = "new password confirm must be at least 6 characters"),
must_match(other = "new_password", message="new passwords do not match")
)]
Expand Down