root
/
tabby
mirror of https://gitee.com/zhang_1334717033/tabby.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: correct tabby-webserver validation logic (#953)

support-auth-token
Meng Zhang 2023-12-06 22:38:04 +08:00 committed by GitHub
parent 7de4073779
commit 5cbb2b3a4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ee/tabby-webserver/src/schema/mod.rs
View File

@ -191,9 +191,11 @@ fn from_validation_errors<S: ScalarValue>(error: ValidationErrors) -> FieldError
obj.into() obj.into()
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let mut ext = Object::with_capacity(2); let mut error = Object::with_capacity(1);
ext.add_field("code", Value::scalar("validation-error".to_string())); error.add_field("errors", Value::list(errors));
ext.add_field("errors", Value::list(errors));
let mut ext = Object::with_capacity(1);
ext.add_field("validation-errors", error.into());
FieldError::new("Invalid input parameters", ext.into()) FieldError::new("Invalid input parameters", ext.into())
} }

10
ee/tabby-webserver/src/service/auth.rs
View File

@ -38,17 +38,17 @@ struct RegisterInput {
code = "password1", code = "password1",
message = "Password must be at most 20 characters" message = "Password must be at most 20 characters"
))] ))]
#[validate(must_match(
code = "password1",
message = "Passwords do not match",
other = "password2"
))]
password1: String, password1: String,
#[validate(length( #[validate(length(
min = 8, min = 8,
code = "password2", code = "password2",
message = "Password must be at least 8 characters" message = "Password must be at least 8 characters"
))] ))]
#[validate(must_match(
code = "password2",
message = "Passwords do not match",
other = "password1"
))]
#[validate(length( #[validate(length(
max = 20, max = 20,
code = "password2", code = "password2",