feat: user org and fix bugs

src/routes/user/list.ts

@@ -3,7 +3,11 @@ import { User } from '@/models/user.ts';
 import { CustomError } from '@abearxiong/router';
 
 app
-  .route('user', 'list')
+  .route({
+    path: 'user',
+    key: 'list',
+    middleware: ['auth'],
+  })
   .define(async (ctx) => {
     const users = await User.findAll({
       attributes: ['id', 'username', 'description', 'needChangePassword'],
@@ -14,106 +18,62 @@ app
   })
   .addTo(app);
 
+
 app
-  .route('user', 'login')
+  .route({
+    path: 'user',
+    key: 'update',
+    middleware: ['auth'],
+  })
   .define(async (ctx) => {
-    const { username, password } = ctx.query;
-    const user = await User.findOne({ where: { username } });
+    const tokenUser = ctx.state.tokenUser;
+    const { id, username, password, description } = ctx.query.data || {};
+    const user = await User.findByPk(id);
+    if (user.id !== tokenUser.id) {
+      throw new CustomError(401, 'Permission denied');
+    }
+
     if (!user) {
-      new CustomError(401, 'User not found');
+      throw new CustomError(500, 'user not found');
     }
-    if (user.password !== password) {
-      new CustomError(401, 'Password error');
+    if (username) {
+      user.username = username;
     }
+    if (password) {
+      user.createPassword(password);
+    }
+    if (description) {
+      user.description = description;
+    }
+    await user.save();
+    ctx.body = {
+      id: user.id,
+      username: user.username,
+      description: user.description,
+      needChangePassword: user.needChangePassword,
+    };
+  })
+  .addTo(app);
+
+app
+  .route({
+    path: 'user',
+    key: 'add',
+    middleware: ['auth'],
+  })
+  .define(async (ctx) => {
+    const tokenUser = ctx.state.tokenUser;
+    const { username, password, description } = ctx.query.data || {};
+    if (!username) {
+      throw new CustomError(400, 'username is required');
+    }
+    const user = await User.createUser(username, password, description);
     const token = await user.createToken();
-    ctx.body = token;
-  })
-  .addTo(app);
-
-app
-  .route('user', 'auth')
-  .define(async (ctx) => {
-    const { checkToken: token } = ctx.query;
-    try {
-      const result = await User.verifyToken(token);
-      ctx.body = result || {};
-    } catch (e) {
-      new CustomError(401, 'Token InValid ');
-    }
-  })
-  .addTo(app);
-
-app
-  .route('user', 'updateSelf', {
-    middleware: ['auth'],
-  })
-  .define(async (ctx) => {
-    const { username, password, description } = ctx.query;
-    const state = ctx.state?.tokenUser || {};
-    const { id } = state;
-    const user = await User.findByPk(id);
-    if (!user) {
-      throw new CustomError(500, 'user not found');
-    }
-    if (username) {
-      user.username = username;
-    }
-    if (password) {
-      user.createPassword(password);
-    }
-    if (description) {
-      user.description = description;
-    }
-    await user.save();
     ctx.body = {
       id: user.id,
       username: user.username,
       description: user.description,
       needChangePassword: user.needChangePassword,
+      token,
     };
-  })
-  .addTo(app);
-app
-  .route('user', 'update', {
-    middleware: ['auth'],
-  })
-  .define(async (ctx) => {
-    const { id, username, password, description } = ctx.query;
-    const user = await User.findByPk(id);
-    if (!user) {
-      throw new CustomError(500, 'user not found');
-    }
-    if (username) {
-      user.username = username;
-    }
-    if (password) {
-      user.createPassword(password);
-    }
-    if (description) {
-      user.description = description;
-    }
-    await user.save();
-    ctx.body = {
-      id: user.id,
-      username: user.username,
-      description: user.description,
-      needChangePassword: user.needChangePassword,
-    };
-  })
-  .addTo(app);
-
-app.route('user', 'add').define(async (ctx) => {
-  const { username, password, description } = ctx.query;
-  if (!username) {
-    throw new CustomError(400, 'username is required');
-  }
-  const user = await User.createUser(username, password, description);
-  const token = await user.createToken();
-  ctx.body = {
-    id: user.id,
-    username: user.username,
-    description: user.description,
-    needChangePassword: user.needChangePassword,
-    token,
-  };
-});
+  });