fix some errors

Author: jlcoding01

app.js

@@ -28,14 +28,13 @@ app.get("/crash-test", () => {
   }, 0);
 });
 
+app.use(requestLogger);
 app.post("/signup", validateUserBody, createUser);
 app.post("/signin", validateUserLogIn, login);
 app.get("/items", getClothingItem);
 
 app.use(auth);
 
-app.use(requestLogger);
-
 app.use("/", mainRouter);
 
 app.use(errorLogger);

controllers/users.js

@@ -1,13 +1,6 @@
 const bcrypt = require("bcryptjs");
 const jwt = require("jsonwebtoken");
 const User = require("../models/user");
-// const {
-//   invalidDataError,
-//   authenticationError,
-//   notFoundError,
-//   defaultError,
-//   conflictError,
-// } = require("../utils/errors");
 const { JWT_SECRET } = require("../utils/config");
 const BadRequestError = require("../errors/bad-request-err");
 const UnauthorizedError = require("../errors/unauthorized-err");
@@ -22,22 +15,13 @@ const getCurrentUser = (req, res, next) => {
       console.log(err.name);
       if (err.name === "CastError") {
         next(new BadRequestError("Bad Request! Invalid data passed"));
-        // return res
-        //   .status(invalidDataError)
-        //   .send({ message: "Bad Request! Invalid data passed" });
       } else if (err.name === "DocumentNotFoundError") {
         next(
           new NotFoundError(" The request was sent to a non-existent address")
         );
-        // return res
-        //   .status(notFoundError)
-        //   .send({ message: " The request was sent to a non-existent address" });
       } else {
         next(err);
       }
-      // return res
-      //   .status(defaultError)
-      //   .send({ message: "An error has occurred on the server" });
     });
 };
 
@@ -46,9 +30,6 @@ const createUser = (req, res, next) => {
 
   if (!email) {
     next(new BadRequestError("Email or Password is required!"));
-    // return res
-    //   .status(invalidDataError)
-    //   .send({ message: "Email or Password is required!" });
   }
 
   return User.findOne({ email })
@@ -72,20 +53,11 @@ const createUser = (req, res, next) => {
       console.error(err);
       if (err.code === 11000) {
         next(new ConflictError("The email already exists!"));
-        // return res
-        //   .status(conflictError)
-        //   .send({ message: "The email already exists!" });
       } else if (err.name === "ValidationError") {
         next(new BadRequestError("Bad Request! Invalid data passed"));
-        // return res
-        //   .status(invalidDataError)
-        //   .send({ message: "Bad Request! Invalid data passed" });
       } else {
         next(err);
       }
-      // return res
-      //   .status(defaultError)
-      //   .send({ message: "An error has occurred on the server" });
     });
 };
 
@@ -102,27 +74,15 @@ const updateUser = (req, res, next) => {
       console.log(err.name);
       if (err.name === "ValidationError") {
         next(new BadRequestError("Bad Request! Invalid data passed"));
-        // return res
-        //   .status(invalidDataError)
-        //   .send({ message: "Bad Request! Invalid data passed" });
       } else if (err.name === "CastError") {
         next(new BadRequestError("Bad Request! Invalid data passed"));
-        // return res
-        //   .status(invalidDataError)
-        //   .send({ message: "Bad Request! Invalid data passed" });
       } else if (err.name === "DocumentNotFoundError") {
         next(
           new NotFoundError(" The request was sent to a non-existent address")
         );
-        // return res
-        //   .status(notFoundError)
-        //   .send({ message: " The request was sent to a non-existent address" });
       } else {
         next(err);
       }
-      // return res
-      //   .status(defaultError)
-      //   .send({ message: "An error has occurred on the server" });
     });
 };
 
