From 5cbb2b3a4c929d878562a7203d32dde616ba785a Mon Sep 17 00:00:00 2001
From: Meng Zhang <meng@tabbyml.com>
Date: Wed, 6 Dec 2023 22:38:04 +0800
Subject: [PATCH] fix: correct tabby-webserver validation logic (#953)

---
 ee/tabby-webserver/src/schema/mod.rs   |  8 +++++---
 ee/tabby-webserver/src/service/auth.rs | 10 +++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ee/tabby-webserver/src/schema/mod.rs b/ee/tabby-webserver/src/schema/mod.rs
index 04b486e..798a56f 100644
--- a/ee/tabby-webserver/src/schema/mod.rs
+++ b/ee/tabby-webserver/src/schema/mod.rs
@@ -191,9 +191,11 @@ fn from_validation_errors<S: ScalarValue>(error: ValidationErrors) -> FieldError
             obj.into()
         })
         .collect::<Vec<_>>();
-    let mut ext = Object::with_capacity(2);
-    ext.add_field("code", Value::scalar("validation-error".to_string()));
-    ext.add_field("errors", Value::list(errors));
+    let mut error = Object::with_capacity(1);
+    error.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())
 }
diff --git a/ee/tabby-webserver/src/service/auth.rs b/ee/tabby-webserver/src/service/auth.rs
index 5a7cb31..6cccb87 100644
--- a/ee/tabby-webserver/src/service/auth.rs
+++ b/ee/tabby-webserver/src/service/auth.rs
@@ -38,17 +38,17 @@ struct RegisterInput {
         code = "password1",
         message = "Password must be at most 20 characters"
     ))]
-    #[validate(must_match(
-        code = "password1",
-        message = "Passwords do not match",
-        other = "password2"
-    ))]
     password1: String,
     #[validate(length(
         min = 8,
         code = "password2",
         message = "Password must be at least 8 characters"
     ))]
+    #[validate(must_match(
+        code = "password2",
+        message = "Passwords do not match",
+        other = "password1"
+    ))]
     #[validate(length(
         max = 20,
         code = "password2",