From 4f068e2de00ea88254194203ced44cdb786f3ebf Mon Sep 17 00:00:00 2001
From: SergeyKardashev <angeldeep@yandex.ru>
Date: Fri, 17 Nov 2023 16:48:39 +0700
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D1=81=D0=BE=D0=BB=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/controllers/users.js | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/backend/controllers/users.js b/backend/controllers/users.js
index 410175a..28ce438 100644
--- a/backend/controllers/users.js
+++ b/backend/controllers/users.js
@@ -12,13 +12,20 @@ const UnauthorizedError = require('../errors/unauthorized-error');
 const { SALT_ROUNDS = 10 } = process.env;
 const opts = { runValidators: true, new: true };
 
+const generateHash = async (text, size) => {
+  const salt = await bcrypt.genSalt(size);
+  const hash = await bcrypt.hash(text, salt);
+
+  return hash;
+};
+
 async function createUser(req, res, next) {
   const {
     email, password, name, about, avatar,
   } = req.body;
 
   try {
-    const hash = await bcrypt.hash(password, SALT_ROUNDS);
+    const hash = await generateHash(password, Number(SALT_ROUNDS));
     const user = await User.create({
       email,
       password: hash,
@@ -52,34 +59,11 @@ async function login(req, res, next) {
     if (!matched) throw new UnauthorizedError('Неверные почта или пароль');
     const token = generateToken({ _id: user._id });
     return res.send({ token });
-    // return res.cookie(token);
   } catch (err) {
-    // res.clearCookie('jwt');
     return next(err);
   }
 }
 
-// async function login(req, res, next) {
-//   const { email, password } = req.body;
-//   try {
-//     const user = await User.findOne({ email })
-//       .select('+password')
-//       .orFail(new UnauthorizedError('Неверные почта или пароль'));
-
-//     const matched = await bcrypt.compare(password, user.password);
-//     if (!matched) throw new UnauthorizedError('Неверные почта или пароль');
-//     const token = generateToken({ _id: user._id });
-
-//     return res
-//       .cookie('jwt', token, { maxAge: 604800000, httpOnly: true, sameSite: true })
-//       .send({ email: user.email, _id: user._id, message: 'token in cookie' })
-//       .end();
-//   } catch (err) {
-//     res.clearCookie('jwt');
-//     return next(err);
-//   }
-// }
-
 function getAllUsers(req, res, next) {
   return User.find()
     .then((data) => res.send(data))