create todo list

server/routers/todo/auth.js

@@ -3,37 +3,21 @@ const hash = require("pbkdf2-password")();
 const { promisify } = require("node:util");
 const jwt = require('jsonwebtoken')
 
-const { AuthModel } = require("./model/todo/auth");
-const { UserModel } = require("./model/todo/user");
 const { getAnswer } = require("../../utils/common");
 
+const { AuthModel } = require("./model/todo/auth");
+const { TOKEN_KEY } = require('./const')
+const { UserModel } = require("./model/todo/user");
+
+const { requiredValidate } = require('./utils')
+
 const router = Router();
 
-const TOKEN_KEY = process.env.TOKEN_KEY || "asdfhoa-podh829438132 iahda98gauj dj2i3-111"
-
-const requiredValidate =
-  (...fields) =>
-  (req, res, next) => {
-    const errors = []
-
-    fields.forEach((field) => {
-      if (!req.body[field]) {
-        errors.push(field);
-      }
-    });
-
-    if (errors.length) {
-      throw new Error(`Не все поля заполнены: ${errors.join(", ")}`);
-    } else {
-      next();
-    }
-  };
-
 router.post(
   "/signup",
   requiredValidate("login", "password", "email"),
   async (req, res, next) => {
-    const { login, password, email } = req.body;
+    const { login, password, email } = req.body
 
     const user = await AuthModel.findOne({ login });
 
@@ -47,10 +31,10 @@ router.post(
       const user = await UserModel.create({ login, email });
       await AuthModel.create({ login, hash, salt, userId: user.id });
 
-      res.json(getAnswer(null, { ok: true }));
-    });
+      res.json(getAnswer(null, { ok: true }))
+    })
   }
-);
+)
 
 function authenticate(login, pass, cb) {
     AuthModel.findOne({ login }).populate('userId').exec().then((user) => {
@@ -64,10 +48,10 @@ function authenticate(login, pass, cb) {
   })
 }
 
-const auth = promisify(authenticate);
+const auth = promisify(authenticate)
 
-router.post('/signin', async (req, res) => {
-    const { login, password } = req.body;
+router.post('/signin', requiredValidate('login', 'password'), async (req, res) => {
+    const { login, password } = req.body
 
     const user = await auth(login, password)
 
@@ -76,14 +60,14 @@ router.post('/signin', async (req, res) => {
     }
 
     const accessToken = jwt.sign({
-        ...user.userId
+        ...JSON.parse(JSON.stringify(user.userId)),
     }, TOKEN_KEY, {
         expiresIn: '12h'
     })
 
     res.json(getAnswer(null, {
         user: user.userId,
-        token: accessToken  
+        token: accessToken,
     }))
 })