done

ElenaDiachenko · ElenaDiachenko · commit feb199d81076 · 2022-11-12T14:19:30.000+02:00
diff --git a/controllers/contacts/getContactById.js b/controllers/contacts/getContactById.js
@@ -1,10 +1,15 @@
 const { Contact } = require('../../models');
-const { createError } = require('../../utils');
+const { getErrorMessage } = require('../../utils');
 
 const getContactById = async (req, res) => {
   const { contactId } = req.params;
-  const result = await Contact.findById(contactId);
-  if (!result) throw createError(404, `Contact with id=${contactId} not found`);
+  const { _id } = req.user;
+  const result = await Contact.findById(contactId, _id);
+  if (!result) {
+    return res
+      .status(404)
+      .json(getErrorMessage(404, `Contact with id: '${contactId}'  not found`));
+  }
 
   res.status(200).json({
     status: 'success',
diff --git a/controllers/contacts/removeContact.js b/controllers/contacts/removeContact.js
@@ -1,10 +1,15 @@
 const { Contact } = require('../../models');
-const { createError } = require('../../utils');
+const { getErrorMessage } = require('../../utils');
 
 const removeContact = async (req, res) => {
   const { contactId } = req.params;
-  const result = await Contact.findByIdAndRemove(contactId);
-  if (!result) throw createError(404, `Contact with id=${contactId} not found`);
+  const { _id } = req.user;
+  const result = await Contact.findByIdAndRemove(contactId, _id);
+  if (!result) {
+    return res
+      .status(404)
+      .json(getErrorMessage(404, `Contact with id: '${contactId}'  not found`));
+  }
 
   res.status(200).json({
     status: 'success',
diff --git a/controllers/contacts/updateContact.js b/controllers/contacts/updateContact.js
@@ -1,13 +1,19 @@
 const { Contact } = require('../../models');
-const { createError } = require('../../utils');
+const { getErrorMessage } = require('../../utils');
 
 const updateContact = async (req, res) => {
   const { contactId } = req.params;
+  const { _id } = req.user;
   const result = await Contact.findByIdAndUpdate(contactId, req.body, {
+    _id,
     new: true,
   });
 
-  if (!result) throw createError(404, `Contact with id=${contactId} not found`);
+  if (!result) {
+    return res
+      .status(404)
+      .json(getErrorMessage(404, `Contact with id=${contactId} not found`));
+  }
 
   res.status(200).json({
     status: 'success',
diff --git a/controllers/contacts/updateStatusContact.js b/controllers/contacts/updateStatusContact.js
@@ -1,20 +1,29 @@
 const { Contact } = require('../../models');
-const { createError } = require('../../utils');
+const { getErrorMessage } = require('../../utils');
 
 const updateStatusContact = async (req, res) => {
   const { contactId } = req.params;
   const { favorite } = req.body;
+  const { _id } = req.user;
+
+  if (!favorite) {
+    return res.status(400).json(getErrorMessage(400, `Missing field favorite`));
+  }
 
-  if (!favorite) throw createError(400, `missing field favorite`);
   const result = await Contact.findByIdAndUpdate(
     contactId,
     { favorite },
     {
+      _id,
       new: true,
     },
   );
 
-  if (!result) return res.status(404).json(getErrorMessage(404, contactId));
+  if (!result) {
+    return res
+      .status(404)
+      .json(getErrorMessage(404, `Contact with id=${contactId} not found`));
+  }
 
   res.status(200).json({
     status: 'success',
diff --git a/controllers/users/index.js b/controllers/users/index.js
@@ -2,10 +2,12 @@ const signup = require('./signup');
 const login = require('./login');
 const logout = require('./logout');
 const getCurrent = require('./getCurrent');
+const updateSubscription = require('./updateSubscription');
 
 module.exports = {
   signup,
   login,
   logout,
   getCurrent,
+  updateSubscription,
 };
diff --git a/controllers/users/login.js b/controllers/users/login.js
@@ -1,22 +1,34 @@
 const bcrypt = require('bcrypt');
 const jwt = require('jsonwebtoken');
 const { User } = require('../../models');
-const { createError } = require('../../utils');
+const { getErrorMessage } = require('../../utils');
 const { joiLoginSchema } = require('../../models/user');
 const { SECRET_KEY } = process.env;
 
 const login = async (req, res) => {
-  const { error } = joiLoginSchema.validate(req.body);
-  if (error) throw createError(400, error.message);
+  // const { error } = joiLoginSchema.validate(req.body);
+  // if (error) throw createError(400, error.message);
 
   const { email, password } = req.body;
   const user = await User.findOne({ email });
 
+  if (!user) {
+    return res
+      .status(401)
+      .json(getErrorMessage(401, 'Email or password is wrong'));
+  }
+
   const comparePassword = bcrypt.compareSync(password, user.password);
-  if (!user || !comparePassword) {
-    throw createError(401, 'Email or password is wrong');
+  if (!comparePassword) {
+    return res
+      .status(401)
+      .json(getErrorMessage(401, 'Email or password is wrong'));
   }
 
+  // {
+  //   throw Error(401, 'Email or password is wrong');
+  // }
+
   const payload = {
     id: user._id,
   };
diff --git a/controllers/users/signup.js b/controllers/users/signup.js
@@ -1,16 +1,16 @@
 const bcrypt = require('bcrypt');
 const { User } = require('../../models');
-const { createError } = require('../../utils');
-const { joiSignupSchema } = require('../../models/user');
+const { getErrorMessage } = require('../../utils');
 
 const signup = async (req, res) => {
-  const { error } = joiSignupSchema.validate(req.body);
-  if (error) throw createError(400, error.message);
-
   const { email, password, subscription } = req.body;
 
   const user = await User.findOne({ email });
-  if (user) throw createError(409, `Email: '${email}' in use`);
+  if (user) {
+    return res
+      .status(409)
+      .json(getErrorMessage(409, `Email: '${email}' in use`));
+  }
 
   const hashPassword = bcrypt.hashSync(password, bcrypt.genSaltSync(10));
   const result = await User.create({
diff --git a/controllers/users/updateSubscription.js b/controllers/users/updateSubscription.js
@@ -0,0 +1,31 @@
+const { User } = require('../../models');
+const { getErrorMessage } = require('../../utils');
+
+const updateSubscription = async (req, res) => {
+  const { _id, subscription } = req.user;
+
+  if (!subscription) {
+    return res
+      .status(400)
+      .json(getErrorMessage(400, `Missing field subscription`));
+  }
+
+  const result = await User.findByIdAndUpdate(
+    _id,
+    { subscription: req.body.subscription },
+    {
+      new: true,
+    },
+  );
+
+  res.status(200).json({
+    status: 'success',
+    code: 200,
+    data: {
+      email: result.email,
+      subscription: result.subscription,
+    },
+  });
+};
+
+module.exports = updateSubscription;
diff --git a/middlewares/auth.js b/middlewares/auth.js
@@ -1,5 +1,5 @@
 const jwt = require('jsonwebtoken');
-const { createError } = require('../utils');
+const { getErrorMessage } = require('../utils');
 const { User } = require('../models');
 const { SECRET_KEY } = process.env;
 
@@ -8,11 +8,14 @@ const auth = async (req, res, next) => {
   const [bearer, token] = authorization.split(' ');
 
   try {
-    if (bearer !== 'Bearer') throw createError(401, 'Not authorized');
+    if (bearer !== 'Bearer')
+      return res.status(401).json(getErrorMessage(401, 'Not authorized'));
 
     const { id } = jwt.verify(token, SECRET_KEY);
     const user = await User.findById(id);
-    if (!user || !user.token) throw createError(401, 'Not authorized');
+    if (!user || !user.token) {
+      return res.status(401).json(getErrorMessage(401, 'Not authorized'));
+    }
 
     req.user = user;
     next();
diff --git a/models/user.js b/models/user.js
@@ -38,10 +38,15 @@ const joiLoginSchema = Joi.object({
     .required(),
 });
 
+const joiSubscriptionSchema = Joi.object({
+  subscription: Joi.string().valueOf('starter', 'pro', 'business').required(),
+});
+
 const User = model('user', userSchema);
 
 module.exports = {
   User,
   joiSignupSchema,
   joiLoginSchema,
+  joiSubscriptionSchema,
 };
diff --git a/routes/api/contacts.js b/routes/api/contacts.js
@@ -5,16 +5,18 @@ const { auth, validation, ctrlWrapper } = require('../../middlewares');
 const { joiSchema, favoriteJoiSchema } = require('../../models/contact');
 
 router.get('/', auth, ctrlWrapper(ctrl.getListContacts));
-router.get('/:contactId', ctrlWrapper(ctrl.getContactById));
+router.get('/:contactId', auth, ctrlWrapper(ctrl.getContactById));
 router.post('/', auth, validation(joiSchema), ctrlWrapper(ctrl.addContact));
-router.delete('/:contactId', ctrlWrapper(ctrl.removeContact));
+router.delete('/:contactId', auth, ctrlWrapper(ctrl.removeContact));
 router.put(
   '/:contactId',
+  auth,
   validation(joiSchema),
   ctrlWrapper(ctrl.updateContact),
 );
 router.patch(
   '/:contactId/favorite',
+  auth,
   validation(favoriteJoiSchema),
   ctrlWrapper(ctrl.updateStatusContact),
 );
diff --git a/routes/api/users.js b/routes/api/users.js
@@ -2,11 +2,21 @@ const express = require('express');
 const router = express.Router();
 const { users: ctrl } = require('../../controllers');
 const { auth, validation, ctrlWrapper } = require('../../middlewares');
-const { joiSignupSchema, joiLoginSchema } = require('../../models/user');
+const {
+  joiSignupSchema,
+  joiLoginSchema,
+  joiSubscriptionSchema,
+} = require('../../models/user');
 
 router.post('/signup', validation(joiSignupSchema), ctrlWrapper(ctrl.signup));
 router.post('/login', validation(joiLoginSchema), ctrlWrapper(ctrl.login));
 router.post('/logout', auth, ctrlWrapper(ctrl.logout));
 router.get('/current', auth, ctrlWrapper(ctrl.getCurrent));
+router.patch(
+  '/subscription',
+  auth,
+  validation(joiSubscriptionSchema),
+  ctrlWrapper(ctrl.updateSubscription),
+);
 
 module.exports = router;
diff --git a/utils/createError.js b/utils/createError.js
diff --git a/utils/getErrorMessage.js b/utils/getErrorMessage.js
@@ -0,0 +1,9 @@
+const getErrorMessage = (code, message) => {
+  return {
+    status: 'error',
+    code,
+    message,
+  };
+};
+
+module.exports = getErrorMessage;
diff --git a/utils/index.js b/utils/index.js
@@ -1,4 +1,5 @@
-const createError = require('./createError');
+const getErrorMessage = require('./getErrorMessage');
+
 module.exports = {
-  createError,
+  getErrorMessage,
 };
