From 16b49334b629de7e1d5a8b38e97b46490af839f5 Mon Sep 17 00:00:00 2001 From: Tigran Petrosyan Date: Tue, 1 Nov 2022 20:49:24 +0400 Subject: [PATCH 1/2] test --- controllers/users.js | 51 -------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/controllers/users.js b/controllers/users.js index 197c013..e69de29 100644 --- a/controllers/users.js +++ b/controllers/users.js @@ -1,51 +0,0 @@ -const User = require('../models/user'); -const { isAuthorized } = require('../utils/jwt'); - -const getUsers = async (req, res) => { - if (!isAuthorized(req.headers.authorization)) return res.sendStatus(401); - - return User.find({}) - .then(users => res.sendStatus(200).send(users)) - .catch(err => res.sendStatus(400).send(err)) -} - -const getProfile = (req, res) => { - if (!isAuthorized(req.headers.authorization)) return res.sendStatus(401); - - return User.findOne({ id: req.params.id }) - .then((user) => { - if (!user) { - return res.sendStatus(404).send({ message: 'Нет пользователя с таким id' }); - } - - return res.sendStatus(200).send(user); - }) - .catch((err) => res.sendStatus(400).send(err)); - } - -const createProfile = (req, res) => { - return User.countDocuments({}) - .then((id) => { - return User.create({ ...req.body, id }) - .then((user) => { - return res.sendStatus(200).send(user); - }) - .catch((err) => res.sendStatus(400).send(err)); - }); -} - -const registerUser = (req, res) => { - const { email, password } = req.body; - - if (!email || !password) return res.sendStatus(400).send({ message: 'Email или пароль не могут быть пустыми' }) - - return User.findOne({ email }) - .then((user) => { - if (user) return res.sendStatus(403).send({ message: 'Такой пользователь уже существует' }); - - createProfile(req, res); - }) - .catch((err) => res.sendStatus(400).send({ message: 'Произошла ошибка' })); -} - -module.exports = {getUsers, getProfile, createProfile, registerUser}; From e33da8533015ebb348bceb1f7c26f6a3ccca95f1 Mon Sep 17 00:00:00 2001 From: Tigran Petrosyan Date: Tue, 1 Nov 2022 20:54:41 +0400 Subject: [PATCH 2/2] test --- controllers/admins.js | 2 +- data/users.json | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/controllers/admins.js b/controllers/admins.js index 62feb42..8a4bcde 100644 --- a/controllers/admins.js +++ b/controllers/admins.js @@ -5,6 +5,7 @@ const { getJwtToken } = require('../utils/jwt'); const SALT_ROUNDS = 10; const registerAdmin = (req, res) => { + console.log('sdsd', req); const { email, password } = req.body; // TODO: Move to util if (!email || !password) return res.sendStatus(400).send({ message: 'Email или пароль не могут быть пустыми' }); @@ -27,7 +28,6 @@ const registerAdmin = (req, res) => { const authAdmin = (req, res) => { const { email, password } = req.body; // TODO: Move to util - if (!email || !password) return res.sendStatus(400).send({ message: 'Email или пароль не могут быть пустыми' }); return Admin.findOne({ email }) .then((admin) => { diff --git a/data/users.json b/data/users.json index d1d0f8c..5c21d1d 100644 --- a/data/users.json +++ b/data/users.json @@ -13,10 +13,6 @@ "бубенчик", "бумажный бантик" ] - }, - { - "name": "Чарли", - "favoriteToys": [ "маленькая чашечка", "медвежонок" ]