resolve comments

TabbyML · Nov 29, 2023 · 03e0a6f · 03e0a6f
1 parent 821db3b
commit 03e0a6f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ee/tabby-webserver/Cargo.toml b/ee/tabby-webserver/Cargo.toml
@@ -9,7 +9,7 @@ homepage.workspace = true
 anyhow.workspace = true
 argon2 = "0.5.1"
 async-trait.workspace = true
-axum = { workspace = true, features = ["ws", "headers"] }
+axum = { workspace = true, features = ["ws"] }
 bincode = "1.3.3"
 chrono = "0.4"
 futures.workspace = true

diff --git a/ee/tabby-webserver/src/db.rs b/ee/tabby-webserver/src/db.rs
@@ -38,10 +38,9 @@ lazy_static! {
     ]);
 }
 
-#[derive(Debug, Default)]
 pub struct User {
-    created_at: String,
-    updated_at: String,
+    _created_at: String,
+    _updated_at: String,
 
     pub id: u32,
     pub username: String,
@@ -169,8 +168,8 @@ impl DbConn {
                             email: row.get(2)?,
                             password_encrypted: row.get(3)?,
                             is_admin: row.get(4)?,
-                            created_at: row.get(5)?,
-                            updated_at: row.get(6)?,
+                            _created_at: row.get(5)?,
+                            _updated_at: row.get(6)?,
                         })
                     },
                 ).optional()
@@ -195,8 +194,8 @@ impl DbConn {
                             email: row.get(2)?,
                             password_encrypted: row.get(3)?,
                             is_admin: row.get(4)?,
-                            created_at: row.get(5)?,
-                            updated_at: row.get(6)?,
+                            _created_at: row.get(5)?,
+                            _updated_at: row.get(6)?,
                         })
                     },
                 ).optional()

diff --git a/ee/tabby-webserver/src/schema/auth.rs b/ee/tabby-webserver/src/schema/auth.rs
@@ -79,7 +79,6 @@ pub struct TokenAuthResponse {
     access_token: String,
     refresh_token: String,
     errors: Vec<AuthError>,
-    // user: UserResponse,
 }
 
 impl TokenAuthResponse {
@@ -145,7 +144,7 @@ impl VerifyTokenResponse {
     }
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, GraphQLObject)]
+#[derive(Debug, Default, Serialize, Deserialize, GraphQLObject)]
 pub struct UserInfo {
     username: String,
     is_admin: bool,

diff --git a/ee/tabby-webserver/src/server/auth.rs b/ee/tabby-webserver/src/server/auth.rs
@@ -37,7 +37,7 @@ pub struct RegisterInput {
     #[validate(length(
         min = 4,
         "username_too_short",
-        message = "Username must be at least 8 characters"
+        message = "Username must be at least 4 characters"
     ))]
     #[validate(length(
         max = 20,
@@ -88,7 +88,7 @@ pub struct TokenAuthInput {
     #[validate(length(
         min = 4,
         "username_too_short",
-        message = "Username must be at least 8 characters"
+        message = "Username must be at least 4 characters"
     ))]
     #[validate(length(
         max = 20,
@@ -184,7 +184,7 @@ impl AuthenticationService for DbConn {
             }
         };
 
-        // FIXME: generate refresh token
+        // TODO: generate refresh token
 
         let resp = RegisterResponse::new(access_token, "".to_string());
         Ok(resp)
@@ -242,15 +242,15 @@ impl AuthenticationService for DbConn {
             }
         };
 
-        // FIXME: generate refresh token
+        // TODO: generate refresh token
 
         let resp = TokenAuthResponse::new(access_token, "".to_string());
         Ok(resp)
     }
 
-    // FIXME: implement refresh token
+    // TODO: implement refresh token
     async fn refresh_token(&self, _refresh_token: String) -> Result<RefreshTokenResponse> {
-        unimplemented!()
+        todo!()
     }
 
     async fn verify_token(&self, access_token: String) -> Result<VerifyTokenResponse> {
@@ -330,6 +330,6 @@ mod tests {
         let claims = Claims::new(UserInfo::new("test".to_string(), false));
         let token = generate_jwt(claims).unwrap();
         let claims = validate_jwt(&token).unwrap();
-        assert_eq!(claims.user, UserInfo::new("test".to_string(), false));
+        assert_eq!(claims.user_info(), UserInfo::new("test".to_string(), false));
     }
 }