Skip to content

564 Сверстал страницу авторизации #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tilesto wants to merge 2 commits into
base: main
Choose a base branch
from
Open

564 Сверстал страницу авторизации #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16b4933
test
Tilesto Nov 1, 2022
e33da85
test
Tilesto Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controllers/admins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 или пароль не могут быть пустыми' });
Expand All @@ -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) => {
Expand Down
51 changes: 0 additions & 51 deletions controllers/users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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};
4 changes: 0 additions & 4 deletions data/users.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
"бубенчик",
"бумажный бантик"
]
},
{
"name": "Чарли",
"favoriteToys": [
"маленькая чашечка",
"медвежонок"
]
Expand Down