stub guest creation on server
This commit is contained in:
parent
ccbeddfa40
commit
2f1174c21b
2 changed files with 58 additions and 33 deletions
|
@ -1,15 +1,15 @@
|
||||||
const { validationResult } = require('express-validator');
|
const { validationResult } = require("express-validator");
|
||||||
|
|
||||||
const userQueries = require('../data/queries/user');
|
const userQueries = require("../data/queries/user");
|
||||||
const { hashPassword, compareHash } = require('../services/bcrypt');
|
const { hashPassword, compareHash } = require("../services/bcrypt");
|
||||||
const signToken = require('../services/signToken');
|
const signToken = require("../services/signToken");
|
||||||
|
|
||||||
const checkValidationErrors = (req, res) => {
|
const checkValidationErrors = (req, res) => {
|
||||||
const errors = validationResult(req);
|
const errors = validationResult(req);
|
||||||
if (!errors.isEmpty()) {
|
if (!errors.isEmpty()) {
|
||||||
return res.status(422).json({ errors: errors.array() });
|
return res.status(422).json({ errors: errors.array() });
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
const signup = async (req, res, next) => {
|
const signup = async (req, res, next) => {
|
||||||
checkValidationErrors(req, res);
|
checkValidationErrors(req, res);
|
||||||
|
@ -20,18 +20,18 @@ const signup = async (req, res, next) => {
|
||||||
const hashedPassword = await hashPassword(user.password);
|
const hashedPassword = await hashPassword(user.password);
|
||||||
const secureUser = { ...user, password: hashedPassword };
|
const secureUser = { ...user, password: hashedPassword };
|
||||||
if (existingUser.length) {
|
if (existingUser.length) {
|
||||||
return res.status(409).json({errors: [{auth: 'User already exists!'}]})
|
return res
|
||||||
|
.status(409)
|
||||||
|
.json({ errors: [{ auth: "User already exists!" }] });
|
||||||
}
|
}
|
||||||
|
|
||||||
const newUser = await userQueries.insertUser(secureUser);
|
const newUser = await userQueries.insertUser(secureUser);
|
||||||
signToken(res, newUser)
|
signToken(res, newUser);
|
||||||
res.status(201).json({ ...newUser });
|
res.status(201).json({ ...newUser });
|
||||||
}
|
} catch (err) {
|
||||||
|
|
||||||
catch (err) {
|
|
||||||
res.status(500).json(err);
|
res.status(500).json(err);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
const login = async (req, res, next) => {
|
const login = async (req, res, next) => {
|
||||||
checkValidationErrors(req, res);
|
checkValidationErrors(req, res);
|
||||||
|
@ -42,14 +42,14 @@ const login = async (req, res, next) => {
|
||||||
const savedUser = queryResults[0] || null;
|
const savedUser = queryResults[0] || null;
|
||||||
|
|
||||||
if (!savedUser) {
|
if (!savedUser) {
|
||||||
return res.status(401).send({errors: 'bad credentials'});
|
return res.status(401).send({ errors: "bad credentials" });
|
||||||
}
|
}
|
||||||
|
|
||||||
const hashedPassword = savedUser.password;
|
const hashedPassword = savedUser.password;
|
||||||
const passwordMatch = await compareHash(user.password, hashedPassword);
|
const passwordMatch = await compareHash(user.password, hashedPassword);
|
||||||
|
|
||||||
if (!passwordMatch) {
|
if (!passwordMatch) {
|
||||||
return res.status(401).send({errors: 'bad credentials'});
|
return res.status(401).send({ errors: "bad credentials" });
|
||||||
}
|
}
|
||||||
|
|
||||||
const authorizedUser = { ...savedUser };
|
const authorizedUser = { ...savedUser };
|
||||||
|
@ -57,14 +57,29 @@ const login = async (req, res, next) => {
|
||||||
|
|
||||||
signToken(res, authorizedUser);
|
signToken(res, authorizedUser);
|
||||||
res.send({ ...authorizedUser }).status(200);
|
res.send({ ...authorizedUser }).status(200);
|
||||||
|
} catch (e) {
|
||||||
|
res.status(500).send({ errors: e });
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
catch (err) {
|
const guest = async (req, res, next) => {
|
||||||
res.status(500).send({errors: err});
|
try {
|
||||||
}
|
// username generator returns `Guest-${num}`
|
||||||
|
const username = "guest";
|
||||||
|
// generateGuestUser();
|
||||||
|
const email = null;
|
||||||
|
// id generator returns `
|
||||||
|
const id = null;
|
||||||
|
const user = { username, email, id };
|
||||||
|
signToken(res, user);
|
||||||
|
res.send(user);
|
||||||
|
} catch (e) {
|
||||||
|
res.status(500).send({ errors: e });
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
signup,
|
signup,
|
||||||
login
|
login,
|
||||||
}
|
guest,
|
||||||
|
};
|
||||||
|
|
|
@ -1,10 +1,20 @@
|
||||||
const express = require('express');
|
const express = require("express");
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
const app = require('../server');
|
const app = require("../server");
|
||||||
const authController = require('../controllers/auth');
|
const authController = require("../controllers/auth");
|
||||||
const { signupValidationRules, loginValidationRules, validate } = require('../middleware/userValidator');
|
const {
|
||||||
|
signupValidationRules,
|
||||||
|
loginValidationRules,
|
||||||
|
validate,
|
||||||
|
} = require("../middleware/userValidator");
|
||||||
|
|
||||||
router.post('/signup', signupValidationRules(), validate, authController.signup);
|
router.post(
|
||||||
router.post('/login', loginValidationRules(), validate, authController.login);
|
"/signup",
|
||||||
|
signupValidationRules(),
|
||||||
|
validate,
|
||||||
|
authController.signup
|
||||||
|
);
|
||||||
|
router.post("/login", loginValidationRules(), validate, authController.login);
|
||||||
|
router.post("/guest", authController.guest);
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
|
|
Loading…
Reference in a new issue