@@ -131,31 +91,22 @@ const login = (req, res, next) => {
 
   if (!email || !password) {
     next(new BadRequestError("Email and password are required"));
-    // return res
-    //   .status(invalidDataError)
-    //   .send({ message: "Email and password are required" });
   }
 
   return User.findUserByCredentials(email, password)
     .then((user) => {
       const token = jwt.sign({ _id: user._id }, JWT_SECRET, {
         expiresIn: "7d",
       });
-      res.send({ user, token });
+      res.send({ token });
     })
     .catch((err) => {
       console.error(err);
       if (err.message === "Incorrect email or password") {
         next(new UnauthorizedError("Incorrect email or password!"));
-        // return res
-        //   .status(authenticationError)
-        //   .send({ message: "Incorrect email or password!" });
       } else {
         next(err);
       }
-      // return res
-      //   .status(defaultError)
-      //   .send({ message: "An error has occurred on the server" });
     });
 };
 

middlewares/auth.js

@@ -1,14 +1,12 @@
 const jwt = require("jsonwebtoken");
 const { JWT_SECRET } = require("../utils/config");
-const { authenticationError } = require("../utils/errors");
+const UnauthorizedError = require("../errors/unauthorized-err");
 
 module.exports = (req, res, next) => {
   const { authorization } = req.headers;
 
   if (!authorization || !authorization.startsWith("Bearer ")) {
-    return res
-      .status(authenticationError)
-      .send({ message: "Authorization Required" });
+    next(new UnauthorizedError("Authorization Required"));
   }
 
   const token = authorization.replace("Bearer ", "");
@@ -18,9 +16,7 @@ module.exports = (req, res, next) => {
   try {
     playload = jwt.verify(token, JWT_SECRET);
   } catch (err) {
-    return res
-      .status(authenticationError)
-      .send({ message: "Authorization Required" });
+    next(new UnauthorizedError("Authorization Required"));
   }
 
   req.user = playload;

middlewares/validation.js

@@ -57,6 +57,20 @@ module.exports.validateUserLogIn = celebrate({
   }),
 });
 
+module.exports.validateUserUpdate = celebrate({
+  body: Joi.object().keys({
+    name: Joi.string().required().min(2).max(30).messages({
+      "string.min": 'The minimum length of the "name" field is 2',
+      "string.max": 'The maximum length of the "name" field is 30',
+      "string.empty": 'The "name" field must be filled in',
+    }),
+    avatar: Joi.string().required().custom(validateURL).messages({
+      "string.empty": 'The "avatar" filed must be filled in',
+      "string.uri": 'The "avatar" must be a valid url',
+    }),
+  }),
+});
+
 module.exports.validateId = celebrate({
   params: Joi.object().keys({
     itemId: Joi.string().alphanum().length(24),

routes/clothingItems.js

@@ -9,7 +9,7 @@ const { validateCardBody, validateId } = require("../middlewares/validation");
 
 router.post("/", validateCardBody, createClothingItem);
 router.delete("/:itemId", validateId, deleteClothingItem);
-router.put("/:itemId/likes", likeItem);
-router.delete("/:itemId/likes", dislikeItem);
+router.put("/:itemId/likes", validateId, likeItem);
+router.delete("/:itemId/likes", validateId, dislikeItem);
 
 module.exports = router;

routes/index.js

@@ -1,15 +1,13 @@
 const router = require("express").Router();
 const userRouter = require("./users");
 const clothingItemsRouter = require("./clothingItems");
-const { notFoundError } = require("../utils/errors");
+const NotFoundError = require("../errors/not-found-err");
 
 router.use("/users", userRouter);
 router.use("/items", clothingItemsRouter);
 
-router.use((req, res) => {
-  res.status(notFoundError).send({
-    message: "Requested resource not found",
-  });
+router.use((req, res, next) => {
+  next(new NotFoundError("Requested resource not found"));
 });
 
 module.exports = router;

routes/users.js

@@ -1,11 +1,8 @@
 const router = require("express").Router();
-const {
-  getCurrentUser,
-
-  updateUser,
-} = require("../controllers/users");
+const { getCurrentUser, updateUser } = require("../controllers/users");
+const { validateUserUpdate } = require("../middlewares/validation");
 
 router.get("/me", getCurrentUser);
-router.patch("/me", updateUser);
+router.patch("/me", validateUserUpdate, updateUser);
 
 module.exports = router;